Fixed crash when the device is turned while the warning dialog about server certifica...

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index da1668a..0401b07 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -40,6 +40,7 @@ import android.content.res.Resources.NotFoundException;
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
+import android.os.Environment;\r
 import android.os.Handler;\r
 import android.preference.PreferenceManager;\r
 import android.provider.MediaStore;\r
@@ -65,8 +66,12 @@ import com.owncloud.android.authenticator.AccountAuthenticator;
 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
+import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;\r
+import com.owncloud.android.files.OwnCloudFileObserver;\r
 import com.owncloud.android.files.services.FileDownloader;\r
+import com.owncloud.android.files.services.FileObserverService;\r
 import com.owncloud.android.files.services.FileUploader;\r
+import com.owncloud.android.network.OwnCloudClientUtils;\r
 import com.owncloud.android.syncadapter.FileSyncService;\r
 import com.owncloud.android.ui.fragment.FileDetailFragment;\r
 import com.owncloud.android.ui.fragment.OCFileListFragment;\r
@@ -107,13 +112,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     \r
     private static final String TAG = "FileDisplayActivity";\r
     \r
-    \r
     @Override\r
     public void onCreate(Bundle savedInstanceState) {\r
         Log.d(getClass().toString(), "onCreate() start");\r
         super.onCreate(savedInstanceState);\r
-\r
-        Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
+        \r
+        //Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
 \r
         /// saved instance state: keep this always before initDataFromCurrentAccount()\r
         if(savedInstanceState != null) {\r
@@ -136,6 +140,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             requestPinCode();\r
         }\r
 \r
+        // file observer\r
+        Intent observer_intent = new Intent(this, FileObserverService.class);\r
+        observer_intent.putExtra(FileObserverService.KEY_FILE_CMD, FileObserverService.CMD_INIT_OBSERVED_LIST);\r
+        startService(observer_intent);\r
             \r
         /// USER INTERFACE\r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
@@ -221,12 +229,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 break;\r
             }\r
             case R.id.startSync: {\r
-                ContentResolver.cancelSync(null, "org.owncloud");   // cancel the current synchronizations of any ownCloud account\r
+                ContentResolver.cancelSync(null, AccountAuthenticator.AUTH_TOKEN_TYPE);   // cancel the current synchronizations of any ownCloud account\r
                 Bundle bundle = new Bundle();\r
                 bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
                 ContentResolver.requestSync(\r
                         AccountUtils.getCurrentOwnCloudAccount(this),\r
-                        "org.owncloud", bundle);\r
+                        AccountAuthenticator.AUTH_TOKEN_TYPE, bundle);\r
                 break;\r
             }\r
             case R.id.action_upload: {\r
@@ -643,14 +651,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     \r
         @Override\r
         public void run() {\r
-            WebdavClient wdc = new WebdavClient(mAccount, getApplicationContext());\r
-            \r
-            String username = mAccount.name.substring(0,\r
-                    mAccount.name.lastIndexOf('@'));\r
-            String password = mAm.getPassword(mAccount);\r
-    \r
-            wdc.setCredentials(username, password);\r
-            wdc.allowSelfsignedCertificates();\r
+            WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());\r
             boolean created = wdc.createDirectory(mTargetPath);\r
             if (created) {\r
                 mHandler.post(new Runnable() {\r