Tweak button ordering on the file received dialog

termux · Apr 16, 2016 · dc086a1 · dc086a1
1 parent 2a056ae
commit dc086a1
Showing 1 changed file with 47 additions and 47 deletions.
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -119,54 +119,54 @@ void handleContentUri(final Uri uri, String subjectFromIntent) {
     }
 
     void promptNameAndSave(final InputStream in, final String attachmentFileName) {
-        DialogUtils.textInput(this, R.string.file_received_title, attachmentFileName
-            , android.R.string.ok, new DialogUtils.TextSetListener() {
-            @Override
-            public void onTextSet(final String text) {
-                if (saveStreamWithName(in, text) == null) return;
-                finish();
-            }
-        }, R.string.file_received_open_folder_button, new DialogUtils.TextSetListener() {
-            @Override
-            public void onTextSet(String text) {
-                if (saveStreamWithName(in, text) == null) return;
-
-                Intent executeIntent = new Intent(TermuxService.ACTION_EXECUTE);
-                executeIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, TERMUX_RECEIVEDIR);
-                executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
-                startService(executeIntent);
-                finish();
-            }
-        }, R.string.file_received_edit_button, new DialogUtils.TextSetListener() {
-            @Override
-            public void onTextSet(String text) {
-                File outFile = saveStreamWithName(in, text);
-                if (outFile == null) return;
-
-                final File editorProgramFile = new File(EDITOR_PROGRAM);
-                if (!editorProgramFile.isFile()) {
-                    showErrorDialogAndQuit("The following file does not exist:\n$HOME/bin/termux-file-editor\n\n"
-                        + "Create this file as a script or a symlink - it will be called with the received file as only argument.");
-                    return;
+        DialogUtils.textInput(this, R.string.file_received_title, attachmentFileName, R.string.file_received_edit_button, new DialogUtils.TextSetListener() {
+                @Override
+                public void onTextSet(String text) {
+                    File outFile = saveStreamWithName(in, text);
+                    if (outFile == null) return;
+
+                    final File editorProgramFile = new File(EDITOR_PROGRAM);
+                    if (!editorProgramFile.isFile()) {
+                        showErrorDialogAndQuit("The following file does not exist:\n$HOME/bin/termux-file-editor\n\n"
+                            + "Create this file as a script or a symlink - it will be called with the received file as only argument.");
+                        return;
+                    }
+
+                    // Do this for the user if necessary:
+                    editorProgramFile.setExecutable(true);
+
+                    final Uri scriptUri = new Uri.Builder().scheme("file").path(EDITOR_PROGRAM).build();
+
+                    Intent executeIntent = new Intent(TermuxService.ACTION_EXECUTE, scriptUri);
+                    executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
+                    executeIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, new String[]{outFile.getAbsolutePath()});
+                    startService(executeIntent);
+                    finish();
                 }
-
-                // Do this for the user if necessary:
-                editorProgramFile.setExecutable(true);
-
-                final Uri scriptUri = new Uri.Builder().scheme("file").path(EDITOR_PROGRAM).build();
-
-                Intent executeIntent = new Intent(TermuxService.ACTION_EXECUTE, scriptUri);
-                executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
-                executeIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, new String[]{outFile.getAbsolutePath()});
-                startService(executeIntent);
-                finish();
-            }
-        }, new DialogInterface.OnDismissListener() {
-            @Override
-            public void onDismiss(DialogInterface dialog) {
-                if (mFinishOnDismissNameDialog) finish();
-            }
-        });
+            },
+            R.string.file_received_open_folder_button, new DialogUtils.TextSetListener() {
+                @Override
+                public void onTextSet(String text) {
+                    if (saveStreamWithName(in, text) == null) return;
+
+                    Intent executeIntent = new Intent(TermuxService.ACTION_EXECUTE);
+                    executeIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, TERMUX_RECEIVEDIR);
+                    executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
+                    startService(executeIntent);
+                    finish();
+                }
+            },
+            android.R.string.cancel, new DialogUtils.TextSetListener() {
+                @Override
+                public void onTextSet(final String text) {
+                    finish();
+                }
+            }, new DialogInterface.OnDismissListener() {
+                @Override
+                public void onDismiss(DialogInterface dialog) {
+                    if (mFinishOnDismissNameDialog) finish();
+                }
+            });
     }
 
     public File saveStreamWithName(InputStream in, String attachmentFileName) {