3 files changed, 14 insertions(+), 10 deletions(-)

M src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
M src/main/java/eu/siacs/conversations/ui/XmppActivity.java
M src/main/res/menu/block.xml

@@ 3855,13 3855,13 @@ public class ConversationFragment extends XmppFragment
                         case R.id.add_contact:
                             mAddBackClickListener.onClick(view);
                             return true;
-                        case R.id.block_domain:
-                            blockable =
-                                    conversation
-                                            .getAccount()
-                                            .getRoster()
-                                            .getContact(jid.getDomain());
-                            break;
+                        // case R.id.block_domain:
+                        //     blockable =
+                        //             conversation
+                        //                     .getAccount()
+                        //                     .getRoster()
+                        //                     .getContact(jid.getDomain());
+                        //     break;
                         default:
                             blockable = conversation;
                     }

@@ 4,6 4,7 @@ import android.telephony.TelephonyManager;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
+import android.app.Application;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;


@@ 164,6 165,12 @@ public abstract class XmppActivity extends ActionBarActivity {
 
                 @Override
                 public void onServiceConnected(ComponentName className, IBinder service) {
+                    if (!(service instanceof XmppConnectionBinder)) {
+                        throw new ClassCastException("Expected XmppConnectionBinder but got "
+                                + service.getClass().getName()
+                                + " from component: " + className
+                                + " in process: " + Application.getProcessName());
+                    }
                     XmppConnectionBinder binder = (XmppConnectionBinder) service;
                     xmppConnectionService = binder.getService();
                     xmppConnectionServiceBound = true;

@@ 4,9 4,6 @@
         android:id="@+id/reject"
         android:title="@string/reject_request"/>
     <item
-        android:id="@+id/block_domain"
-        android:title="@string/block_entire_domain" />
-    <item
         android:id="@+id/block_contact"
         android:title="@string/block_stranger" />
     <item