aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/entities
diff options
context:
space:
mode:
authorChristian Schneppe <christian.schneppe@pix-art.de>2019-12-08 15:49:33 +0100
committerChristian Schneppe <christian.schneppe@pix-art.de>2019-12-08 15:49:33 +0100
commitfe6724887d33965d79828221ffea72cf7df92551 (patch)
tree2eddd784cf300961d42850c6298c53b36c459dba /src/main/java/de/pixart/messenger/entities
parent960460e7fe3d070b78dc492fce15b95cf5f66ade (diff)
show jabber accounts from local address in Quicksy flavor
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities')
-rw-r--r--src/main/java/de/pixart/messenger/entities/Contact.java14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Contact.java b/src/main/java/de/pixart/messenger/entities/Contact.java
index 776ed4cec..57a664241 100644
--- a/src/main/java/de/pixart/messenger/entities/Contact.java
+++ b/src/main/java/de/pixart/messenger/entities/Contact.java
@@ -4,9 +4,10 @@ import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
-import androidx.annotation.NonNull;
import android.text.TextUtils;
+import androidx.annotation.NonNull;
+
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -20,6 +21,7 @@ import java.util.Locale;
import de.pixart.messenger.Config;
import de.pixart.messenger.R;
import de.pixart.messenger.android.AbstractPhoneContact;
+import de.pixart.messenger.services.QuickConversationsService;
import de.pixart.messenger.utils.JidHelper;
import de.pixart.messenger.utils.UIHelper;
import de.pixart.messenger.xml.Element;
@@ -101,7 +103,7 @@ public class Contact implements ListItem, Blockable {
final Jid jid;
try {
jid = Jid.of(cursor.getString(cursor.getColumnIndex(JID)));
- } catch (final IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
// TODO: Borked DB... handle this somehow?
return null;
}
@@ -384,7 +386,9 @@ public class Contact implements ListItem, Blockable {
}
public boolean showInContactList() {
- return showInRoster() || getOption(Options.SYNCED_VIA_OTHER);
+ return showInRoster()
+ || getOption(Options.SYNCED_VIA_OTHER)
+ || (QuickConversationsService.isQuicksy() && systemAccount != null);
}
public void parseSubscriptionFromElement(Element item) {
@@ -587,7 +591,8 @@ public class Contact implements ListItem, Blockable {
changed |= setPhotoUri(phoneContact.getPhotoUri());
return changed;
}
- public synchronized boolean unsetPhoneContact(Class<?extends AbstractPhoneContact> clazz) {
+
+ public synchronized boolean unsetPhoneContact(Class<? extends AbstractPhoneContact> clazz) {
resetOption(getOption(clazz));
boolean changed = false;
if (!getOption(Options.SYNCED_VIA_ADDRESSBOOK) && !getOption(Options.SYNCED_VIA_OTHER)) {
@@ -597,6 +602,7 @@ public class Contact implements ListItem, Blockable {
}
return changed;
}
+
public static int getOption(Class<? extends AbstractPhoneContact> clazz) {
return Options.SYNCED_VIA_OTHER;
}