X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/17e1b2350ce8a2d49dbf66f1d2281dfb04c49cc4..6a4fb7715986fcd56699ed7c1d1a94c67525e566:/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 26953214..5c027035 100644
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -104,12 +104,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        if (accountsAreSetup()) {
-            MenuInflater inflater = getSherlock().getMenuInflater();
+        MenuInflater inflater = getSherlock().getMenuInflater();
             inflater.inflate(R.menu.menu, menu);
             return true;
-        }
-        return false;
     }
 
     @Override
@@ -137,9 +134,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){
@@ -194,7 +191,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);
@@ -206,7 +202,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 
     @Override
     public void onBackPressed() {
-        if (mDirectories == null || mDirectories.getCount() == 1) {
+        if (mDirectories == null || mDirectories.getCount() <= 1) {
             finish();
             return;
         }
@@ -499,7 +495,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             String password = mAm.getPassword(mAccount);
     
             wdc.setCredentials(username, password);
-            wdc.allowUnsignedCertificates();
+            wdc.allowSelfsignedCertificates();
             wdc.createDirectory(mTargetPath);
         }