X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7c2174d09e376ecc5ebd9a510a66dc7582b173f9..0f2376806f4ed54291ef29d6ebd9f76f736a0da5:/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 2c4ae382..7e620840 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;
@@ -109,7 +111,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         super.onCreate(savedInstanceState);
 
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        setSupportProgressBarIndeterminateVisibility(false);
 
         Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));
 
@@ -129,12 +130,21 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             
             initDelayedTilAccountAvailabe();
             
+            // 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);
             getSupportActionBar().setNavigationMode(ActionBar.DISPLAY_SHOW_TITLE);
             findViewById(R.id.setup_account).setOnClickListener(this);
-            
+
+            setSupportProgressBarIndeterminateVisibility(false);
+
             Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);
             intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });
             startActivity(intent);  // although the code is here, the activity won't be created until this.onStart() and this.onResume() are finished;
@@ -160,6 +170,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 break;
             }
             case R.id.startSync: {
+                // This could be interesting
+                //ContentResolver.cancelSync(null, "org.owncloud");   // cancel the current synchronizations of any other ownCloud account
                 Bundle bundle = new Bundle();
                 bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
                 ContentResolver.requestSync(
@@ -610,32 +622,33 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                     FileSyncService.IN_PROGRESS, false);
             String account_name = intent
                     .getStringExtra(FileSyncService.ACCOUNT_NAME);
+
             Log.d("FileDisplay", "sync of account " + account_name
                     + " is in_progress: " + inProgress);
-            setSupportProgressBarIndeterminateVisibility(inProgress);
+
+            if (account_name.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) {  
             
-            long OCDirId = intent.getLongExtra(FileSyncService.SYNC_FOLDER, -1);
-            if (OCDirId >= 0) {
-                OCFile syncDir = mStorageManager.getFileById(OCDirId);
-                if (syncDir != null && (
-                        (mCurrentDir == null && syncDir.getFileName().equals("/")) ||
-                         syncDir.equals(mCurrentDir))
-                    ) {
-                    FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
-                    if (fileListFragment != null) { 
-                        fileListFragment.listDirectory();
+                String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); 
+                 
+                boolean fillBlankRoot = false;
+                if (mCurrentDir == null) {
+                    mCurrentDir = mStorageManager.getFileByPath("/");
+                    fillBlankRoot = (mCurrentDir != null);
+                }
+
+                if (synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath().equals(synchFolderRemotePath) || fillBlankRoot) ) {
+                    FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()
+                            .findFragmentById(R.id.fileList);
+                    mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);
+                    if (fileListFragment != null) {
+                        fileListFragment.listDirectory(mCurrentDir);  
                     }
                 }
-            }
-            
-            if (!inProgress) {
-                FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()
-                        .findFragmentById(R.id.fileList);
-                if (fileListFragment != null)
-                    fileListFragment.listDirectory();
+                
+                setSupportProgressBarIndeterminateVisibility(inProgress);
+                
             }
         }
-
     }
     
 
@@ -717,17 +730,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         
         // If we are on a large device -> update fragment
         if (mDualPane) {
-            FileDetailFragment fileDetails = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
-            if (fileDetails == null) {
-                // first selected file since the current directory was listed
-                FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-                transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);
-                transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
-                transaction.commit();
-            } else {
-                // another select file
-                fileDetails.updateFileDetails(file, AccountUtils.getCurrentOwnCloudAccount(this));
-            }   
+            // buttons in the details view are problematic when trying to reuse an existing fragment; create always a new one solves some of them, BUT no all; downloads are 'dangerous'
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);
+            transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
+            transaction.commit();
             
         } else {    // small or medium screen device -> new Activity
             Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
@@ -756,7 +763,22 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment
             transaction.commit();
         }
+        setSupportProgressBarIndeterminateVisibility(false);
+    }
+    
 
+    /**
+     * 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);
+        }
     }