empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Listen to a broadcast until a shortcut was actually created before popping up a toast.

Browse source 
Fixes #10743
This commit is contained in:
Fumiaki Yoshimatsu 2022-01-29 11:04:56 -05:00 • committed by Cody Henthorne
parent b5f6513917
commit 1a1213d043
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
View file

@ -20,6 +20,7 @@ import android.Manifest;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.Activity; import android.app.Activity;
import android.app.PendingIntent;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
@ -362,6 +363,9 @@ public class ConversationParentFragment extends Fragment
private static final int SMS_DEFAULT = 11; private static final int SMS_DEFAULT = 11;
private static final int MEDIA_SENDER = 12; private static final int MEDIA_SENDER = 12;
private static final int REQUEST_CODE_PIN_SHORTCUT = 902;
private static final String ACTION_PINNED_SHORTCUT = "action_pinned_shortcut";
private GlideRequests glideRequests; private GlideRequests glideRequests;
protected ComposeText composeText; protected ComposeText composeText;
private AnimatingToggle buttonToggle; private AnimatingToggle buttonToggle;
@ -403,6 +407,7 @@ public class ConversationParentFragment extends Fragment
private ImageView wallpaper; private ImageView wallpaper;
private View wallpaperDim; private View wallpaperDim;
private Toolbar toolbar; private Toolbar toolbar;
private BroadcastReceiver pinnedShortcutReceiver;
private LinkPreviewViewModel linkPreviewViewModel; private LinkPreviewViewModel linkPreviewViewModel;
private ConversationSearchViewModel searchViewModel; private ConversationSearchViewModel searchViewModel;
@ -697,6 +702,7 @@ public class ConversationParentFragment extends Fragment
@Override @Override
public void onDestroy() { public void onDestroy() {
if (securityUpdateReceiver != null) requireActivity().unregisterReceiver(securityUpdateReceiver); if (securityUpdateReceiver != null) requireActivity().unregisterReceiver(securityUpdateReceiver);
if (pinnedShortcutReceiver != null) requireActivity().unregisterReceiver(pinnedShortcutReceiver);
super.onDestroy(); super.onDestroy();
} }
@ -1276,6 +1282,15 @@ public class ConversationParentFragment extends Fragment
final Context context = requireContext().getApplicationContext(); final Context context = requireContext().getApplicationContext();
final Recipient recipient = this.recipient.get(); final Recipient recipient = this.recipient.get();
if (pinnedShortcutReceiver == null) {
pinnedShortcutReceiver = new BroadcastReceiver() {
@Override public void onReceive(Context context, Intent intent) {
Toast.makeText(context, context.getString(R.string.ConversationActivity_added_to_home_screen), Toast.LENGTH_LONG).show();
}
};
requireActivity().registerReceiver(pinnedShortcutReceiver, new IntentFilter(ACTION_PINNED_SHORTCUT));
}
GlideApp.with(this) GlideApp.with(this)
.asBitmap() .asBitmap()
.load(recipient.getContactPhoto()) .load(recipient.getContactPhoto())
@ -1327,9 +1342,10 @@ public class ConversationParentFragment extends Fragment
.setIntent(ShortcutLauncherActivity.createIntent(context, recipient.getId())) .setIntent(ShortcutLauncherActivity.createIntent(context, recipient.getId()))
.build(); .build();
if (ShortcutManagerCompat.requestPinShortcut(context, shortcutInfoCompat, null)) { Intent callbackIntent = new Intent(ACTION_PINNED_SHORTCUT);
Toast.makeText(context, context.getString(R.string.ConversationActivity_added_to_home_screen), Toast.LENGTH_LONG).show(); PendingIntent shortcutPinnedCallback = PendingIntent.getBroadcast(context, REQUEST_CODE_PIN_SHORTCUT, callbackIntent, 0);
}
ShortcutManagerCompat.requestPinShortcut(context, shortcutInfoCompat, shortcutPinnedCallback.getIntentSender());
bitmap.recycle(); bitmap.recycle();
} }