X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/461364f68b95df0ddf003180033187d677223c79..cbf9ca8beac99dc06678d13c5f80804d56445472:/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 e0eccf91..3412af81 100644
--- 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;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.provider.MediaStore;
 import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
@@ -111,7 +113,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
         setSupportProgressBarIndeterminateVisibility(false);
 
-        Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));
+//        Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));
 
         if(savedInstanceState != null) {
             mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);
@@ -129,6 +131,18 @@ 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);
+            }
+            
         } else {
             
             setContentView(R.layout.no_account_available);
@@ -619,11 +633,14 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             if (account_name.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) {  
             
                 String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); 
-                        
-                if (mCurrentDir == null)
+                 
+                boolean fillBlankRoot = false;
+                if (mCurrentDir == null) {
                     mCurrentDir = mStorageManager.getFileByPath("/");
+                    fillBlankRoot = (mCurrentDir != null);
+                }
 
-                if (synchFolderRemotePath != null && mCurrentDir != null && mCurrentDir.getRemotePath().equals(synchFolderRemotePath) ) {
+                if (synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath().equals(synchFolderRemotePath) || fillBlankRoot) ) {
                     FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()
                             .findFragmentById(R.id.fileList);
                     mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);