From 9c705f3a454757cdfee683c5ba20347044bf9ec4 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 18 Sep 2025 11:23:13 -0400 Subject: [PATCH] Remove unnecessary SMS entrypoint. Fixes #14213 --- app/src/main/AndroidManifest.xml | 12 +----------- ...y.java => SystemContactsEntrypointActivity.java} | 13 +++---------- 2 files changed, 4 insertions(+), 21 deletions(-) rename app/src/main/java/org/thoughtcrime/securesms/{SmsSendtoActivity.java => SystemContactsEntrypointActivity.java} (85%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5446ca6934..b37ddde6f3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -930,17 +930,7 @@ android:theme="@style/TextSecure.DialogActivity" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> - - - - - - - - - - - + diff --git a/app/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java b/app/src/main/java/org/thoughtcrime/securesms/SystemContactsEntrypointActivity.java similarity index 85% rename from app/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java rename to app/src/main/java/org/thoughtcrime/securesms/SystemContactsEntrypointActivity.java index d051114983..dbe16ad996 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/SystemContactsEntrypointActivity.java @@ -18,9 +18,9 @@ import org.thoughtcrime.securesms.util.Rfc5724Uri; import java.net.URISyntaxException; -public class SmsSendtoActivity extends Activity { +public class SystemContactsEntrypointActivity extends Activity { - private static final String TAG = Log.tag(SmsSendtoActivity.class); + private static final String TAG = Log.tag(SystemContactsEntrypointActivity.class); @Override protected void onCreate(Bundle savedInstanceState) { @@ -32,9 +32,7 @@ public class SmsSendtoActivity extends Activity { private Intent getNextIntent(Intent original) { DestinationAndBody destination; - if (original.getAction().equals(Intent.ACTION_SENDTO)) { - destination = getDestinationForSendTo(original); - } else if (original.getData() != null && "content".equals(original.getData().getScheme())) { + if (original.getData() != null && "content".equals(original.getData().getScheme())) { destination = getDestinationForSyncAdapter(original); } else { destination = getDestinationForView(original); @@ -64,11 +62,6 @@ public class SmsSendtoActivity extends Activity { return nextIntent; } - private @NonNull DestinationAndBody getDestinationForSendTo(Intent intent) { - return new DestinationAndBody(intent.getData().getSchemeSpecificPart(), - intent.getStringExtra("sms_body")); - } - private @NonNull DestinationAndBody getDestinationForView(Intent intent) { try { Rfc5724Uri smsUri = new Rfc5724Uri(intent.getData().toString());