CR Suggestions

Author: fesave

owncloudApp/src/main/java/com/owncloud/android/presentation/ui/settings/fragments/SettingsPictureUploadsFragment.kt

@@ -49,6 +49,7 @@ import com.owncloud.android.db.PreferenceManager.PREF__CAMERA_PICTURE_UPLOADS_WI
 import com.owncloud.android.domain.camerauploads.model.FolderBackUpConfiguration
 import com.owncloud.android.extensions.showAlertDialog
 import com.owncloud.android.presentation.viewmodels.settings.SettingsPictureUploadsViewModel
+import com.owncloud.android.ui.activity.FolderPickerActivity
 import com.owncloud.android.ui.activity.UploadPathActivity
 import com.owncloud.android.utils.DisplayUtils
 import kotlinx.coroutines.launch
@@ -167,6 +168,7 @@ class SettingsPictureUploadsFragment : PreferenceFragmentCompat() {
             }
             val intent = Intent(activity, UploadPathActivity::class.java).apply {
                 putExtra(UploadPathActivity.KEY_CAMERA_UPLOAD_PATH, uploadPath)
+                putExtra(FolderPickerActivity.EXTRA_PICKER_OPTION, FolderPickerActivity.PickerMode.CAMERA_FOLDER)
                 putExtra(UploadPathActivity.KEY_CAMERA_UPLOAD_ACCOUNT, picturesViewModel.getPictureUploadsAccount())
             }
             selectPictureUploadsPathLauncher.launch(intent)

owncloudApp/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java

@@ -69,7 +69,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
 
     private static final String TAG_LIST_OF_FOLDERS = "LIST_OF_FOLDERS";
 
-    private static final String ACTION_BUTTON = "ACTION_BUTTON";
+    public static final String EXTRA_PICKER_OPTION = "EXTRA_PICKER_OPTION";
 
     private LocalBroadcastManager mLocalBroadcastManager;
     private SyncBroadcastReceiver mSyncBroadcastReceiver;
@@ -174,17 +174,19 @@ public void setBackgroundText() {
     }
 
     private void setActionButtonText() {
-        FolderPickerActivity.ACTION_BUTTON actionButton = (FolderPickerActivity.ACTION_BUTTON) getIntent().getSerializableExtra(ACTION_BUTTON);
+        PickerMode actionButton = (PickerMode) getIntent().getSerializableExtra(EXTRA_PICKER_OPTION);
         Button chooseButton = findViewById(R.id.folder_picker_btn_choose);
 
         if (actionButton != null) {
             switch (actionButton) {
                 case MOVE:
-                    chooseButton.setText(getString(R.string.folder_picker_move_here_button_text));
+                    chooseButton.setText(getString(actionButton.getButtonString(PickerMode.MOVE)));
                     break;
                 case COPY:
-                    chooseButton.setText(getString(R.string.folder_picker_copy_here_button_text));
+                    chooseButton.setText(getString(actionButton.getButtonString(PickerMode.COPY)));
                     break;
+                default:
+                    chooseButton.setText(getString(actionButton.getButtonString(PickerMode.CAMERA_FOLDER)));
             }
         }
     }
@@ -531,7 +533,18 @@ private void refreshList(boolean ignoreETag) {
         }
     }
 
-    public enum ACTION_BUTTON {
-        MOVE, COPY
+    public enum PickerMode {
+        MOVE, COPY, CAMERA_FOLDER;
+
+        public Integer getButtonString(PickerMode pickerMode) {
+            switch (pickerMode) {
+                case MOVE:
+                    return R.string.folder_picker_move_here_button_text;
+                case COPY:
+                    return R.string.folder_picker_copy_here_button_text;
+                default:
+                    return R.string.folder_picker_choose_button_text;
+            }
+        }
     }
 }

owncloudApp/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -115,8 +115,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
     private static final String GRID_IS_PREFERED_PREFERENCE = "gridIsPrefered";
 
-    private static final String ACTION_BUTTON = "ACTION_BUTTON";
-
     private static String DIALOG_CREATE_FOLDER = "DIALOG_CREATE_FOLDER";
 
     private final String ALL_FILES_SAF_REGEX = "*/*";
@@ -1002,14 +1000,14 @@ private boolean onFileActionChosen(int menuId) {
             }
             case R.id.action_move: {
                 Intent action = new Intent(getActivity(), FolderPickerActivity.class);
-                action.putExtra(ACTION_BUTTON, FolderPickerActivity.ACTION_BUTTON.MOVE);
+                action.putExtra(FolderPickerActivity.EXTRA_PICKER_OPTION, FolderPickerActivity.PickerMode.MOVE);
                 action.putParcelableArrayListExtra(FolderPickerActivity.EXTRA_FILES, checkedFiles);
                 requireActivity().startActivityForResult(action, FileDisplayActivity.REQUEST_CODE__MOVE_FILES);
                 return true;
             }
             case R.id.action_copy:
                 Intent action = new Intent(getActivity(), FolderPickerActivity.class);
-                action.putExtra(ACTION_BUTTON, FolderPickerActivity.ACTION_BUTTON.COPY);
+                action.putExtra(FolderPickerActivity.EXTRA_PICKER_OPTION, FolderPickerActivity.PickerMode.COPY);
                 action.putParcelableArrayListExtra(FolderPickerActivity.EXTRA_FILES, checkedFiles);
                 requireActivity().startActivityForResult(action, FileDisplayActivity.REQUEST_CODE__COPY_FILES);
                 return true;

owncloudApp/src/main/res/layout/files_folder_picker.xml

@@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/filesFolderPickerLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -57,7 +58,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/folder_picker_choose_button_text"
+            tools:text="@string/folder_picker_choose_button_text"
             android:theme="@style/Button.Primary" />
 
     </LinearLayout>