From 20b81bf41c33124b07bad0f3ea4621e0f8a6872b Mon Sep 17 00:00:00 2001
From: Jakob Nixdorf <flocke@shadowice.org>
Date: Mon, 3 Jul 2017 08:18:05 +0200
Subject: [PATCH] Confirm before removing an account

---
 .../flocke/andotp/EntriesCardAdapter.java     | 33 ++++++++++++++++---
 .../shadowice/flocke/andotp/MainActivity.java |  4 +--
 app/src/main/res/values/strings.xml           |  2 +-
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/shadowice/flocke/andotp/EntriesCardAdapter.java b/app/src/main/java/org/shadowice/flocke/andotp/EntriesCardAdapter.java
index 7ca80371..d339a388 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/EntriesCardAdapter.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/EntriesCardAdapter.java
@@ -22,6 +22,9 @@
 
 package org.shadowice.flocke.andotp;
 
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -38,10 +41,12 @@ import java.util.Collections;
 public class EntriesCardAdapter extends RecyclerView.Adapter<EntriesCardAdapter.EntryViewHolder>
     implements ItemTouchHelperAdapter {
 
+    private Context context;
     private ArrayList<Entry> entries;
     public ViewHolderEventCallback viewHolderEventCallback;
 
-    public EntriesCardAdapter(ArrayList<Entry> entries) {
+    public EntriesCardAdapter(Context context, ArrayList<Entry> entries) {
+        this.context = context;
         this.entries = entries;
     }
 
@@ -75,9 +80,27 @@ public class EntriesCardAdapter extends RecyclerView.Adapter<EntriesCardAdapter.
     }
 
     @Override
-    public void onItemDismiss(int position) {
-        entries.remove(position);
-        notifyItemRemoved(position);
+    public void onItemDismiss(final int position) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+
+        builder.setTitle(context.getString(R.string.alert_remove))
+                .setMessage(context.getString(R.string.msg_confirm_delete))
+                .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        entries.remove(position);
+                        notifyItemRemoved(position);
+
+                        SettingsHelper.store(context, entries);
+                    }
+                })
+                .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        notifyItemChanged(position);
+                    }
+                })
+                .show();
     }
 
     @Override
@@ -93,6 +116,8 @@ public class EntriesCardAdapter extends RecyclerView.Adapter<EntriesCardAdapter.
         }
         notifyItemMoved(fromPosition, toPosition);
 
+        SettingsHelper.store(context, entries);
+
         return true;
     }
 
diff --git a/app/src/main/java/org/shadowice/flocke/andotp/MainActivity.java b/app/src/main/java/org/shadowice/flocke/andotp/MainActivity.java
index 4cf680df..c6aa7f82 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/MainActivity.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/MainActivity.java
@@ -271,7 +271,7 @@ public class MainActivity extends AppCompatActivity {
 
         entries = SettingsHelper.load(this);
 
-        adapter = new EntriesCardAdapter(entries);
+        adapter = new EntriesCardAdapter(this, entries);
         recList.setAdapter(adapter);
 
         ItemTouchHelper.Callback callback = new SimpleItemTouchHelperCallback(adapter);
@@ -287,8 +287,6 @@ public class MainActivity extends AppCompatActivity {
             @Override
             public void onMoveEventStop() {
                 startUpdater();
-
-                SettingsHelper.store(getBaseContext(), entries);
             }
 
             @Override
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 299b64df..faab6887 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
     <string name="msg_account_removed">Account removed</string>
     <string name="button_add">Add</string>
     <string name="alert_rename">Rename</string>
-    <string name="alert_remove">"Remove "</string>
+    <string name="alert_remove">Remove</string>
     <string name="msg_camera_permission">Camera permission not granted</string>
     <string name="msg_storage_permissions">Storage permissions not granted</string>
     <string name="msg_security_warning">Security warning</string>