X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/8ba2ca7b8556de4aea4a7a8407a204b4dcfca34c..7c93676d6fe1f8ab6b48ff04bf7edc62efb63142:/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 6bc0b0fc..ce89b872 100644
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -80,7 +80,7 @@ import eu.alefzero.webdav.WebdavClient;
  */
 
 public class FileDisplayActivity extends SherlockFragmentActivity implements
-    FileListFragment.ContainerActivity, OnNavigationListener, OnClickListener, android.view.View.OnClickListener  {
+    FileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener, OnClickListener, android.view.View.OnClickListener  {
     
     private ArrayAdapter<String> mDirectories;
     private OCFile mCurrentDir;
@@ -185,7 +185,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 action = action.setType("*/*")
                         .addCategory(Intent.CATEGORY_OPENABLE);
                 startActivityForResult(
-                        Intent.createChooser(action, "Upload file from..."),
+                        Intent.createChooser(action, getString(R.string.upload_chooser_title)),
                         ACTION_SELECT_FILE);
                 break;
             }
@@ -441,7 +441,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             break;
         case DIALOG_ABOUT_APP: {
             builder = new AlertDialog.Builder(this);
-            builder.setTitle("About");
+            builder.setTitle(getString(R.string.about_title));
             PackageInfo pkg;
             try {
                 pkg = getPackageManager().getPackageInfo(getPackageName(), 0);
@@ -707,12 +707,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private class DownloadFinishReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
-            boolean downloadWasFine = intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false);
             String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
             String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME);
 
             if (accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name) &&
-                    downloadWasFine && mCurrentDir != null && mCurrentDir.getFileId() == mStorageManager.getFileByPath(downloadedRemotePath).getParentId()) {
+                     mCurrentDir != null && mCurrentDir.getFileId() == mStorageManager.getFileByPath(downloadedRemotePath).getParentId()) {
                 FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
                 if (fileListFragment != null) { 
                     fileListFragment.listDirectory();
@@ -789,6 +788,19 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         }
     }
     
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onFileStateChanged() {
+        FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
+        if (fileListFragment != null) { 
+            fileListFragment.listDirectory();
+        }
+    }
+    
+    
     /**
      *  Operations in this method should be preferably performed in onCreate to have a lighter onResume method. 
      *