making file download using progressbar view

[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..dc564d6 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
 \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
             inflater.inflate(R.menu.menu, menu);\r
             return true;\r

-        }\r
-        return false;\r

     }\r
 \r
     @Override\r
     }\r
 \r
     @Override\r


@@ -206,7 +203,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
     @Override\r
     public void onBackPressed() {\r
 \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
             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
             String password = mAm.getPassword(mAccount);\r
     \r
             wdc.setCredentials(username, password);\r

-            wdc.allowUnsignedCertificates();\r
+            wdc.allowSelfsignedCertificates();\r

             wdc.createDirectory(mTargetPath);\r
         }\r
     \r
             wdc.createDirectory(mTargetPath);\r
         }\r
     \r