Fixed crash when an upload is confirmed with no file selected

[pub/Android/ownCloud.git] / src / com / owncloud / android / Uploader.java

diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java
index 7b66149..138f68e 100644 (file)
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@ -129,7 +129,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
         case DIALOG_NO_ACCOUNT:\r
             builder.setIcon(android.R.drawable.ic_dialog_alert);\r
             builder.setTitle(R.string.uploader_wrn_no_account_title);\r
-            builder.setMessage(R.string.uploader_wrn_no_account_text);\r
+            builder.setMessage(String.format(getString(R.string.uploader_wrn_no_account_text), getString(R.string.app_name)));\r
             builder.setCancelable(false);\r
             builder.setPositiveButton(R.string.uploader_wrn_no_account_setup_btn_text, new OnClickListener() {\r
                 @Override\r
@@ -257,7 +257,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
         // click on folder in the list\r
         Log.d(TAG, "on item click");\r
         Vector<OCFile> tmpfiles = mStorageManager.getDirectoryContent(mFile);\r
-        if (tmpfiles == null) return;\r
+        if (tmpfiles.size() <= 0) return;\r
         // filter on dirtype\r
         Vector<OCFile> files = new Vector<OCFile>();\r
         for (OCFile f : tmpfiles)\r
@@ -325,7 +325,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
         mFile = mStorageManager.getFileByPath(full_path);\r
         if (mFile != null) {\r
             Vector<OCFile> files = mStorageManager.getDirectoryContent(mFile);\r
-            if (files != null) {\r
+            if (files.size() > 0) {\r
                 List<HashMap<String, Object>> data = new LinkedList<HashMap<String,Object>>();\r
                 for (OCFile f : files) {\r
                     HashMap<String, Object> h = new HashMap<String, Object>();\r
@@ -432,7 +432,8 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
             finish();\r
             \r
         } catch (SecurityException e) {\r
-            Toast.makeText(this, getString(R.string.uploader_error_forbidden_content), Toast.LENGTH_LONG).show();\r
+            String message = String.format(getString(R.string.uploader_error_forbidden_content), getString(R.string.app_name));\r
+            Toast.makeText(this, message, Toast.LENGTH_LONG).show();            \r
         }\r
     }\r
 \r