fix fileupload from external apps

[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..c0a84bb 100644 (file)
--- 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
 \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 +134,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
@@ -206,7 +203,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 +496,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