From 72ace5c1562e37d7255bcfaf6dfb2e70c822fa4f Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 27 Nov 2024 19:01:49 +0100 Subject: [PATCH] remove Util.QrDataToInviteURL() --- .../thoughtcrime/securesms/ConversationListActivity.java | 2 +- .../java/org/thoughtcrime/securesms/qr/QrShowFragment.java | 6 +++--- src/main/java/org/thoughtcrime/securesms/util/Util.java | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java index c0f25cfd9..b9ba9e081 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java @@ -533,7 +533,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit private void shareInvite() { Intent intent = new Intent(Intent.ACTION_SEND); intent.setType("text/plain"); - String inviteURL = Util.QrDataToInviteURL(DcHelper.getContext(this).getSecurejoinQr(0)); + String inviteURL = DcHelper.getContext(this).getSecurejoinQr(0); intent.putExtra(Intent.EXTRA_TEXT, getString(R.string.invite_friends_text, inviteURL)); startActivity(Intent.createChooser(intent, getString(R.string.chat_share_with_title))); } diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java b/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java index 4e6f3fa24..2d4d4ee9e 100644 --- a/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java @@ -122,7 +122,7 @@ public class QrShowFragment extends Fragment implements DcEventCenter.DcEventDel try { Intent intent = new Intent(Intent.ACTION_SEND); intent.setType("text/plain"); - String inviteURL = Util.QrDataToInviteURL(dcContext.getSecurejoinQr(chatId)); + String inviteURL = dcContext.getSecurejoinQr(chatId); intent.putExtra(Intent.EXTRA_TEXT, inviteURL); startActivity(Intent.createChooser(intent, getString(R.string.chat_share_with_title))); } catch (Exception e) { @@ -131,7 +131,7 @@ public class QrShowFragment extends Fragment implements DcEventCenter.DcEventDel } public void copyQrData() { - String inviteURL = Util.QrDataToInviteURL(dcContext.getSecurejoinQr(chatId)); + String inviteURL = dcContext.getSecurejoinQr(chatId); Util.writeTextToClipboard(getActivity(), inviteURL); Toast.makeText(getActivity(), getString(R.string.copied_to_clipboard), Toast.LENGTH_SHORT).show(); } @@ -151,7 +151,7 @@ public class QrShowFragment extends Fragment implements DcEventCenter.DcEventDel public void showInviteLinkDialog() { View view = View.inflate(getActivity(), R.layout.dialog_share_invite_link, null); - String inviteURL = Util.QrDataToInviteURL(dcContext.getSecurejoinQr(chatId)); + String inviteURL = dcContext.getSecurejoinQr(chatId); ((TextView)view.findViewById(R.id.invite_link)).setText(inviteURL); new AlertDialog.Builder(getActivity()) .setView(view) diff --git a/src/main/java/org/thoughtcrime/securesms/util/Util.java b/src/main/java/org/thoughtcrime/securesms/util/Util.java index adba7d98e..cf180e97e 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/Util.java +++ b/src/main/java/org/thoughtcrime/securesms/util/Util.java @@ -85,10 +85,6 @@ public class Util { return false; } - public static String QrDataToInviteURL(String qrData) { - return "https://" + INVITE_DOMAIN + "/#" + qrData.split(":", 2)[1].replaceFirst("#", "&"); - } - public static CharSequence getBoldedString(String value) { SpannableString spanned = new SpannableString(value); spanned.setSpan(new StyleSpan(Typeface.BOLD), 0,