merge fix

[pub/Android/ownCloud.git] / 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 cec268b..1db5246 100644 (file)
--- 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;\r
 import android.app.AlertDialog.Builder;\r
 import android.app.Dialog;\r
+import android.content.BroadcastReceiver;\r
+import android.content.ContentResolver;\r
 import android.content.Context;\r
 import android.content.DialogInterface;\r
 import android.content.DialogInterface.OnClickListener;\r
-import android.content.BroadcastReceiver;\r
-import android.content.ContentResolver;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.database.Cursor;\r
@@ -71,7 +71,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
        private ArrayAdapter<String> mDirectories;\r
        private DataStorageManager mStorageManager;\r
 \r
-       private BR  b;\r
+       private SyncBroadcastReceiver  syncBroadcastRevceiver;\r
        \r
        private static final int DIALOG_SETUP_ACCOUNT = 0;\r
        private static final int DIALOG_CREATE_DIR = 1;\r
@@ -409,17 +409,20 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     return accounts.length > 0;\r
   }\r
   \r
-  private class BR extends BroadcastReceiver {\r
+  private class SyncBroadcastReceiver extends BroadcastReceiver {\r
+         /**\r
+          * {@link BroadcastReceiver} to enable syncing feedback in UI\r
+          */\r
     @Override\r
     public void onReceive(Context context, Intent intent) {\r
-      boolean in_progress = intent.getBooleanExtra(FileSyncService.IN_PROGRESS, false);\r
+      boolean inProgress = intent.getBooleanExtra(FileSyncService.IN_PROGRESS, false);\r
       String account_name = intent.getStringExtra(FileSyncService.ACCOUNT_NAME);\r
-      Log.d("FileDisplay", "sync of account " + account_name + " is in_progress: " + in_progress);\r
-      setProgressBarIndeterminateVisibility(in_progress);\r
-      if (!in_progress) {\r
-        FileListFragment f = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
-        if (f != null)\r
-          f.populateFileList();\r
+      Log.d("FileDisplay", "sync of account " + account_name + " is in_progress: " + inProgress);\r
+      setProgressBarIndeterminateVisibility(inProgress);\r
+      if (!inProgress) {\r
+        FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
+        if (fileListFramgent != null)\r
+          fileListFramgent.populateFileList();\r
       }\r
     }\r
     \r