awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'upstream/main'

Browse Source
This commit is contained in:
adbenitez
2024-01-20 01:03:15 -05:00
parent 270cbbeded a1cc00a17f
commit 7f46e56b6d
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/ConversationListActivity.java
+11 -3
View File
@@ -80,6 +80,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
{
private static final String TAG = ConversationListActivity.class.getSimpleName();
private static final String OPENPGP4FPR = "openpgp4fpr";
private static final String INVITE_PAGE = "i.delta.chat";
private static final String NDK_ARCH_WARNED = "ndk_arch_warned";
public static final String CLEAR_NOTIFICATIONS = "clear_notifications";
public static final String ACCOUNT_ID_EXTRA = "account_id";
@@ -389,11 +390,18 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
if (getIntent() != null &&
Intent.ACTION_VIEW.equals(getIntent().getAction())) {
Uri uri = getIntent().getData();
if (uri != null && uri.getScheme().equalsIgnoreCase(OPENPGP4FPR)) {
String uriString = uri.toString();
uriString = uriString.replaceFirst(OPENPGP4FPR, OPENPGP4FPR.toUpperCase());
if (uri == null) {
return;
}
if (uri.getScheme().equalsIgnoreCase(OPENPGP4FPR)) {
String uriString = uri.toString().replaceFirst(OPENPGP4FPR, OPENPGP4FPR.toUpperCase());
QrCodeHandler qrCodeHandler = new QrCodeHandler(this);
qrCodeHandler.handleQrData(uriString);
} else if (INVITE_PAGE.equals(uri.getHost()) && uri.getEncodedFragment() != null) {
String data = OPENPGP4FPR.toUpperCase() + ":" + uri.getEncodedFragment().replaceFirst("&", "#");
QrCodeHandler qrCodeHandler = new QrCodeHandler(this);
qrCodeHandler.handleQrData(data);
}
}
}
src/org/thoughtcrime/securesms/reactions/AddReactionView.java
-4
View File
@@ -59,10 +59,6 @@ public class AddReactionView extends LinearLayout {
public void show(DcMsg msgToReactTo, View parentView, AddReactionListener listener) {
init(); // init delayed as needed
if (!Prefs.getBooleanPreference(context, "pref_send_reactions", true)) {
return;
}
if ( msgToReactTo.isInfo()
|| msgToReactTo.getType() == DcMsg.DC_MSG_VIDEOCHAT_INVITATION
|| !dcContext.getChat(msgToReactTo.getChatId()).canSend()) {