text selection is kept when user toggles between visible and non visible password

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 9996891..cfee79d 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -39,6 +39,8 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;\r
 import android.content.res.Resources.NotFoundException;\r
 import android.database.Cursor;\r
+import android.graphics.Bitmap;\r
+import android.graphics.drawable.BitmapDrawable;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r
@@ -128,6 +130,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private static final int ACTION_SELECT_MULTIPLE_FILES = 2;\r
     \r
     private static final String TAG = "FileDisplayActivity";\r
+\r
+    private static int[] mMenuIdentifiersToPatch = {R.id.about_app};\r
     \r
     @Override\r
     public void onCreate(Bundle savedInstanceState) {\r
@@ -276,9 +280,32 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     public boolean onCreateOptionsMenu(Menu menu) {\r
         MenuInflater inflater = getSherlock().getMenuInflater();\r
             inflater.inflate(R.menu.menu, menu);\r
+            \r
+            patchHiddenAccents(menu);\r
+            \r
             return true;\r
     }\r
 \r
+    /**\r
+     * Workaround for this: <a href="http://code.google.com/p/android/issues/detail?id=3974">http://code.google.com/p/android/issues/detail?id=3974</a> \r
+     * \r
+     * @param menu      Menu to patch\r
+     */\r
+    private void patchHiddenAccents(Menu menu) {\r
+        for (int i = 0; i < mMenuIdentifiersToPatch.length ; i++) {\r
+            MenuItem aboutItem = menu.findItem(mMenuIdentifiersToPatch[i]);\r
+            if (aboutItem != null && aboutItem.getIcon() instanceof BitmapDrawable) {\r
+                // Clip off the bottom three (density independent) pixels of transparent padding\r
+                Bitmap original = ((BitmapDrawable) aboutItem.getIcon()).getBitmap();\r
+                float scale = getResources().getDisplayMetrics().density;\r
+                int clippedHeight = (int) (original.getHeight() - (3 * scale));\r
+                Bitmap scaled = Bitmap.createBitmap(original, 0, 0, original.getWidth(), clippedHeight);\r
+                aboutItem.setIcon(new BitmapDrawable(getResources(), scaled));\r
+            }\r
+        }\r
+    }\r
+\r
+\r
     @Override\r
     public boolean onOptionsItemSelected(MenuItem item) {\r
         boolean retval = true;\r
@@ -345,16 +372,16 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
      */\r
     public void onActivityResult(int requestCode, int resultCode, Intent data) {\r
         \r
-        if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && resultCode == RESULT_OK) {\r
-            requestSimpleUpload(data);\r
+        if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {\r
+            requestSimpleUpload(data, resultCode);\r
             \r
-        } else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && resultCode == RESULT_OK) {\r
-            requestMultipleUpload(data);\r
+        } else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {\r
+            requestMultipleUpload(data, resultCode);\r
             \r
         }\r
     }\r
 \r
-    private void requestMultipleUpload(Intent data) {\r
+    private void requestMultipleUpload(Intent data, int resultCode) {\r
         String[] filePaths = data.getStringArrayExtra(UploadFilesActivity.EXTRA_CHOSEN_FILES);\r
         if (filePaths != null) {\r
             String[] remotePaths = new String[filePaths.length];\r
@@ -373,6 +400,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             i.putExtra(FileUploader.KEY_LOCAL_FILE, filePaths);\r
             i.putExtra(FileUploader.KEY_REMOTE_FILE, remotePaths);\r
             i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_MULTIPLE_FILES);\r
+            if (resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)\r
+                i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_MOVE);\r
             startService(i);\r
             \r
         } else {\r
@@ -384,7 +413,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     }\r
 \r
 \r
-    private void requestSimpleUpload(Intent data) {\r
+    private void requestSimpleUpload(Intent data, int resultCode) {\r
         String filepath = null;\r
         try {\r
             Uri selectedImageUri = data.getData();\r
@@ -424,6 +453,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
         i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r
         i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);\r
+        if (resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)\r
+            i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_MOVE);\r
         startService(i);\r
     }\r
 \r
@@ -564,7 +595,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                     dialog.dismiss();\r
                 }\r
             });\r
-            builder.setNegativeButton(R.string.common_exit, new OnClickListener() {\r
+            String message = String.format(getString(R.string.common_exit), getString(R.string.app_name));\r
+            builder.setNegativeButton(message, new OnClickListener() {\r
                 public void onClick(DialogInterface dialog, int which) {\r
                     dialog.dismiss();\r
                     finish();\r
@@ -580,7 +612,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             PackageInfo pkg;\r
             try {\r
                 pkg = getPackageManager().getPackageInfo(getPackageName(), 0);\r
-                builder.setMessage(String.format(getString(R.string.about_message), pkg.versionName));\r
+                builder.setMessage(String.format(getString(R.string.about_message), getString(R.string.app_name), pkg.versionName));\r
                 builder.setIcon(android.R.drawable.ic_menu_info_details);\r
                 dialog = builder.create();\r
             } catch (NameNotFoundException e) {\r
@@ -656,6 +688,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                     if (item == 0) {\r
                         //if (!mDualPane) { \r
                             Intent action = new Intent(FileDisplayActivity.this, UploadFilesActivity.class);\r
+                            action.putExtra(UploadFilesActivity.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this));\r
                             startActivityForResult(action, ACTION_SELECT_MULTIPLE_FILES);\r
                         //} else {\r
                             // TODO create and handle new fragment LocalFileListFragment\r
@@ -853,6 +886,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 }\r
                 \r
                 setSupportProgressBarIndeterminateVisibility(inProgress);\r
+                removeStickyBroadcast(intent);\r
                 \r
             }\r
             \r