X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/b735fc9458a32ec70547ac830b82dcc29f1074cc..6e3b5f488c3047424acb0aa47b3d5a16287556b1:/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 93cf6495..0f2daf01 100644
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -18,7 +18,10 @@
 
 package eu.alefzero.owncloud.ui.activity;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.InputStreamReader;
+import java.lang.Thread.UncaughtExceptionHandler;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 
@@ -38,10 +41,12 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
+import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.CheckedTextView;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -54,6 +59,7 @@ import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
 
 import eu.alefzero.owncloud.AccountUtils;
+import eu.alefzero.owncloud.CrashHandler;
 import eu.alefzero.owncloud.R;
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
 import eu.alefzero.owncloud.datamodel.DataStorageManager;
@@ -73,7 +79,7 @@ import eu.alefzero.webdav.WebdavClient;
  */
 
 public class FileDisplayActivity extends SherlockFragmentActivity implements
-        OnNavigationListener, OnClickListener {
+        OnNavigationListener, OnClickListener, android.view.View.OnClickListener {
     private ArrayAdapter<String> mDirectories;
     private DataStorageManager mStorageManager;
     private FileListFragment mFileList;
@@ -93,26 +99,21 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (!accountsAreSetup()) {
-            showDialog(DIALOG_SETUP_ACCOUNT);
-            return;
-        }
-
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
         setProgressBarIndeterminateVisibility(false);
-        
+
+        Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));
+
         if(savedInstanceState != null){
             mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR);
         }
-        
-        setContentView(R.layout.files);
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getSherlock().getMenuInflater();
-        inflater.inflate(R.menu.menu, menu);
-        return true;
+            inflater.inflate(R.menu.menu, menu);
+            return true;
     }
 
     @Override
@@ -140,9 +141,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                         ACTION_SELECT_FILE);
                 break;
             }
-            case R.id.action_accounts: {
-                Intent accountIntent = new Intent(this, AccountSelectActivity.class);
-                startActivity(accountIntent);
+            case R.id.action_settings: {
+                Intent settingsIntent = new Intent(this, Preferences.class);
+                startActivity(settingsIntent);
             }
             case android.R.id.home: {
                 if(mCurrentDir != null && mCurrentDir.getParentId() != 0){
@@ -197,7 +198,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 if (!remotepath.endsWith("/"))
                     remotepath += "/";
                 remotepath += URLEncoder.encode(new File(filepath).getName());
-                Log.e("ASD", remotepath + "");
     
                 i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);
                 i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);
@@ -209,7 +209,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 
     @Override
     public void onBackPressed() {
-        if (mDirectories.getCount() == 1) {
+        if (mDirectories == null || mDirectories.getCount() <= 1) {
             finish();
             return;
         }
@@ -226,10 +226,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     @Override
     protected void onRestoreInstanceState(Bundle savedInstanceState) {
         super.onRestoreInstanceState(savedInstanceState);
-        // Check, if there are ownCloud accounts
-        if (!accountsAreSetup()) {
-            showDialog(DIALOG_SETUP_ACCOUNT);
-        }
         mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
         mDirectories.add("/");
@@ -241,7 +237,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        if(mDirectories != null){
+        if(mDirectories != null && mDirectories.getCount() != 0){
             mDirs = new String[mDirectories.getCount()-1];
             for (int j = mDirectories.getCount() - 2, i = 0; j >= 0; --j, ++i) {
                 mDirs[i] = mDirectories.getItem(j);
@@ -257,8 +253,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         
         //TODO: Dialog useless -> get rid of this
         if (!accountsAreSetup()) {
-            showDialog(DIALOG_SETUP_ACCOUNT);
+            setContentView(R.layout.no_account_available);
+            setProgressBarIndeterminateVisibility(false);
+            getSupportActionBar().setNavigationMode(ActionBar.DISPLAY_SHOW_TITLE);
+            findViewById(R.id.setup_account).setOnClickListener(this);
             return;
+        } else if (findViewById(R.id.file_list_view) == null) {
+            setContentView(R.layout.files);
         }
 
         // Listen for sync messages
@@ -324,7 +325,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             action_bar.setDisplayHomeAsUpEnabled(false);
         }
         
-        
         // List dir here
         mFileList.listDirectory(mCurrentDir);
     }
@@ -502,7 +502,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             String password = mAm.getPassword(mAccount);
     
             wdc.setCredentials(username, password);
-            wdc.allowUnsignedCertificates();
+            wdc.allowSelfsignedCertificates();
             wdc.createDirectory(mTargetPath);
         }
     
@@ -558,4 +558,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 
     }
 
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.setup_account) {
+            Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");
+            intent.putExtra("authorities", new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });
+            startActivity(intent);
+        }
+    }    
 }