Merge remote-tracking branch 'origin/master' into moresync

[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 ae069b5..3412af8 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -33,11 +33,13 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
+import android.content.SharedPreferences;\r
 import android.content.pm.PackageInfo;\r
 import android.content.pm.PackageManager.NameNotFoundException;\r
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
+import android.preference.PreferenceManager;\r
 import android.provider.MediaStore;\r
 import android.support.v4.app.FragmentTransaction;\r
 import android.util.Log;\r
@@ -129,6 +131,18 @@ 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
+            }\r
+            \r
         } else {\r
             \r
             setContentView(R.layout.no_account_available);\r