1 files changed, 13 insertions, 2 deletions
diff --git a/cgeo-contacts/src/cgeo/contacts/ContactsActivity.java b/cgeo-contacts/src/cgeo/contacts/ContactsActivity.java
index 7d2f1e1..74b2617 100644
--- a/cgeo-contacts/src/cgeo/contacts/ContactsActivity.java
+++ b/cgeo-contacts/src/cgeo/contacts/ContactsActivity.java
@@ -7,6 +7,7 @@ import org.eclipse.jdt.annotation.NonNull;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.content.DialogInterface.OnCancelListener;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.database.Cursor;
@@ -72,7 +73,7 @@ public final class ContactsActivity extends Activity {
         }
     }
 
-    private void selectContact(final List<Pair<Integer, String>> contacts) {
+    private void selectContact(@NonNull final List<Pair<Integer, String>> contacts) {
         final List<String> list = new ArrayList<>();
         for (final Pair<Integer, String> p : contacts) {
             list.add(p.second);
@@ -89,6 +90,14 @@ public final class ContactsActivity extends Activity {
                         openContactAndFinish(contactId);
                     }
                 })
+                .setOnCancelListener(new OnCancelListener() {
+
+                    @Override
+                    public void onCancel(final DialogInterface dialog) {
+                        dialog.dismiss();
+                        finish();
+                    }
+                })
                 .create().show();
     }
 
@@ -100,6 +109,7 @@ public final class ContactsActivity extends Activity {
         finish();
     }
 
+    @NonNull
     private List<Pair<Integer, String>> getContacts(final @NonNull String searchName, final Uri uri, final @NonNull String idColumnName, final @NonNull String selectionColumnName, final boolean like) {
         final String[] projection = new String[] { idColumnName, selectionColumnName };
         final String selection = selectionColumnName + (like ? " LIKE" : " =") + " ? COLLATE NOCASE";
@@ -131,7 +141,8 @@ public final class ContactsActivity extends Activity {
         toast.show();
     }
 
-    private static String getParameter(final Uri uri, final String paramKey) {
+    @NonNull
+    private static String getParameter(@NonNull final Uri uri, @NonNull final String paramKey) {
         try {
             final String param = uri.getQueryParameter(paramKey);
             if (param == null) {