thedevstack/PiratX-Archive
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

show jabber accounts from local address in Quicksy flavor

Browse source
This commit is contained in:
Christian Schneppe 2019-12-08 15:49:33 +01:00
parent 960460e7fe
commit fe6724887d
No known key found for this signature in database
GPG key ID: F30B8D686B44D87E
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/de/pixart/messenger/entities/Contact.java
View file

@ -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;
}