X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/0aeb425885ceccb28b31c9822d52b90656bf9257..2c9b84a862a7ed644bf03242449f37ca1065123d:/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 cec268bd..b87fd1d1 100644 --- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java +++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java @@ -23,11 +23,11 @@ import android.accounts.AccountManager; import android.app.AlertDialog; import android.app.AlertDialog.Builder; import android.app.Dialog; +import android.content.BroadcastReceiver; +import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; -import android.content.BroadcastReceiver; -import android.content.ContentResolver; import android.content.Intent; import android.content.IntentFilter; import android.database.Cursor; @@ -71,7 +71,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements private ArrayAdapter mDirectories; private DataStorageManager mStorageManager; - private BR b; + private SyncBroadcastReceiver syncBroadcastRevceiver; private static final int DIALOG_SETUP_ACCOUNT = 0; private static final int DIALOG_CREATE_DIR = 1; @@ -243,8 +243,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } IntentFilter f = new IntentFilter(FileSyncService.SYNC_MESSAGE); - b = new BR(); - registerReceiver(b, f); + syncBroadcastRevceiver = new SyncBroadcastReceiver(); + registerReceiver(syncBroadcastRevceiver, f); if (getSupportFragmentManager().findFragmentById(R.id.fileList) == null) setContentView(R.layout.files); @@ -304,9 +304,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements @Override protected void onPause() { super.onPause(); - if (b != null) { - unregisterReceiver(b); - b = null; + if (syncBroadcastRevceiver != null) { + unregisterReceiver(syncBroadcastRevceiver); + syncBroadcastRevceiver = null; } } @@ -409,17 +409,20 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements return accounts.length > 0; } - private class BR extends BroadcastReceiver { + private class SyncBroadcastReceiver extends BroadcastReceiver { + /** + * {@link BroadcastReceiver} to enable syncing feedback in UI + */ @Override public void onReceive(Context context, Intent intent) { - boolean in_progress = intent.getBooleanExtra(FileSyncService.IN_PROGRESS, false); + boolean inProgress = intent.getBooleanExtra(FileSyncService.IN_PROGRESS, false); String account_name = intent.getStringExtra(FileSyncService.ACCOUNT_NAME); - Log.d("FileDisplay", "sync of account " + account_name + " is in_progress: " + in_progress); - setProgressBarIndeterminateVisibility(in_progress); - if (!in_progress) { - FileListFragment f = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); - if (f != null) - f.populateFileList(); + Log.d("FileDisplay", "sync of account " + account_name + " is in_progress: " + inProgress); + setProgressBarIndeterminateVisibility(inProgress); + if (!inProgress) { + FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); + if (fileListFramgent != null) + fileListFramgent.populateFileList(); } }