add data binding and check in back stack for dialogs

1 files changed, 9 insertions, 1 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/BlocklistActivity.java b/src/main/java/de/pixart/messenger/ui/BlocklistActivity.java
index 422803487..c4d077c80 100644
--- a/src/main/java/de/pixart/messenger/ui/BlocklistActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/BlocklistActivity.java
@@ -1,6 +1,8 @@
 package de.pixart.messenger.ui;
 
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
 import android.text.Editable;
 import android.widget.Toast;
 
@@ -56,6 +58,12 @@ public class BlocklistActivity extends AbstractSearchableListItemActivity implem
     }
 
     protected void showEnterJidDialog() {
+        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+        Fragment prev = getSupportFragmentManager().findFragmentByTag("dialog");
+        if (prev != null) {
+            ft.remove(prev);
+        }
+        ft.addToBackStack(null);
         EnterJidDialog dialog = EnterJidDialog.newInstance(
                 mKnownHosts, null,
                 getString(R.string.block_jabber_id), getString(R.string.block),
@@ -69,7 +77,7 @@ public class BlocklistActivity extends AbstractSearchableListItemActivity implem
             }
             return true;
         });
-        dialog.show(getSupportFragmentManager(), "block_contact_dialog");
+        dialog.show(ft, "dialog");
     }
 
     protected void refreshUiReal() {