Implemented better error messages.

0x5ECF4ULT · May 27, 2020 · bc0bf4f · bc0bf4f
1 parent 1a53eb9
commit bc0bf4f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/app/src/main/java/at/tacticaldevc/oat/ui/PasswordSettings/ChangePasswordDialog.java b/app/src/main/java/at/tacticaldevc/oat/ui/PasswordSettings/ChangePasswordDialog.java
@@ -58,12 +58,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
                                 else {
                                     alert.setMessage(R.string.internal_error);
                                 }
-                                alert.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        dialog.cancel();
-                                    }
-                                });
+                                alert.setPositiveButton(R.string.ok, null);
                                 AlertDialog alertDialog = alert.create();
                                 alertDialog.show();
                             }
@@ -72,12 +67,7 @@ public void onClick(DialogInterface dialog, int which) {
                             AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
                             alert.setTitle(R.string.fields_empty);
                             alert.setMessage(R.string.fields_empty_message);
-                            alert.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    dialog.cancel();
-                                }
-                            });
+                            alert.setPositiveButton(R.string.ok, null);
                             AlertDialog alertDialog = alert.create();
                             alertDialog.show();
                         }

diff --git a/app/src/main/java/at/tacticaldevc/oat/ui/TrustedNumbers/AddDialog.java b/app/src/main/java/at/tacticaldevc/oat/ui/TrustedNumbers/AddDialog.java
@@ -47,14 +47,29 @@ public void onClick(DialogInterface dialogInterface, int i) {
                 .setPositiveButton(R.string.add, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        if(Ensurer.ensurePhoneNumberIsValid(number.getText().toString(), name.getText().toString()).equals(number.getText().toString())){
-                            Prefs.saveTrustedContact(getContext(), number.getText().toString(), name.getText().toString());
-                            ca.list.clear();
-                            ca.list.addAll(PrefsSupport.toContactSet(Prefs.fetchTrustedContacts(getContext())));
-                        }
-                        else {
+                        if(!number.getText().toString().isEmpty() && !name.getText().toString().isEmpty()){
+                            try{
+                                Ensurer.ensurePhoneNumberIsValid(number.getText().toString(), name.getText().toString());
+                                Prefs.saveTrustedContact(getContext(), number.getText().toString(), name.getText().toString());
+                                ca.list.clear();
+                                ca.list.addAll(PrefsSupport.toContactSet(Prefs.fetchTrustedContacts(getContext())));
+                            }
+                            catch (IllegalArgumentException e){
+                                AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
+                                alert.setTitle(R.string.invalid_number);
+                                alert.setMessage(R.string.invalid_number_message);
+                                alert.setPositiveButton(R.string.ok, null);
+                                alert.show();
+                            }
 
                         }
+                        else{
+                            AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
+                            alert.setTitle(R.string.fields_empty);
+                            alert.setMessage(R.string.fields_empty_message);
+                            alert.setPositiveButton(R.string.ok, null);
+                            alert.show();
+                        }
                     }
                 });
         number = view.findViewById(R.id.dialog_number_text);

diff --git a/app/src/main/res/values/showing_strings.xml b/app/src/main/res/values/showing_strings.xml
@@ -17,6 +17,8 @@
     <string name="trustednumber_deldialog_message">Do you want to delete this entry?</string>
     <string name="trustednumber_adddialog_name">Name</string>
     <string name="trustednumber_adddialog_number">Number</string>
+    <string name="invalid_number">Invalid number</string>
+    <string name="invalid_number_message">Given number is invalid!</string>
 
     <string name="photo_trap_settings">Photo Trap Settings</string>
     <string name="instant_photo_settings">Instant Photo Settings</string>