From a9bfb401d529649aa07170f7f22975d2cbd363a3 Mon Sep 17 00:00:00 2001 From: masensio Date: Tue, 20 May 2014 12:15:26 +0200 Subject: [PATCH] Fix: Loading icon is there when coming back to the app --- src/com/owncloud/android/services/OperationsService.java | 9 ++++++++- src/com/owncloud/android/ui/activity/FileActivity.java | 5 ++++- src/com/owncloud/android/ui/activity/FileDisplayActivity.java | 1 + src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java | 1 - 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java index a6388488..0f836524 100644 --- a/src/com/owncloud/android/services/OperationsService.java +++ b/src/com/owncloud/android/services/OperationsService.java @@ -388,13 +388,20 @@ public class OperationsService extends Service { } } - public void dispatchResultIfFinished(int operationId, OnRemoteOperationListener listener) { + public boolean dispatchResultIfFinished(int operationId, OnRemoteOperationListener listener) { Pair undispatched = mUndispatchedFinishedOperations.remove(operationId); if (undispatched != null) { listener.onRemoteOperationFinish(undispatched.first, undispatched.second); + return true; //Log_OC.wtf(TAG, "Sending callback later"); } else { + if (!mPendingOperations.isEmpty()) { + nextOperation(); + return true; + } else { + return false; + } //Log_OC.wtf(TAG, "Not finished yet"); } } diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java index d38d69de..f9d8bb1f 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -540,7 +540,10 @@ implements OnRemoteOperationListener, ComponentsGetter { mOperationsServiceBinder.addOperationListener(FileActivity.this, mHandler); long waitingForOpId = mFileOperationsHelper.getOpIdWaitingFor(); if (waitingForOpId <= Integer.MAX_VALUE) { - mOperationsServiceBinder.dispatchResultIfFinished((int)waitingForOpId, this); + boolean wait = mOperationsServiceBinder.dispatchResultIfFinished((int)waitingForOpId, this); + if (!wait ) { + dismissLoadingDialog(); + } } } diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index 890b6a20..9363de2c 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -711,6 +711,7 @@ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener mDownloadFinishReceiver = null; } + Log_OC.d(TAG, "onPause() end"); super.onPause(); } diff --git a/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java b/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java index 311e400d..7d7fe0ea 100644 --- a/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java +++ b/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java @@ -42,7 +42,6 @@ import android.widget.TextView; import com.actionbarsherlock.app.SherlockDialogFragment; import com.owncloud.android.R; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.files.FileOperationsHelper; import com.owncloud.android.ui.activity.ComponentsGetter; import com.owncloud.android.ui.activity.CopyToClipboardActivity; import com.owncloud.android.ui.activity.FileActivity; -- 2.11.0