X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/271a4ba1dfdea914b70ef3b10f6930de68d39d68..3e4f8b4f0d6f4af39de9a25279005efa6d447e68:/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 3412af81..a5b1fc8d 100644
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -131,18 +131,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             
             initDelayedTilAccountAvailabe();
             
-            // PIN CODE request
-            // best location is to decide; let's try this first
-            boolean pinStart = false;
-            SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-            pinStart = appPrefs.getBoolean("set_passcode", false);
-            
-            if (pinStart) {
-                Intent i = new Intent(getApplicationContext(), PinCodeActivity.class);
-                i.putExtra("activity", "splash");
-                startActivity(i);
+            // PIN CODE request ;  best location is to decide, let's try this first
+            //if (savedInstanceState == null) {
+            if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {
+                requestPinCode();
             }
             
+            
         } else {
             
             setContentView(R.layout.no_account_available);
@@ -769,6 +764,21 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         }
 
     }
+    
+
+    /**
+     * Launch an intent to request the PIN code to the user before letting him use the app
+     */
+    private void requestPinCode() {
+        boolean pinStart = false;
+        SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        pinStart = appPrefs.getBoolean("set_pincode", false);
+        if (pinStart) {
+            Intent i = new Intent(getApplicationContext(), PinCodeActivity.class);
+            i.putExtra(PinCodeActivity.EXTRA_ACTIVITY, "FileDisplayActivity");
+            startActivity(i);
+        }
+    }
 
     
 }