narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

add Config flag to debug direct call init

Browse source
This commit is contained in:
Daniel Gultsch 2024-01-14 11:55:11 +01:00
parent 19c634f3d2
commit 4378f8931b
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
2 changed files with 69 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
src/main/java/eu/siacs/conversations/Config.java
View file

@ -3,15 +3,15 @@ package eu.siacs.conversations;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.net.Uri; import android.net.Uri;
import eu.siacs.conversations.crypto.XmppDomainVerifier;
import eu.siacs.conversations.xmpp.Jid;
import eu.siacs.conversations.xmpp.chatstate.ChatState;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import eu.siacs.conversations.crypto.XmppDomainVerifier;
import eu.siacs.conversations.xmpp.Jid;
import eu.siacs.conversations.xmpp.chatstate.ChatState;
public final class Config { public final class Config {
private static final int UNENCRYPTED = 1; private static final int UNENCRYPTED = 1;
private static final int OPENPGP = 2; private static final int OPENPGP = 2;
@ -46,7 +46,6 @@ public final class Config {
public static final Jid BUG_REPORTS = Jid.of("bugs@conversations.im"); public static final Jid BUG_REPORTS = Jid.of("bugs@conversations.im");
public static final Uri HELP = Uri.parse("https://help.conversations.im"); public static final Uri HELP = Uri.parse("https://help.conversations.im");
public static final String DOMAIN_LOCK = null; // only allow account creation for this domain public static final String DOMAIN_LOCK = null; // only allow account creation for this domain
public static final String MAGIC_CREATE_DOMAIN = "conversations.im"; public static final String MAGIC_CREATE_DOMAIN = "conversations.im";
public static final Jid QUICKSY_DOMAIN = Jid.of("quicksy.im"); public static final Jid QUICKSY_DOMAIN = Jid.of("quicksy.im");
@ -57,11 +56,11 @@ public final class Config {
public static final boolean USE_RANDOM_RESOURCE_ON_EVERY_BIND = false; public static final boolean USE_RANDOM_RESOURCE_ON_EVERY_BIND = false;
public static final boolean ALLOW_NON_TLS_CONNECTIONS = false; //very dangerous. you should have a good reason to set this to true public static final boolean ALLOW_NON_TLS_CONNECTIONS =
false; // very dangerous. you should have a good reason to set this to true
public static final long CONTACT_SYNC_RETRY_INTERVAL = 1000L * 60 * 5; public static final long CONTACT_SYNC_RETRY_INTERVAL = 1000L * 60 * 5;
public static final boolean QUICKSTART_ENABLED = true; public static final boolean QUICKSTART_ENABLED = true;
// Notification settings // Notification settings
@ -69,7 +68,6 @@ public final class Config {
public static final boolean ALWAYS_NOTIFY_BY_DEFAULT = false; public static final boolean ALWAYS_NOTIFY_BY_DEFAULT = false;
public static final boolean SUPPRESS_ERROR_NOTIFICATION = false; public static final boolean SUPPRESS_ERROR_NOTIFICATION = false;
public static final boolean DISABLE_BAN = false; // disables the ability to ban users from rooms public static final boolean DISABLE_BAN = false; // disables the ability to ban users from rooms
public static final int PING_MAX_INTERVAL = 300; public static final int PING_MAX_INTERVAL = 300;
@ -85,8 +83,8 @@ public final class Config {
public static final boolean XEP_0392 = true; // enables XEP-0392 v0.6.0 public static final boolean XEP_0392 = true; // enables XEP-0392 v0.6.0
// media file formats. Homogenous Android or Conversations only deployments can switch to opus
// media file formats. Homogenous Android or Conversations only deployments can switch to opus and webp // and webp
public static final int AVATAR_SIZE = 192; public static final int AVATAR_SIZE = 192;
public static final Bitmap.CompressFormat AVATAR_FORMAT = Bitmap.CompressFormat.JPEG; public static final Bitmap.CompressFormat AVATAR_FORMAT = Bitmap.CompressFormat.JPEG;
public static final int AVATAR_CHAR_LIMIT = 9400; public static final int AVATAR_CHAR_LIMIT = 9400;
@ -110,26 +108,35 @@ public final class Config {
public static final long MILLISECONDS_IN_DAY = 24 * 60 * 60 * 1000; public static final long MILLISECONDS_IN_DAY = 24 * 60 * 60 * 1000;
//remove *other* omemo devices from *your* device list announcement after not seeing any activity from them for 42 days. They will automatically add themselves after coming back online. // remove *other* omemo devices from *your* device list announcement after not seeing any
// activity from them for 42 days. They will automatically add themselves after coming back
// online.
public static final long OMEMO_AUTO_EXPIRY = 42 * MILLISECONDS_IN_DAY; public static final long OMEMO_AUTO_EXPIRY = 42 * MILLISECONDS_IN_DAY;
public static final boolean REMOVE_BROKEN_DEVICES = false; public static final boolean REMOVE_BROKEN_DEVICES = false;
public static final boolean OMEMO_PADDING = false; public static final boolean OMEMO_PADDING = false;
public static final boolean PUT_AUTH_TAG_INTO_KEY = true; public static final boolean PUT_AUTH_TAG_INTO_KEY = true;
public static final boolean AUTOMATICALLY_COMPLETE_SESSIONS = true; public static final boolean AUTOMATICALLY_COMPLETE_SESSIONS = true;
public static final boolean DISABLE_PROXY_LOOKUP = false; //disables STUN/TURN and Proxy65 look up (useful to debug IBB fallback) public static final boolean DISABLE_PROXY_LOOKUP =
false; // disables STUN/TURN and Proxy65 look up (useful to debug IBB fallback)
public static final boolean USE_DIRECT_JINGLE_CANDIDATES = true; public static final boolean USE_DIRECT_JINGLE_CANDIDATES = true;
public static final boolean USE_JINGLE_DIRECT_INIT = true;
public static final boolean DISABLE_HTTP_UPLOAD = false; public static final boolean DISABLE_HTTP_UPLOAD = false;
public static final boolean EXTENDED_SM_LOGGING = false; // log stanza counts public static final boolean EXTENDED_SM_LOGGING = false; // log stanza counts
public static final boolean BACKGROUND_STANZA_LOGGING = false; //log all stanzas that were received while the app is in background public static final boolean BACKGROUND_STANZA_LOGGING =
public static final boolean RESET_ATTEMPT_COUNT_ON_NETWORK_CHANGE = true; //setting to true might increase power consumption false; // log all stanzas that were received while the app is in background
public static final boolean RESET_ATTEMPT_COUNT_ON_NETWORK_CHANGE =
true; // setting to true might increase power consumption
public static final boolean ENCRYPT_ON_HTTP_UPLOADED = false; public static final boolean ENCRYPT_ON_HTTP_UPLOADED = false;
public static final boolean X509_VERIFICATION = false; //use x509 certificates to verify OMEMO keys public static final boolean X509_VERIFICATION =
public static final boolean REQUIRE_RTP_VERIFICATION = false; //require a/v calls to be verified with OMEMO false; // use x509 certificates to verify OMEMO keys
public static final boolean REQUIRE_RTP_VERIFICATION =
false; // require a/v calls to be verified with OMEMO
public static final boolean ONLY_INTERNAL_STORAGE = false; //use internal storage instead of sdcard to save attachments public static final boolean ONLY_INTERNAL_STORAGE =
false; // use internal storage instead of sdcard to save attachments
public static final boolean IGNORE_ID_REWRITE_IN_MUC = true; public static final boolean IGNORE_ID_REWRITE_IN_MUC = true;
public static final boolean MUC_LEAVE_BEFORE_JOIN = false; public static final boolean MUC_LEAVE_BEFORE_JOIN = false;
@ -151,12 +158,10 @@ public final class Config {
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256", "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA384", "TLS_DHE_RSA_WITH_AES_128_GCM_SHA384",
"TLS_DHE_RSA_WITH_AES_256_GCM_SHA256", "TLS_DHE_RSA_WITH_AES_256_GCM_SHA256",
"TLS_DHE_RSA_WITH_AES_256_GCM_SHA384", "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
"TLS_DHE_RSA_WITH_CAMELLIA_256_SHA", "TLS_DHE_RSA_WITH_CAMELLIA_256_SHA",
// Fallback. // Fallback.
@ -173,41 +178,35 @@ public final class Config {
}; };
public static final String[] WEAK_CIPHER_PATTERNS = { public static final String[] WEAK_CIPHER_PATTERNS = {
"_NULL_", "_NULL_", "_EXPORT_", "_anon_", "_RC4_", "_DES_", "_MD5",
"_EXPORT_",
"_anon_",
"_RC4_",
"_DES_",
"_MD5",
}; };
public static class OMEMO_EXCEPTIONS { public static class OMEMO_EXCEPTIONS {
//if the own account matches one of the following domains OMEMO won’t be turned on automatically // if the own account matches one of the following domains OMEMO won’t be turned on
// automatically
public static final List<String> ACCOUNT_DOMAINS = Collections.singletonList("s.ms"); public static final List<String> ACCOUNT_DOMAINS = Collections.singletonList("s.ms");
//if the contacts domain matches one of the following domains OMEMO won’t be turned on automatically // if the contacts domain matches one of the following domains OMEMO won’t be turned on
// automatically
// can be used for well known, widely used gateways // can be used for well known, widely used gateways
private static final List<String> CONTACT_DOMAINS = Arrays.asList( private static final List<String> CONTACT_DOMAINS =
"cheogram.com", Arrays.asList("cheogram.com", "*.covid.monal.im");
"*.covid.monal.im"
);
public static boolean matchesContactDomain(final String domain) { public static boolean matchesContactDomain(final String domain) {
return XmppDomainVerifier.matchDomain(domain, CONTACT_DOMAINS); return XmppDomainVerifier.matchDomain(domain, CONTACT_DOMAINS);
} }
} }
private Config() { private Config() {}
}
public static final class Map { public static final class Map {
public final static double INITIAL_ZOOM_LEVEL = 4; public static final double INITIAL_ZOOM_LEVEL = 4;
public final static double FINAL_ZOOM_LEVEL = 15; public static final double FINAL_ZOOM_LEVEL = 15;
public final static int MY_LOCATION_INDICATOR_SIZE = 10; public static final int MY_LOCATION_INDICATOR_SIZE = 10;
public final static int MY_LOCATION_INDICATOR_OUTLINE_SIZE = 3; public static final int MY_LOCATION_INDICATOR_OUTLINE_SIZE = 3;
public final static long LOCATION_FIX_TIME_DELTA = 1000 * 10; // ms public static final long LOCATION_FIX_TIME_DELTA = 1000 * 10; // ms
public final static float LOCATION_FIX_SPACE_DELTA = 10; // m public static final float LOCATION_FIX_SPACE_DELTA = 10; // m
public final static int LOCATION_FIX_SIGNIFICANT_TIME_DELTA = 1000 * 60 * 2; // ms public static final int LOCATION_FIX_SIGNIFICANT_TIME_DELTA = 1000 * 60 * 2; // ms
} }
// How deep nested quotes should be displayed. '2' means one quote nested in another. // How deep nested quotes should be displayed. '2' means one quote nested in another.

9
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -1633,7 +1633,7 @@ public class ConversationFragment extends XmppFragment
activity.xmppConnectionService.updateAccount(account); activity.xmppConnectionService.updateAccount(account);
} }
final Contact contact = conversation.getContact(); final Contact contact = conversation.getContact();
if (RtpCapability.jmiSupport(contact)) { if (Config.USE_JINGLE_DIRECT_INIT && RtpCapability.jmiSupport(contact)) {
triggerRtpSession(contact.getAccount(), contact.getJid().asBareJid(), action); triggerRtpSession(contact.getAccount(), contact.getJid().asBareJid(), action);
} else { } else {
final RtpCapability.Capability capability; final RtpCapability.Capability capability;
@ -1654,13 +1654,6 @@ public class ConversationFragment extends XmppFragment
private void triggerRtpSession(final Account account, final Jid with, final String action) { private void triggerRtpSession(final Account account, final Jid with, final String action) {
CallIntegrationConnectionService.placeCall(requireActivity(),account,with,RtpSessionActivity.actionToMedia(action)); CallIntegrationConnectionService.placeCall(requireActivity(),account,with,RtpSessionActivity.actionToMedia(action));
/*final Intent intent = new Intent(activity, RtpSessionActivity.class);
intent.setAction(action);
intent.putExtra(RtpSessionActivity.EXTRA_ACCOUNT, account.getJid().toEscapedString());
intent.putExtra(RtpSessionActivity.EXTRA_WITH, with.toEscapedString());
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(intent);*/
} }
private void handleAttachmentSelection(MenuItem item) { private void handleAttachmentSelection(MenuItem item) {