From: masensio Date: Mon, 19 May 2014 11:31:37 +0000 (+0200) Subject: Merge pull request #495 from owncloud/fixed_loading_dialog_dismissed_on_rotation X-Git-Tag: oc-android-1.7.0_signed~309^2~10 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/81fd95ad6f9de92b8c2a65234758c605559d933e?hp=ee53304947ef26b0e7da692b18ba46f39e99a203 Merge pull request #495 from owncloud/fixed_loading_dialog_dismissed_on_rotation Fixed loading dialog dismissed on rotation --- diff --git a/src/com/owncloud/android/files/services/FileObserverService.java b/src/com/owncloud/android/files/services/FileObserverService.java index c6753896..1bcd8d63 100644 --- a/src/com/owncloud/android/files/services/FileObserverService.java +++ b/src/com/owncloud/android/files/services/FileObserverService.java @@ -82,10 +82,10 @@ public class FileObserverService extends Service { @Override public void onDestroy() { - super.onDestroy(); unregisterReceiver(mDownloadReceiver); mObserversMap = null; // TODO study carefully the life cycle of Services to grant the best possible observance Log_OC.d(TAG, "Bye, bye"); + super.onDestroy(); } diff --git a/src/com/owncloud/android/media/MediaService.java b/src/com/owncloud/android/media/MediaService.java index 0a746355..7ee80570 100644 --- a/src/com/owncloud/android/media/MediaService.java +++ b/src/com/owncloud/android/media/MediaService.java @@ -218,6 +218,7 @@ public class MediaService extends Service implements OnCompletionListener, OnPre */ @Override public void onCreate() { + super.onCreate(); Log_OC.d(TAG, "Creating ownCloud media service"); mWifiLock = ((WifiManager) getSystemService(Context.WIFI_SERVICE)). @@ -637,6 +638,7 @@ public class MediaService extends Service implements OnCompletionListener, OnPre mState = State.STOPPED; releaseResources(true); giveUpAudioFocus(); + super.onDestroy(); } diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java index 1c841f51..a6388488 100644 --- a/src/com/owncloud/android/services/OperationsService.java +++ b/src/com/owncloud/android/services/OperationsService.java @@ -172,10 +172,10 @@ public class OperationsService extends Service { @Override public void onDestroy() { //Log_OC.wtf(TAG, "onDestroy init" ); - super.onDestroy(); //Log_OC.wtf(TAG, "Clear mUndispatchedFinisiedOperations" ); mUndispatchedFinishedOperations.clear(); //Log_OC.wtf(TAG, "onDestroy end" ); + super.onDestroy(); } diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java index e1c7b47a..27ce4d94 100644 --- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java +++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java @@ -89,7 +89,6 @@ public class AccountSelectActivity extends SherlockListActivity implements @Override protected void onPause() { - super.onPause(); if (this.isFinishing()) { Account current = AccountUtils.getCurrentOwnCloudAccount(this); if ((mPreviousAccount == null && current != null) || @@ -102,6 +101,7 @@ public class AccountSelectActivity extends SherlockListActivity implements startActivity(i); } } + super.onPause(); } @Override diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java index bebc1437..d38d69de 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -180,9 +180,6 @@ implements OnRemoteOperationListener, ComponentsGetter { if (mAccountWasSet) { onAccountSet(mAccountWasRestored); } - if (mOperationsServiceBinder != null) { - mOperationsServiceBinder.addOperationListener(FileActivity.this, mHandler); - } } @Override @@ -204,20 +201,9 @@ implements OnRemoteOperationListener, ComponentsGetter { super.onPause(); } - @Override - protected void onStop() { - - if (mOperationsServiceBinder != null) { - mOperationsServiceBinder.removeOperationListener(this); - } - - super.onStop(); - } - @Override protected void onDestroy() { - super.onDestroy(); if (mOperationsServiceConnection != null) { unbindService(mOperationsServiceConnection); mOperationsServiceBinder = null; @@ -230,6 +216,7 @@ implements OnRemoteOperationListener, ComponentsGetter { unbindService(mUploadServiceConnection); mUploadServiceConnection = null; } + super.onDestroy(); } diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index da888599..890b6a20 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -696,7 +696,6 @@ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener @Override protected void onPause() { - super.onPause(); Log_OC.e(TAG, "onPause() start"); if (mSyncBroadcastReceiver != null) { unregisterReceiver(mSyncBroadcastReceiver); @@ -712,9 +711,8 @@ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener mDownloadFinishReceiver = null; } - dismissLoadingDialog(); - Log_OC.d(TAG, "onPause() end"); + super.onPause(); } diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java index 3ebb432c..1f18ca8a 100644 --- a/src/com/owncloud/android/ui/activity/Preferences.java +++ b/src/com/owncloud/android/ui/activity/Preferences.java @@ -261,10 +261,10 @@ public class Preferences extends SherlockPreferenceActivity { @Override protected void onResume() { + super.onResume(); SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); boolean state = appPrefs.getBoolean("set_pincode", false); pCode.setChecked(state); - super.onResume(); } @Override diff --git a/src/com/owncloud/android/ui/dialog/LoadingDialog.java b/src/com/owncloud/android/ui/dialog/LoadingDialog.java index 5622441b..d0dcfb7b 100644 --- a/src/com/owncloud/android/ui/dialog/LoadingDialog.java +++ b/src/com/owncloud/android/ui/dialog/LoadingDialog.java @@ -69,6 +69,6 @@ public class LoadingDialog extends DialogFragment { public void onDestroyView() { if (getDialog() != null && getRetainInstance()) getDialog().setDismissMessage(null); - super.onDestroyView(); + super.onDestroyView(); } } diff --git a/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java b/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java index 43ad2f8b..311e400d 100644 --- a/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java +++ b/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java @@ -43,6 +43,7 @@ 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; import com.owncloud.android.utils.Log_OC; @@ -132,7 +133,9 @@ public class ShareLinkToDialog extends SherlockDialogFragment { // Add the information of the chosen activity to the intent to send ResolveInfo chosen = mAdapter.getItem(which); ActivityInfo actInfo = chosen.activityInfo; - ComponentName name=new ComponentName(actInfo.applicationInfo.packageName, actInfo.name); + ComponentName name=new ComponentName( + actInfo.applicationInfo.packageName, + actInfo.name); mIntent.setComponent(name); if (sendAction) { @@ -143,9 +146,8 @@ public class ShareLinkToDialog extends SherlockDialogFragment { } else { // Create a new share resource - FileOperationsHelper foh = - new FileOperationsHelper((FileActivity)getSherlockActivity()); - foh.shareFileWithLinkToApp(mFile, mIntent); + ((ComponentsGetter)getSherlockActivity()).getFileOperationsHelper() + .shareFileWithLinkToApp(mFile, mIntent); } } }) diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java index c9d6b335..76cee973 100644 --- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -147,8 +147,8 @@ public class FileDetailFragment extends FileFragment implements OnClickListener @Override public void onStop() { - super.onStop(); leaveTransferProgress(); + super.onStop(); } diff --git a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java index 849afaf2..fe7bf6c9 100644 --- a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java +++ b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java @@ -164,8 +164,8 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene @Override public void onStop() { - super.onStop(); leaveTransferProgress(); + super.onStop(); } @Override diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java index d4e95cbd..954f4a7d 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -269,9 +269,9 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener { @Override public void onPause() { - super.onPause(); unregisterReceiver(mDownloadFinishReceiver); mDownloadFinishReceiver = null; + super.onPause(); } diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 0a66966e..54f73333 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -297,10 +297,10 @@ public class PreviewImageFragment extends FileFragment { @Override public void onDestroy() { - super.onDestroy(); if (mBitmap != null) { mBitmap.recycle(); } + super.onDestroy(); } diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java index 5f5ceaa6..83649729 100644 --- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -457,8 +457,8 @@ public class PreviewMediaFragment extends FileFragment implements @Override public void onPause() { - super.onPause(); Log_OC.e(TAG, "onPause"); + super.onPause(); } @Override @@ -469,14 +469,13 @@ public class PreviewMediaFragment extends FileFragment implements @Override public void onDestroy() { - super.onDestroy(); Log_OC.e(TAG, "onDestroy"); + super.onDestroy(); } @Override public void onStop() { Log_OC.e(TAG, "onStop"); - super.onStop(); mPrepared = false; if (mMediaServiceConnection != null) { @@ -488,6 +487,8 @@ public class PreviewMediaFragment extends FileFragment implements mMediaServiceConnection = null; mMediaServiceBinder = null; } + + super.onStop(); } @Override