Redirect app to login screen when operations in file details view fail due to bad...

[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 b911866..0db4871 100644 (file)
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@ -129,9 +129,10 @@ 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
                 public void onClick(DialogInterface dialog, int which) {\r
                     if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.ECLAIR_MR1) {\r
                         // using string value since in API7 this\r
@@ -154,6 +155,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
                 }\r
             });\r
             builder.setNegativeButton(R.string.uploader_wrn_no_account_quit_btn_text, new OnClickListener() {\r
+                @Override\r
                 public void onClick(DialogInterface dialog, int which) {\r
                     finish();\r
                 }\r
@@ -188,6 +190,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
             }\r
             builder.setTitle(R.string.common_choose_account);\r
             builder.setItems(ac, new OnClickListener() {\r
+                @Override\r
                 public void onClick(DialogInterface dialog, int which) {\r
                     mAccount = mAccountManager.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[which];\r
                     mStorageManager = new FileDataStorageManager(mAccount, getContentResolver());\r
@@ -196,6 +199,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
             });\r
             builder.setCancelable(true);\r
             builder.setOnCancelListener(new OnCancelListener() {\r
+                @Override\r
                 public void onCancel(DialogInterface dialog) {\r
                     dialog.cancel();\r
                     finish();\r
@@ -208,6 +212,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
             builder.setMessage(R.string.uploader_wrn_no_content_text);\r
             builder.setCancelable(false);\r
             builder.setNegativeButton(R.string.common_cancel, new OnClickListener() {\r
+                @Override\r
                 public void onClick(DialogInterface dialog, int which) {\r
                     finish();\r
                 }\r
@@ -227,6 +232,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
             mDirname = dirname;\r
         }\r
 \r
+        @Override\r
         public void onClick(DialogInterface dialog, int which) {\r
             Uploader.this.mUploadPath = mPath + mDirname.getText().toString();\r
             Uploader.this.mCreateDir = true;\r
@@ -246,11 +252,12 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
         }\r
     }\r
 \r
+    @Override\r
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {\r
         // 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
@@ -263,6 +270,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
         populateDirectoryList();\r
     }\r
 \r
+    @Override\r
     public void onClick(View v) {\r
         // click on button\r
         switch (v.getId()) {\r
@@ -317,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
@@ -383,12 +391,13 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
 \r
     public void uploadFiles() {\r
         try {\r
+            /* TODO - mCreateDir can never be true at this moment; we will replace wdc.createDirectory by CreateFolderOperation when that is fixed \r
             WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());\r
-\r
             // create last directory in path if necessary\r
             if (mCreateDir) {\r
                 wdc.createDirectory(mUploadPath);\r
             }\r
+            */\r
 \r
             String[] local = new String[mStreamsToUpload.size()], remote = new String[mStreamsToUpload.size()];\r
 \r
@@ -424,7 +433,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