Merge remote-tracking branch 'origin/oauth_login' into oauth_login

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index a717f0c..1d75e69 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -217,7 +217,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
      */\r
     private void createFirstAccount() {\r
         Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
      */\r
     private void createFirstAccount() {\r
         Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r

-        intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
+        intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTHORITY });\r

         startActivity(intent);  // the new activity won't be created until this.onStart() and this.onResume() are finished;\r
     }\r
 \r
         startActivity(intent);  // the new activity won't be created until this.onStart() and this.onResume() are finished;\r
     }\r
 \r


@@ -346,12 +346,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     }\r
 \r
     private void startSynchronization() {\r
     }\r
 \r
     private void startSynchronization() {\r

-        ContentResolver.cancelSync(null, AccountAuthenticator.AUTH_TOKEN_TYPE);   // cancel the current synchronizations of any ownCloud account\r
+        ContentResolver.cancelSync(null, AccountAuthenticator.AUTHORITY);   // cancel the current synchronizations of any ownCloud account\r

         Bundle bundle = new Bundle();\r
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
         ContentResolver.requestSync(\r
                 AccountUtils.getCurrentOwnCloudAccount(this),\r
         Bundle bundle = new Bundle();\r
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
         ContentResolver.requestSync(\r
                 AccountUtils.getCurrentOwnCloudAccount(this),\r

-                AccountAuthenticator.AUTH_TOKEN_TYPE, bundle);\r
+                AccountAuthenticator.AUTHORITY, bundle);\r

     }\r
 \r
 \r
     }\r
 \r
 \r