[tx-robot] updated from transifex

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index 3fba453..99e4c91 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -145,6 +145,8 @@ public class FileActivity extends AppCompatActivity
 
     private OperationsServiceBinder mOperationsServiceBinder = null;
 
 
     private OperationsServiceBinder mOperationsServiceBinder = null;
 

+    private boolean mResumed = false;
+

     protected FileDownloaderBinder mDownloaderBinder = null;
     protected FileUploaderBinder mUploaderBinder = null;
     private ServiceConnection mDownloadServiceConnection, mUploadServiceConnection = null;
     protected FileDownloaderBinder mDownloaderBinder = null;
     protected FileUploaderBinder mUploaderBinder = null;
     private ServiceConnection mDownloadServiceConnection, mUploadServiceConnection = null;


@@ -257,7 +259,7 @@ public class FileActivity extends AppCompatActivity
     @Override
     protected void onResume() {
         super.onResume();
     @Override
     protected void onResume() {
         super.onResume();

-
+        mResumed = true;

         if (mOperationsServiceBinder != null) {
             doOnResumeAndBound();
         }
         if (mOperationsServiceBinder != null) {
             doOnResumeAndBound();
         }


@@ -268,7 +270,7 @@ public class FileActivity extends AppCompatActivity
         if (mOperationsServiceBinder != null) {
             mOperationsServiceBinder.removeOperationListener(this);
         }
         if (mOperationsServiceBinder != null) {
             mOperationsServiceBinder.removeOperationListener(this);
         }

-
+        mResumed = false;

         super.onPause();
     }
 
         super.onPause();
     }
 


@@ -760,10 +762,10 @@ public class FileActivity extends AppCompatActivity
             onSynchronizeFileOperationFinish((SynchronizeFileOperation) operation, result);
 
         } else if (operation instanceof GetSharesForFileOperation) {
             onSynchronizeFileOperationFinish((SynchronizeFileOperation) operation, result);
 
         } else if (operation instanceof GetSharesForFileOperation) {

-            if (result.isSuccess()) {
+            if (result.isSuccess() || result.getCode() == ResultCode.SHARE_NOT_FOUND) {

                 updateFileFromDB();
 
                 updateFileFromDB();
 

-            } else if (result.getCode() != ResultCode.SHARE_NOT_FOUND) {
+            } else {

                 Toast t = Toast.makeText(this,
                         ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
                         Toast.LENGTH_LONG);
                 Toast t = Toast.makeText(this,
                         ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
                         Toast.LENGTH_LONG);


@@ -799,7 +801,7 @@ public class FileActivity extends AppCompatActivity
             if (result.getCode() == ResultCode.SHARE_FORBIDDEN) {
                 String password = operation.getPassword();
                 if ((password == null || password.length() == 0) &&
             if (result.getCode() == ResultCode.SHARE_FORBIDDEN) {
                 String password = operation.getPassword();
                 if ((password == null || password.length() == 0) &&

-                    !getCapabilities().getFilesSharingPublicEnabled().isFalse())
+                    getCapabilities().getFilesSharingPublicEnabled().isUnknown())

                     {
                     // Was tried without password, but not sure that it's optional. Try with password.
                     // Try with password before giving up.
                     {
                     // Was tried without password, but not sure that it's optional. Try with password.
                     // Try with password before giving up.


@@ -903,7 +905,9 @@ public class FileActivity extends AppCompatActivity
                 /*if (!mOperationsServiceBinder.isPerformingBlockingOperation()) {
                     dismissLoadingDialog();
                 }*/
                 /*if (!mOperationsServiceBinder.isPerformingBlockingOperation()) {
                     dismissLoadingDialog();
                 }*/

-                doOnResumeAndBound();
+                if (mResumed) {
+                    doOnResumeAndBound();
+                }

 
             } else {
                 return;
 
             } else {
                 return;