Fix Signal Direct Share Shortcuts not appearing in Android Sharesheet.

Fixes #11537

app/src/main/AndroidManifest.xml

@@ -243,6 +243,9 @@
         <meta-data android:name="com.sec.minimode.icon.landscape.normal"
                    android:resource="@mipmap/ic_launcher" />
 
+        <meta-data android:name="android.app.shortcuts"
+                   android:resource="@xml/shortcuts" />
+
     </activity-alias>
 
     <activity android:name=".deeplinks.DeepLinkEntryActivity"

app/src/main/java/org/thoughtcrime/securesms/sharing/ShareActivity.java

@@ -32,6 +32,8 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
 import androidx.core.util.Consumer;
 import androidx.lifecycle.ViewModelProviders;
 import androidx.recyclerview.widget.RecyclerView;
@@ -47,11 +49,13 @@ import org.thoughtcrime.securesms.components.SearchToolbar;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.mediasend.Media;
 import org.thoughtcrime.securesms.mediasend.MediaSendActivity;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.sharing.interstitial.ShareInterstitialActivity;
+import org.thoughtcrime.securesms.util.ConversationUtil;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
@@ -129,7 +133,6 @@ public class ShareActivity extends PassphraseRequiredActivity
     initializeToolbar();
     initializeResources();
     initializeSearch();
-    handleDestination();
   }
 
   @Override
@@ -138,6 +141,7 @@ public class ShareActivity extends PassphraseRequiredActivity
     super.onResume();
     dynamicTheme.onResume(this);
     dynamicLanguage.onResume(this);
+    handleDirectShare();
   }
 
   @Override
@@ -259,6 +263,86 @@ public class ShareActivity extends PassphraseRequiredActivity
     getIntent().putExtra(ContactSelectionListFragment.RV_PADDING_BOTTOM, ViewUtil.dpToPx(48));
   }
 
+  private void handleDirectShare() {
+    boolean isDirectShare      = getIntent().hasExtra(ShortcutManagerCompat.EXTRA_SHORTCUT_ID);
+    boolean intentHasRecipient = getIntent().hasExtra(EXTRA_RECIPIENT_ID);
+
+    if (intentHasRecipient) {
+      handleDestination();
+    } else if (isDirectShare) {
+      String  extraShortcutId = getIntent().getStringExtra(ShortcutManagerCompat.EXTRA_SHORTCUT_ID);
+      SimpleTask.run(getLifecycle(),
+          () -> getDirectShareExtras(extraShortcutId),
+          extras -> {
+            if (extras != null) {
+              addShortcutExtrasToIntent(extras);
+              handleDestination();
+            }
+          }
+      );
+    }
+  }
+
+  /**
+   * @param extraShortcutId EXTRA_SHORTCUT_ID String as included in direct share intent
+   * @return shortcutExtras or null
+   */
+  @WorkerThread
+  private @Nullable Bundle getDirectShareExtras(@NonNull String extraShortcutId) {
+    Bundle shortcutExtras = getShortcutExtrasFor(extraShortcutId);
+    if (shortcutExtras == null) {
+      shortcutExtras = createExtrasFromExtraShortcutId(extraShortcutId);
+    }
+    return shortcutExtras;
+  }
+
+  /**
+   * Search for dynamic shortcut originally declared in {@link ConversationUtil} and return extras
+   *
+   * @param extraShortcutId EXTRA_SHORTCUT_ID String as included in direct share intent
+   * @return shortcutExtras or null
+   */
+  @WorkerThread
+  private @Nullable Bundle getShortcutExtrasFor(@NonNull String extraShortcutId) {
+    List<ShortcutInfoCompat> shortcuts = ShortcutManagerCompat.getDynamicShortcuts(this);
+    for (ShortcutInfoCompat shortcutInfo : shortcuts) {
+      if (extraShortcutId.equals(shortcutInfo.getId())) {
+        return shortcutInfo.getIntent().getExtras();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * @param extraShortcutId EXTRA_SHORTCUT_ID string as included in direct share intent
+   */
+  @WorkerThread
+  private @Nullable Bundle createExtrasFromExtraShortcutId(@NonNull String extraShortcutId) {
+    Bundle      extras           = new Bundle();
+    RecipientId recipientId      = ConversationUtil.getRecipientId(extraShortcutId);
+    Long        threadId         = null;
+    int         distributionType = ThreadDatabase.DistributionTypes.DEFAULT;
+
+    if (recipientId != null) {
+      threadId = DatabaseFactory.getThreadDatabase(this).getThreadIdFor(recipientId);
+      extras.putString(EXTRA_RECIPIENT_ID, recipientId.serialize());
+      extras.putLong(EXTRA_THREAD_ID, threadId != null ? threadId : -1);
+      extras.putInt(EXTRA_DISTRIBUTION_TYPE, distributionType);
+      return extras;
+    }
+    return null;
+  }
+
+  /**
+   * @param shortcutExtras as found by {@link ShareActivity#getShortcutExtrasFor)} or
+   *                       {@link ShareActivity#createExtrasFromExtraShortcutId)}
+   */
+  private void addShortcutExtrasToIntent(@NonNull Bundle shortcutExtras) {
+    getIntent().putExtra(EXTRA_RECIPIENT_ID, shortcutExtras.getString(EXTRA_RECIPIENT_ID, null));
+    getIntent().putExtra(EXTRA_THREAD_ID, shortcutExtras.getLong(EXTRA_THREAD_ID, -1));
+    getIntent().putExtra(EXTRA_DISTRIBUTION_TYPE, shortcutExtras.getInt(EXTRA_DISTRIBUTION_TYPE, -1));
+  }
+
   private void initializeToolbar() {
     Toolbar toolbar = findViewById(R.id.toolbar);
     setSupportActionBar(toolbar);
@@ -400,13 +484,9 @@ public class ShareActivity extends PassphraseRequiredActivity
     Intent      intent           = getIntent();
     long        threadId         = intent.getLongExtra(EXTRA_THREAD_ID, -1);
     int         distributionType = intent.getIntExtra(EXTRA_DISTRIBUTION_TYPE, -1);
-    RecipientId recipientId      = null;
+    RecipientId recipientId      = RecipientId.from(intent.getStringExtra(EXTRA_RECIPIENT_ID));
 
-    if (intent.hasExtra(EXTRA_RECIPIENT_ID)) {
+    boolean hasPreexistingDestination = threadId != -1 && distributionType != -1;
-      recipientId = RecipientId.from(intent.getStringExtra(EXTRA_RECIPIENT_ID));
-    }
-
-    boolean hasPreexistingDestination = threadId != -1 && recipientId != null && distributionType != -1;
 
     if (hasPreexistingDestination) {
       if (contactsFragment.getView() != null) {

app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java

@@ -39,6 +39,8 @@ public final class ConversationUtil {
 
   private static final String TAG = Log.tag(ConversationUtil.class);
 
+  private static final String CATEGORY_SHARE_TARGET = "org.thoughtcrime.securesms.sharing.CATEGORY_SHARE_TARGET";
+
   private ConversationUtil() {}
 
 
@@ -204,7 +206,7 @@ public final class ConversationUtil {
                                  .setLongLabel(longName)
                                  .setIcon(AvatarUtil.getIconCompatForShortcut(context, resolved))
                                  .setPersons(persons)
-                                 .setCategories(Collections.singleton("android.shortcut.conversation"))
+                                 .setCategories(Collections.singleton(CATEGORY_SHARE_TARGET))
                                  .setActivity(new ComponentName(context, "org.thoughtcrime.securesms.RoutingActivity"))
                                  .setRank(rank)
                                  .build();

app/src/main/res/xml/shortcuts.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <share-target android:targetClass="org.thoughtcrime.securesms.sharing.ShareActivity">
+        <data android:mimeType="*/*" />
+        <category android:name="org.thoughtcrime.securesms.sharing.CATEGORY_SHARE_TARGET" />
+    </share-target>
+</shortcuts>