From 7cb2635594e6f33cf47fa469bb9d5698bb445903 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 6 Aug 2021 09:35:07 +0200
Subject: [PATCH] Push shortcuts

---
 app/build.gradle                                   | 3 +++
 app/src/main/java/eu/faircode/email/Shortcuts.java | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 04e545c4da..d7460ef743 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -263,6 +263,7 @@ dependencies {
     def appcompat_version = "1.3.1"
     def activity_version = "1.3.1"
     def fragment_version = "1.3.6"
+    def shortcuts_version = "1.0.0"
     def webkit_version = "1.4.0"
     def recyclerview_version = "1.2.1"
     def coordinatorlayout_version = "1.1.0"
@@ -316,9 +317,11 @@ dependencies {
     // https://mvnrepository.com/artifact/androidx.appcompat/appcompat
     // https://mvnrepository.com/artifact/androidx.activity/activity
     // https://mvnrepository.com/artifact/androidx.fragment/fragment
+    // https://mvnrepository.com/artifact/androidx.core/core-google-shortcuts
     implementation "androidx.appcompat:appcompat:$appcompat_version"
     implementation "androidx.activity:activity:$activity_version"
     implementation "androidx.fragment:fragment:$fragment_version"
+    implementation "androidx.core:core-google-shortcuts:$shortcuts_version"
 
     // https://developer.android.com/jetpack/androidx/releases/webkit
     // https://mvnrepository.com/artifact/androidx.webkit/webkit
diff --git a/app/src/main/java/eu/faircode/email/Shortcuts.java b/app/src/main/java/eu/faircode/email/Shortcuts.java
index c60bda5568..a95a4c22c9 100644
--- a/app/src/main/java/eu/faircode/email/Shortcuts.java
+++ b/app/src/main/java/eu/faircode/email/Shortcuts.java
@@ -57,6 +57,9 @@ import java.util.Set;
 
 import javax.mail.internet.InternetAddress;
 
+// https://developer.android.com/guide/topics/ui/shortcuts/creating-shortcuts
+// https://developer.android.com/guide/topics/ui/shortcuts/managing-shortcuts
+
 class Shortcuts {
     private static final int MAX_SHORTCUTS = 4;
 
@@ -150,9 +153,9 @@ class Shortcuts {
                 if (remove.size() > 0)
                     ShortcutManagerCompat.removeDynamicShortcuts(context, remove);
 
-                if (add.size() > 0) {
-                    boolean ok = ShortcutManagerCompat.addDynamicShortcuts(context, add);
-                    Log.i("Shortcuts=" + add.size() + " updated=" + ok);
+                for (ShortcutInfoCompat shortcut : add) {
+                    Log.i("Push shortcut id=" + shortcut.getId());
+                    ShortcutManagerCompat.pushDynamicShortcut(context, shortcut);
                 }
             }