|
@@ -179,6 +179,13 @@ public class Uploader extends FileActivity
|
|
if (mAccountSelected) {
|
|
if (mAccountSelected) {
|
|
setAccount((Account) savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT));
|
|
setAccount((Account) savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT));
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ // Listen for sync messages
|
|
|
|
+ IntentFilter syncIntentFilter = new IntentFilter(RefreshFolderOperation.
|
|
|
|
+ EVENT_SINGLE_FOLDER_CONTENTS_SYNCED);
|
|
|
|
+ syncIntentFilter.addAction(RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED);
|
|
|
|
+ mSyncBroadcastReceiver = new SyncBroadcastReceiver();
|
|
|
|
+ registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -203,13 +210,6 @@ public class Uploader extends FileActivity
|
|
showDialog(DIALOG_NO_STREAM);
|
|
showDialog(DIALOG_NO_STREAM);
|
|
}
|
|
}
|
|
|
|
|
|
- // Listen for sync messages
|
|
|
|
- IntentFilter syncIntentFilter = new IntentFilter(RefreshFolderOperation.
|
|
|
|
- EVENT_SINGLE_FOLDER_CONTENTS_SYNCED);
|
|
|
|
- syncIntentFilter.addAction(RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED);
|
|
|
|
- mSyncBroadcastReceiver = new SyncBroadcastReceiver();
|
|
|
|
- registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
|
|
|
|
-
|
|
|
|
super.setAccount(account, savedAccount);
|
|
super.setAccount(account, savedAccount);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -236,6 +236,14 @@ public class Uploader extends FileActivity
|
|
Log_OC.d(TAG, "onSaveInstanceState() end");
|
|
Log_OC.d(TAG, "onSaveInstanceState() end");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
+ protected void onDestroy(){
|
|
|
|
+ if (mSyncBroadcastReceiver != null) {
|
|
|
|
+ unregisterReceiver(mSyncBroadcastReceiver);
|
|
|
|
+ }
|
|
|
|
+ super.onDestroy();
|
|
|
|
+ }
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
protected Dialog onCreateDialog(final int id) {
|
|
protected Dialog onCreateDialog(final int id) {
|
|
final AlertDialog.Builder builder = new Builder(this);
|
|
final AlertDialog.Builder builder = new Builder(this);
|
|
@@ -357,7 +365,6 @@ public class Uploader extends FileActivity
|
|
@Override
|
|
@Override
|
|
public void onBackPressed() {
|
|
public void onBackPressed() {
|
|
if (mParents.size() <= 1) {
|
|
if (mParents.size() <= 1) {
|
|
- unregisterReceiver(mSyncBroadcastReceiver);
|
|
|
|
super.onBackPressed();
|
|
super.onBackPressed();
|
|
return;
|
|
return;
|
|
} else {
|
|
} else {
|