Cancellable synchronization; current synchronizations are cancelled when the user...

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / activity / FileDisplayActivity.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 0cb9b50..e54913a 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -142,14 +142,15 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             setContentView(R.layout.no_account_available);\r
             getSupportActionBar().setNavigationMode(ActionBar.DISPLAY_SHOW_TITLE);\r
             findViewById(R.id.setup_account).setOnClickListener(this);\r
-            \r
+\r
+            setSupportProgressBarIndeterminateVisibility(false);\r
+\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
             startActivity(intent);  // although the code is here, the activity won't be created until this.onStart() and this.onResume() are finished;\r
             mForcedLoginToCreateFirstAccount = true;\r
         }\r
         \r
-        setSupportProgressBarIndeterminateVisibility(false);\r
         Log.i(getClass().toString(), "onCreate() end");\r
     }\r
 \r
@@ -169,8 +170,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 break;\r
             }\r
             case R.id.startSync: {\r
-                // This could be interesting\r
-                //ContentResolver.cancelSync(null, "org.owncloud");   // cancel the current synchronizations of any other ownCloud account\r
+                ContentResolver.cancelSync(null, "org.owncloud");   // 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
@@ -762,7 +762,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
             transaction.commit();\r
         }\r
-\r
+        setSupportProgressBarIndeterminateVisibility(false);\r
     }\r
     \r
 \r