Merge branch 'master' into release

kontalk · Oct 17, 2016 · 59855e5 · 59855e5
2 parents fe1cdb8 + 12afac8
commit 59855e5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/src/main/java/org/kontalk/client/Client.java b/src/main/java/org/kontalk/client/Client.java
@@ -413,6 +413,11 @@ public boolean addToRoster(JID jid, String name) {
             return false;
         }
 
+        if (!jid.isValid()) {
+            LOGGER.warning("invalid JID: " + jid);
+            return false;
+        }
+
         try {
             // also sends presence subscription request
             Roster.getInstanceFor(mConn).createEntry(jid.string(), name,

diff --git a/src/main/java/org/kontalk/system/Control.java b/src/main/java/org/kontalk/system/Control.java
@@ -612,6 +612,11 @@ private void addToRoster(Contact contact) {
         if (contact.isMe())
             return;
 
+        if (contact.isDeleted()) {
+            LOGGER.warning("you don't want to add a deleted contact: " + contact);
+            return;
+        }
+
         String contactName = contact.getName();
         String rosterName =
                 Config.getInstance().getBoolean(Config.NET_SEND_ROSTER_NAME) &&

diff --git a/src/main/java/org/kontalk/view/Notifier.java b/src/main/java/org/kontalk/view/Notifier.java
@@ -179,8 +179,10 @@ public void optionSelected(NotificationOption option) {
                 switch (option) {
                     case yes :
                         mView.getControl().deleteContact(contact);
+                        break;
                     case reset:
                         mView.getControl().createRosterEntry(contact);
+                        break;
                 }
             }
             @Override