1 files changed, 22 insertions, 15 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 568fe4d16..d12d3aa01 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -172,11 +172,11 @@ public abstract class XmppActivity extends Activity {
     abstract protected void refreshUiReal();
 
     protected interface OnValueEdited {
-        public void onValueEdited(String value);
+        String onValueEdited(String value);
     }
 
     public interface OnPresenceSelected {
-        public void onPresenceSelected();
+        void onPresenceSelected();
     }
 
     protected ServiceConnection mConnection = new ServiceConnection() {
@@ -744,22 +744,12 @@ public abstract class XmppActivity extends Activity {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         View view = getLayoutInflater().inflate(R.layout.quickedit, null);
         final EditText editor = view.findViewById(R.id.editor);
-        OnClickListener mClickListener = new OnClickListener() {
-
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                String value = editor.getText().toString();
-                if (!value.equals(previousValue) && value.trim().length() > 0) {
-                    callback.onValueEdited(value);
-                }
-            }
-        };
         if (password) {
             editor.setInputType(InputType.TYPE_CLASS_TEXT
                     | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-            builder.setPositiveButton(R.string.accept, mClickListener);
+            builder.setPositiveButton(R.string.accept, null);
         } else {
-            builder.setPositiveButton(R.string.ok, mClickListener);
+            builder.setPositiveButton(R.string.ok, null);
         }
         if (hint != 0) {
             editor.setHint(hint);
@@ -771,7 +761,24 @@ public abstract class XmppActivity extends Activity {
         }
         builder.setView(view);
         builder.setNegativeButton(R.string.cancel, null);
-        builder.create().show();
+        final AlertDialog dialog = builder.create();
+        dialog.show();
+        View.OnClickListener clickListener = new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                String value = editor.getText().toString();
+                if (!value.equals(previousValue) && value.trim().length() > 0) {
+                    String error = callback.onValueEdited(value);
+                    if (error != null) {
+                        editor.setError(error);
+                        return;
+                    }
+                }
+                dialog.dismiss();
+            }
+        };
+        dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(clickListener);
     }
 
     public boolean hasStoragePermission(int requestCode) {