Variable nameing / imports improved, fixed nullpointer on account

[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 1b909a4..294dbfa 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.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.Context;\r
 import android.content.DialogInterface;\r

-import android.content.DialogInterface.OnCancelListener;\r

 import android.content.DialogInterface.OnClickListener;\r
 import android.content.DialogInterface.OnClickListener;\r

-import android.content.BroadcastReceiver;\r

 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.net.Uri;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.net.Uri;\r


@@ -53,7 +53,7 @@ import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
 import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r

-import eu.alefzero.owncloud.syncadapter.FileSyncAdapter;\r
+import eu.alefzero.owncloud.syncadapter.FileSyncService;\r

 import eu.alefzero.owncloud.ui.fragment.FileListFragment;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 import eu.alefzero.owncloud.ui.fragment.FileListFragment;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r


@@ -69,7 +69,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
        private ArrayAdapter<String> mDirectories;\r
        private DataStorageManager mStorageManager;\r
 \r
        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
        \r
        private static final int DIALOG_SETUP_ACCOUNT = 0;\r
        private static final int DIALOG_CREATE_DIR = 1;\r


@@ -179,6 +179,14 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                        showDialog(DIALOG_CREATE_DIR);\r
                        break;\r
                }\r
                        showDialog(DIALOG_CREATE_DIR);\r
                        break;\r
                }\r

+               case R.id.startSync: {\r
+                 Bundle bundle = new Bundle();\r
+      bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
+      ContentResolver.requestSync(AccountUtils.getCurrentOwnCloudAccount(this),\r
+                     "org.owncloud",\r
+                     bundle);\r
+      break;\r
+               }\r

                case android.R.id.home: {\r
                        onBackPressed();\r
                        break;\r
                case android.R.id.home: {\r
                        onBackPressed();\r
                        break;\r


@@ -231,16 +239,18 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
       showDialog(DIALOG_SETUP_ACCOUNT);\r
       return;\r
     }\r
       showDialog(DIALOG_SETUP_ACCOUNT);\r
       return;\r
     }\r

-          IntentFilter f = new IntentFilter(FileSyncAdapter.SYNC_MESSAGE);\r
-          b = new  BR();\r
-          registerReceiver(b, f);\r
+          IntentFilter syncMessageIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);\r
+          syncBroadcastRevceiver = new  SyncBroadcastReceiver();\r
+          registerReceiver(syncBroadcastRevceiver, syncMessageIntentFilter);\r

           setProgressBarIndeterminateVisibility(false);\r
        }\r
            \r
         @Override\r
        protected void onPause() {\r
          super.onPause();\r
           setProgressBarIndeterminateVisibility(false);\r
        }\r
            \r
         @Override\r
        protected void onPause() {\r
          super.onPause();\r

-         unregisterReceiver(b);\r
+         if(syncBroadcastRevceiver != null){\r
+                 unregisterReceiver(syncBroadcastRevceiver);  \r
+         }\r

        }\r
         \r
        @Override\r
        }\r
         \r
        @Override\r


@@ -341,17 +351,20 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     return accounts.length > 0;\r
   }\r
   \r
     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
     @Override\r
     public void onReceive(Context context, Intent intent) {\r

-      boolean in_progress = intent.getBooleanExtra(FileSyncAdapter.IN_PROGRESS, false);\r
-      String account_name = intent.getStringExtra(FileSyncAdapter.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
+      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: " + 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
       }\r
     }\r
     \r