From 998332c2e50d4eadeda2b9d0263a7061d5051b23 Mon Sep 17 00:00:00 2001
From: Javier Varona <javier@contimita.com>
Date: Wed, 4 Apr 2018 21:09:58 -0400
Subject: [PATCH] - Added password input when importing file backups

---
 .../ImportAccountOptionsFragment.java         | 75 +++++++++++++------
 .../main/res/layout/dialog_password_input.xml | 28 +++++++
 2 files changed, 79 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/res/layout/dialog_password_input.xml

diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/ImportAccountOptionsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/ImportAccountOptionsFragment.java
index 17db27e..5a8ac5b 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/fragments/ImportAccountOptionsFragment.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/ImportAccountOptionsFragment.java
@@ -1,6 +1,7 @@
 package cy.agorise.crystalwallet.fragments;
 
 import android.app.Dialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -12,6 +13,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.Toast;
 
 import java.net.URISyntaxException;
@@ -93,37 +95,62 @@ public class ImportAccountOptionsFragment extends DialogFragment {
     }
 
     @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    public void onActivityResult(int requestCode, int resultCode, final Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
         if (requestCode == FILE_CONTENT_REQUEST_CODE){
-            Uri fileUri = data.getData();
+            LayoutInflater inflater = getActivity().getLayoutInflater();
+            View passwordDialogView = inflater.inflate(R.layout.dialog_password_input, null);
+            AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getContext());
+            alertDialogBuilder.setView(passwordDialogView);
 
-            String filePath = null;
-            try {
-                filePath = UriTranslator.getFilePath(getContext(), fileUri);
-            } catch (URISyntaxException e) {
-                e.printStackTrace();
-            }
+            final EditText passwordInput = (EditText) passwordDialogView.findViewById(R.id.etPasswordInput);
 
-            final ImportBackupRequest importBackupRequest = new ImportBackupRequest(getContext(), "", filePath);
+            alertDialogBuilder
+                    .setCancelable(false)
+                    .setPositiveButton("Ok",
+                            new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog,int id) {
+                                    String passwordString = (passwordInput.getText()).toString();
 
-            importBackupRequest.setListener(new FileServiceRequestListener() {
-                @Override
-                public void onCarryOut() {
-                    if (importBackupRequest.getStatus() == ImportBackupRequest.StatusCode.SUCCEEDED){
-                        Toast toast = Toast.makeText(
-                                getContext(), "Backup restored!", Toast.LENGTH_LONG);
-                        toast.show();
-                    } else if (importBackupRequest.getStatus() == ImportBackupRequest.StatusCode.FAILED){
-                        Toast toast = Toast.makeText(
-                                getContext(), "An error ocurred while restoring the backup!", Toast.LENGTH_LONG);
-                        toast.show();
-                    }
-                }
-            });
+                                    Uri fileUri = data.getData();
 
-            FileServiceRequests.getInstance().addRequest(importBackupRequest);
+                                    String filePath = null;
+                                    try {
+                                        filePath = UriTranslator.getFilePath(getContext(), fileUri);
+                                    } catch (URISyntaxException e) {
+                                        e.printStackTrace();
+                                    }
+
+                                    final ImportBackupRequest importBackupRequest = new ImportBackupRequest(getContext(), passwordString, filePath);
+
+                                    importBackupRequest.setListener(new FileServiceRequestListener() {
+                                        @Override
+                                        public void onCarryOut() {
+                                            if (importBackupRequest.getStatus() == ImportBackupRequest.StatusCode.SUCCEEDED){
+                                                Toast toast = Toast.makeText(
+                                                        getContext(), "Backup restored!", Toast.LENGTH_LONG);
+                                                toast.show();
+                                            } else if (importBackupRequest.getStatus() == ImportBackupRequest.StatusCode.FAILED){
+                                                Toast toast = Toast.makeText(
+                                                        getContext(), "An error ocurred while restoring the backup!", Toast.LENGTH_LONG);
+                                                toast.show();
+                                            }
+                                        }
+                                    });
+
+                                    FileServiceRequests.getInstance().addRequest(importBackupRequest);
+                                }
+                            })
+                    .setNegativeButton("Cancel",
+                            new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog,int id) {
+                                    dialog.cancel();
+                                }
+                            });
+
+            AlertDialog passwordDialog = alertDialogBuilder.create();
+            passwordDialog.show();
 
         }
     }
diff --git a/app/src/main/res/layout/dialog_password_input.xml b/app/src/main/res/layout/dialog_password_input.xml
new file mode 100644
index 0000000..4febf7f
--- /dev/null
+++ b/app/src/main/res/layout/dialog_password_input.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/tvPasswordInput"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:text="Enter password to restore backup:" />
+
+        <EditText
+            android:id="@+id/etPasswordInput"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/tvPasswordInput"
+            android:layout_centerHorizontal="true"
+            android:ems="10"
+            android:inputType="numberPassword" />
+
+    </RelativeLayout>
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file