dummy crash upload dialog

[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 2695321..0f2daf0 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -18,7 +18,10 @@
 \r
 package eu.alefzero.owncloud.ui.activity;\r
 \r
+import java.io.BufferedReader;\r
 import java.io.File;\r
+import java.io.InputStreamReader;\r
+import java.lang.Thread.UncaughtExceptionHandler;\r
 import java.net.URLEncoder;\r
 import java.util.ArrayList;\r
 \r
@@ -38,6 +41,7 @@ import android.database.Cursor;
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.provider.MediaStore;\r
+import android.telephony.TelephonyManager;\r
 import android.util.Log;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r
@@ -55,6 +59,7 @@ import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;\r
 \r
 import eu.alefzero.owncloud.AccountUtils;\r
+import eu.alefzero.owncloud.CrashHandler;\r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
@@ -96,7 +101,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
         setProgressBarIndeterminateVisibility(false);\r
-        \r
+\r
+        Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
+\r
         if(savedInstanceState != null){\r
             mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR);\r
         }\r
@@ -104,12 +111,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
     @Override\r
     public boolean onCreateOptionsMenu(Menu menu) {\r
-        if (accountsAreSetup()) {\r
-            MenuInflater inflater = getSherlock().getMenuInflater();\r
+        MenuInflater inflater = getSherlock().getMenuInflater();\r
             inflater.inflate(R.menu.menu, menu);\r
             return true;\r
-        }\r
-        return false;\r
     }\r
 \r
     @Override\r
@@ -137,9 +141,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                         ACTION_SELECT_FILE);\r
                 break;\r
             }\r
-            case R.id.action_accounts: {\r
-                Intent accountIntent = new Intent(this, AccountSelectActivity.class);\r
-                startActivity(accountIntent);\r
+            case R.id.action_settings: {\r
+                Intent settingsIntent = new Intent(this, Preferences.class);\r
+                startActivity(settingsIntent);\r
             }\r
             case android.R.id.home: {\r
                 if(mCurrentDir != null && mCurrentDir.getParentId() != 0){\r
@@ -194,7 +198,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 if (!remotepath.endsWith("/"))\r
                     remotepath += "/";\r
                 remotepath += URLEncoder.encode(new File(filepath).getName());\r
-                Log.e("ASD", remotepath + "");\r
     \r
                 i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
                 i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r
@@ -206,7 +209,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
     @Override\r
     public void onBackPressed() {\r
-        if (mDirectories == null || mDirectories.getCount() == 1) {\r
+        if (mDirectories == null || mDirectories.getCount() <= 1) {\r
             finish();\r
             return;\r
         }\r
@@ -499,7 +502,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             String password = mAm.getPassword(mAccount);\r
     \r
             wdc.setCredentials(username, password);\r
-            wdc.allowUnsignedCertificates();\r
+            wdc.allowSelfsignedCertificates();\r
             wdc.createDirectory(mTargetPath);\r
         }\r
     \r
@@ -562,6 +565,5 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             intent.putExtra("authorities", new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
             startActivity(intent);\r
         }\r
-    }\r
-\r
+    }    \r
 }\r