From: Lennart Rosam <lennart@familie-rosam.de>
Date: Tue, 8 May 2012 01:17:51 +0000 (+0200)
Subject: Variable nameing / imports improved, fixed nullpointer on account
X-Git-Tag: oc-android-1.4.3~426^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/abf48afde301e30ff341fc154c9b678315783a9e?hp=-c

Variable nameing / imports improved, fixed nullpointer on account
creation
---

abf48afde301e30ff341fc154c9b678315783a9e
diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 916b90ee..294dbfa6 100644
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -23,12 +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.OnCancelListener;
 import android.content.DialogInterface.OnClickListener;
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.Uri;
@@ -54,8 +53,6 @@ import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
 import eu.alefzero.owncloud.datamodel.DataStorageManager;
 import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
 import eu.alefzero.owncloud.datamodel.OCFile;
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
-import eu.alefzero.owncloud.syncadapter.FileSyncAdapter;
 import eu.alefzero.owncloud.syncadapter.FileSyncService;
 import eu.alefzero.owncloud.ui.fragment.FileListFragment;
 import eu.alefzero.webdav.WebdavClient;
@@ -72,7 +69,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 	private ArrayAdapter<String> 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;
@@ -242,16 +239,18 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
       showDialog(DIALOG_SETUP_ACCOUNT);
       return;
     }
-	   IntentFilter f = new IntentFilter(FileSyncService.SYNC_MESSAGE);
-	   b = new  BR();
-	   registerReceiver(b, f);
+	   IntentFilter syncMessageIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);
+	   syncBroadcastRevceiver = new  SyncBroadcastReceiver();
+	   registerReceiver(syncBroadcastRevceiver, syncMessageIntentFilter);
 	   setProgressBarIndeterminateVisibility(false);
 	}
 	    
 	 @Override
 	protected void onPause() {
 	  super.onPause();
-	  unregisterReceiver(b);
+	  if(syncBroadcastRevceiver != null){
+		  unregisterReceiver(syncBroadcastRevceiver);  
+	  }
 	}
 	 
 	@Override
@@ -352,17 +351,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();
       }
     }