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 e0eccf9..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.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.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
 import android.provider.MediaStore;\r
 import android.support.v4.app.FragmentTransaction;\r
 import android.util.Log;\r


@@ -111,7 +113,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
         setSupportProgressBarIndeterminateVisibility(false);\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
 \r
         if(savedInstanceState != null) {\r
             mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r


@@ -129,6 +131,18 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             \r
             initDelayedTilAccountAvailabe();\r
             \r
             \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
         } else {\r
             \r
             setContentView(R.layout.no_account_available);\r


@@ -619,11 +633,14 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             if (account_name.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) {  \r
             \r
                 String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); \r
             if (account_name.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) {  \r
             \r
                 String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); \r

-                        \r
-                if (mCurrentDir == null)\r
+                 \r
+                boolean fillBlankRoot = false;\r
+                if (mCurrentDir == null) {\r

                     mCurrentDir = mStorageManager.getFileByPath("/");\r
                     mCurrentDir = mStorageManager.getFileByPath("/");\r

+                    fillBlankRoot = (mCurrentDir != null);\r
+                }\r

 \r
 \r

-                if (synchFolderRemotePath != null && mCurrentDir != null && mCurrentDir.getRemotePath().equals(synchFolderRemotePath) ) {\r
+                if (synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath().equals(synchFolderRemotePath) || fillBlankRoot) ) {\r

                     FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()\r
                             .findFragmentById(R.id.fileList);\r
                     mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);\r
                     FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()\r
                             .findFragmentById(R.id.fileList);\r
                     mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);\r