Testing synchronization cancelation

[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 3412af8..7e62084 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -111,9 +111,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         super.onCreate(savedInstanceState);\r
 \r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
-        setSupportProgressBarIndeterminateVisibility(false);\r
 \r
-//        Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
+        Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
 \r
         if(savedInstanceState != null) {\r
             mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r
@@ -131,24 +130,21 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             \r
             initDelayedTilAccountAvailabe();\r
             \r
-            // PIN CODE request\r
-            // best location is to decide; let's try this first\r
-            boolean pinStart = false;\r
-            SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());\r
-            pinStart = appPrefs.getBoolean("set_passcode", false);\r
-            \r
-            if (pinStart) {\r
-                Intent i = new Intent(getApplicationContext(), PinCodeActivity.class);\r
-                i.putExtra("activity", "splash");\r
-                startActivity(i);\r
+            // PIN CODE request ;  best location is to decide, let's try this first\r
+            //if (savedInstanceState == null) {\r
+            if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {\r
+                requestPinCode();\r
             }\r
             \r
+            \r
         } else {\r
             \r
             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
@@ -767,7 +763,22 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
             transaction.commit();\r
         }\r
+        setSupportProgressBarIndeterminateVisibility(false);\r
+    }\r
+    \r
 \r
+    /**\r
+     * Launch an intent to request the PIN code to the user before letting him use the app\r
+     */\r
+    private void requestPinCode() {\r
+        boolean pinStart = false;\r
+        SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());\r
+        pinStart = appPrefs.getBoolean("set_pincode", false);\r
+        if (pinStart) {\r
+            Intent i = new Intent(getApplicationContext(), PinCodeActivity.class);\r
+            i.putExtra(PinCodeActivity.EXTRA_ACTIVITY, "FileDisplayActivity");\r
+            startActivity(i);\r
+        }\r
     }\r
 \r
     \r