Fix sharing

build.gradle

@@ -13,7 +13,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.google.gms:google-services:3.0.0'
     }
 }
@@ -54,7 +54,7 @@ android {
     }
 
     compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -74,7 +74,7 @@ android {
                 applicationId 'com.nextcloud.client'
             }
 
-            custom {
+            modified {
                 // structure is:
                 // domain tld
                 // domain name
@@ -84,7 +84,7 @@ android {
         }
 
         configurations {
-            customCompile
+            modifiedCompile
         }
     }
 
@@ -179,7 +179,7 @@ dependencies {
     compile 'com.google.android.gms:play-services:10.2.0'
     compile 'com.github.evernote:android-job:v1.1.7'
 
-    customCompile 'com.google.firebase:firebase-core:10.2.0'
+    modifiedCompile 'com.google.firebase:firebase-core:10.2.0'
 
     /// dependencies for local unit tests
     testCompile 'junit:junit:4.12'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Mar 05 21:13:56 CET 2017
+#Thu Mar 16 17:57:46 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

src/main/java/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java

@@ -73,24 +73,17 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
     private static final int REQUESTED_PAGE = 1;
 
     public static String AUTHORITY;
-    public static final String ACTION_SHARE_WITH = AUTHORITY + ".action.SHARE_WITH";
+    public static String ACTION_SHARE_WITH;
 
     public static final String CONTENT = "content";
 
-    public static final String DATA_USER = AUTHORITY + ".data.user";
-    public static final String DATA_GROUP = AUTHORITY + ".data.group";
-    public static final String DATA_REMOTE = AUTHORITY + ".data.remote";
+    public static String DATA_USER;
+    public static String DATA_GROUP;
+    public static String DATA_REMOTE;
 
     private UriMatcher mUriMatcher;
 
-    private static HashMap<String, ShareType> sShareTypes;
-
-    static {
-        sShareTypes = new HashMap<>();
-        sShareTypes.put(DATA_USER, ShareType.USER);
-        sShareTypes.put(DATA_GROUP, ShareType.GROUP);
-        sShareTypes.put(DATA_REMOTE, ShareType.FEDERATED);
-    }
+    private static HashMap<String, ShareType> sShareTypes = new HashMap<>();
 
     public static ShareType getShareType(String authority) {
 
@@ -106,7 +99,17 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
 
     @Override
     public boolean onCreate() {
+
         AUTHORITY = getContext().getResources().getString(R.string.users_and_groups_search_authority);
+        ACTION_SHARE_WITH = getContext().getResources().getString(R.string.users_and_groups_share_with);
+        DATA_USER = AUTHORITY + ".data.user";
+        DATA_GROUP = AUTHORITY + ".data.group";
+        DATA_REMOTE = AUTHORITY + ".data.remote";
+
+        sShareTypes.put(DATA_USER, ShareType.USER);
+        sShareTypes.put(DATA_GROUP, ShareType.GROUP);
+        sShareTypes.put(DATA_REMOTE, ShareType.FEDERATED);
+
         mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
         mUriMatcher.addURI(AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", SEARCH);
         return true;

src/main/java/com/owncloud/android/services/OperationsService.java

@@ -553,6 +553,7 @@ public class OperationsService extends Service {
                 );
                 
                 String action = operationIntent.getAction();
+
                 if (action.equals(ACTION_CREATE_SHARE_VIA_LINK)) {  // Create public share via link
                     String remotePath = operationIntent.getStringExtra(EXTRA_REMOTE_PATH);
                     String password = operationIntent.getStringExtra(EXTRA_SHARE_PASSWORD);

src/main/res/values/setup.xml

@@ -8,7 +8,7 @@
     <string name="account_type">nextcloud</string>	<!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
     <string name="authority">org.nextcloud</string>	<!-- better if was the app package with ".provider" appended ; it identifies the provider -->
     <string name="users_and_groups_search_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
-    <string name="users_and_groups_share_with">    com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
+    <string name="users_and_groups_share_with">com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
     <string name="document_provider_authority">org.nextcloud.documents</string>
     <string name="file_provider_authority">org.nextcloud.files</string>
     <string name ="db_file">nextcloud.db</string>