Fixed update of double pane view when download in notification bar is pressed in...

diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java
index b346ed7..50a8c49 100644 (file)
--- a/src/com/owncloud/android/files/services/FileDownloader.java
+++ b/src/com/owncloud/android/files/services/FileDownloader.java
@@ -312,7 +312,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
         /// includes a pending intent in the notification showing the details view of the file\r
         Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
         showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, download.getFile());\r
-        showDetailsIntent.putExtra(FileDownloader.EXTRA_ACCOUNT, download.getAccount());\r
+        showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, download.getAccount());\r
         showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
         mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, showDetailsIntent, PendingIntent.FLAG_UPDATE_CURRENT);\r
         \r

diff --git a/src/com/owncloud/android/ui/activity/FileDetailActivity.java b/src/com/owncloud/android/ui/activity/FileDetailActivity.java
index 7937b90..ff39022 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDetailActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDetailActivity.java
@@ -74,7 +74,7 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
             actionBar.setDisplayHomeAsUpEnabled(true);\r
 \r
             OCFile file = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);\r
-            Account account = getIntent().getParcelableExtra(FileDownloader.EXTRA_ACCOUNT);\r
+            Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);\r
             FileDetailFragment mFileDetail = new FileDetailFragment(file, account);\r
         \r
             FragmentTransaction ft = getSupportFragmentManager().beginTransaction();\r
@@ -147,6 +147,7 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
         Intent intent = new Intent(this, FileDisplayActivity.class);\r
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
         intent.putExtra(FileDetailFragment.EXTRA_FILE, getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE));\r
+        intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT));\r
         startActivity(intent);\r
         finish();\r
     }\r

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 50b8361..0072b81 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -88,7 +88,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener {\r
     \r
     private ArrayAdapter<String> mDirectories;\r
-    private OCFile mCurrentDir;\r
+    private OCFile mCurrentDir = null;\r
+    private OCFile mCurrentFile = null;\r
 \r
     private DataStorageManager mStorageManager;\r
     private SyncBroadcastReceiver mSyncBroadcastReceiver;\r
@@ -116,8 +117,15 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         Log.d(getClass().toString(), "onCreate() start");\r
         super.onCreate(savedInstanceState);\r
 \r
-        /// saved instance state: keep this always before initDataFromCurrentAccount()\r
+        /// Load of parameters from received intent\r
+        mCurrentDir = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); // no check necessary, mCurrenDir == null if the parameter is not in the intent\r
+        Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);\r
+        if (account != null)\r
+            AccountUtils.setCurrentOwnCloudAccount(this, account.name);\r
+        \r
+        /// Load of saved instance state: keep this always before initDataFromCurrentAccount()\r
         if(savedInstanceState != null) {\r
+            // TODO - test if savedInstanceState should take precedence over file in the intent ALWAYS (now), NEVER, or SOME TIMES\r
             mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);\r
         }\r
         \r
@@ -128,10 +136,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             \r
         } else {    /// at least an account is available\r
             \r
-            bindService(new Intent(this, FileDownloader.class), mConnection, Context.BIND_AUTO_CREATE);\r
-            initDataFromCurrentAccount();\r
+            initDataFromCurrentAccount();   // it checks mCurrentDir and mCurrentFile with the current account\r
             \r
         }\r
+        \r
+        bindService(new Intent(this, FileDownloader.class), mConnection, Context.BIND_AUTO_CREATE);\r
 \r
         // PIN CODE request ;  best location is to decide, let's try this first\r
         if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {\r
@@ -160,10 +169,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         setContentView(R.layout.files);    \r
         mFileList = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
         mDualPane = (findViewById(R.id.file_details_container) != null);\r
-        if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {\r
-            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
-            transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
-            transaction.commit();\r
+        if (mDualPane) {\r
+            initFileDetailsInDualPane();\r
         }\r
             \r
         // Action bar setup\r
@@ -198,20 +205,41 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 AccountUtils.getCurrentOwnCloudAccount(this),\r
                 getContentResolver());\r
 \r
-        /// State recovery - CURRENT DIRECTORY ; priority: 1/ getIntent(), 2/ savedInstanceState (in onCreate()), 3/ root dir\r
-        if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)) {\r
-            mCurrentDir = (OCFile) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);\r
-            if(mCurrentDir != null && !mCurrentDir.isDirectory()){\r
-                mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());\r
-            }\r
-            // clear intent extra, so rotating the screen will not return us to this directory\r
-            getIntent().removeExtra(FileDetailFragment.EXTRA_FILE);\r
+        /// Check if mCurrentDir is a directory\r
+        if(mCurrentDir != null && !mCurrentDir.isDirectory()) {\r
+            mCurrentFile = mCurrentDir;\r
+            mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());\r
+        }\r
+        \r
+        /// Check if mCurrentDir and mCurrentFile are in the current account, and update them\r
+        if (mCurrentDir != null) {\r
+            mCurrentDir = mStorageManager.getFileByPath(mCurrentDir.getRemotePath());   // mCurrentDir == null if it is not in the current account\r
+        }\r
+        if (mCurrentFile != null) {\r
+            mCurrentFile = mStorageManager.getFileByPath(mCurrentFile.getRemotePath());   // mCurrentFile == null if it is not in the current account\r
+        }\r
+        \r
+        /// Default to root if mCurrentDir was not found\r
+        if (mCurrentDir == null) {\r
+            mCurrentDir = mStorageManager.getFileByPath("/"); // will be NULL if the database was never synchronized\r
         }\r
-        if (mCurrentDir == null)\r
-            mCurrentDir = mStorageManager.getFileByPath("/");   // this will return NULL if the database has not ever synchronized\r
     }\r
         \r
     \r
+    private void initFileDetailsInDualPane() {\r
+        if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {\r
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+            if (mCurrentFile != null) {\r
+                transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); // empty FileDetailFragment\r
+                mCurrentFile = null;\r
+            } else {\r
+                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment\r
+            }\r
+            transaction.commit();\r
+        }\r
+    }\r
+    \r
+    \r
     @Override\r
     public void onDestroy() {\r
         super.onDestroy();\r
@@ -386,7 +414,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             if (fileDetails != null && !fileDetails.isEmpty()) {\r
                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
                 transaction.remove(fileDetails);\r
-                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null));\r
+                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG);\r
                 transaction.commit();\r
             }\r
         }\r
@@ -403,6 +431,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         Log.d(getClass().toString(), "onSaveInstanceState() start");\r
         super.onSaveInstanceState(outState);\r
         outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
+        if (mDualPane) {\r
+            FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+            OCFile file = fragment.getDisplayedFile();\r
+            if (file != null) {\r
+                outState.putParcelable(FileDetailFragment.EXTRA_FILE, file);\r
+            }\r
+        }\r
         Log.d(getClass().toString(), "onSaveInstanceState() end");\r
     }\r
 \r
@@ -416,6 +451,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             if (mStorageManager == null) {\r
                 // this is necessary for handling the come back to FileDisplayActivity when the first ownCloud account is created \r
                 initDataFromCurrentAccount();\r
+                if (mDualPane) {\r
+                    initFileDetailsInDualPane();\r
+                }\r
             }\r
             \r
             // Listen for sync messages\r
@@ -445,6 +483,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         Log.d(getClass().toString(), "onResume() end");\r
     }\r
 \r
+    \r
     @Override\r
     protected void onPause() {\r
         Log.d(getClass().toString(), "onPause() start");\r
@@ -465,7 +504,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             dismissDialog(DIALOG_SETUP_ACCOUNT);\r
         }\r
         \r
-        getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
         Log.d(getClass().toString(), "onPause() end");\r
     }\r
 \r
@@ -836,7 +874,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             if (fileDetails != null && !fileDetails.isEmpty()) {\r
                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
                 transaction.remove(fileDetails);\r
-                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null));\r
+                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG);\r
                 transaction.commit();\r
             }\r
         }\r
@@ -860,7 +898,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         } else {    // small or medium screen device -> new Activity\r
             Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
-            showDetailsIntent.putExtra(FileDownloader.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
             startActivity(showDetailsIntent);\r
         }\r
     }\r

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index c84e2cf..10b2fdb 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -173,6 +173,7 @@ public class FileDetailFragment extends SherlockFragment implements
             mPreview = (ImageView)mView.findViewById(R.id.fdPreview);\r
         }\r
         \r
+        updateFileDetails();\r
         return view;\r
     }\r
     \r