Skip to content

Fix notification inline reply kicking user to the home screen #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
m4pl wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix notification inline reply kicking user to the home screen #206

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/com/android/messaging/ui/UIIntentsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,13 @@
import android.provider.MediaStore;
import android.provider.Settings;
import android.provider.Telephony;
import android.telephony.TelephonyManager;
import android.text.TextUtils;

import com.android.messaging.R;
import com.android.messaging.datamodel.MediaScratchFileProvider;
import com.android.messaging.datamodel.MessagingContentProvider;
import com.android.messaging.datamodel.NoConfirmationSmsSendService;
import com.android.messaging.datamodel.data.MessageData;
import com.android.messaging.datamodel.data.MessagePartData;
import com.android.messaging.receiver.ConversationReadReceiver;
Expand Down Expand Up @@ -81,6 +83,8 @@ public class UIIntentsImpl extends UIIntents {
"com.android.providers.media.MediaScannerService";
private static final String MEDIA_SCANNER_PACKAGE = "com.android.providers.media";
private static final String MEDIA_SCANNER_SCAN_ACTION = "android.media.IMediaScannerService";
private static final int MUTABLE_PENDING_INTENT_FLAGS =
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE;

/**
* Get an intent which takes you to a conversation
Expand Down Expand Up @@ -363,15 +367,14 @@ public Intent getIntentForConversationActivity(final Context context,
public PendingIntent getPendingIntentForSendingMessageToConversation(final Context context,
final String conversationId, final String selfId, final boolean requiresMms,
final int requestCode) {
final Intent intent = new Intent(context, RemoteInputEntrypointActivity.class);
intent.setAction(Intent.ACTION_SENDTO);
final Intent intent = new Intent(context, NoConfirmationSmsSendService.class);
intent.setAction(TelephonyManager.ACTION_RESPOND_VIA_MESSAGE);
// Ensure that the platform doesn't reuse PendingIntents across conversations
intent.setData(MessagingContentProvider.buildConversationMetadataUri(conversationId));
intent.putExtra(UIIntents.UI_INTENT_EXTRA_CONVERSATION_ID, conversationId);
intent.putExtra(UIIntents.UI_INTENT_EXTRA_SELF_ID, selfId);
intent.putExtra(UIIntents.UI_INTENT_EXTRA_REQUIRES_MMS, requiresMms);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
return getPendingIntentWithParentStack(context, intent, requestCode);
return PendingIntent.getService(context, requestCode, intent, MUTABLE_PENDING_INTENT_FLAGS);
}

@Override
Expand Down Expand Up @@ -409,7 +412,7 @@ private static PendingIntent getPendingIntentWithParentStack(final Context conte
// Adds the back stack for the Intent (plus the Intent itself)
stackBuilder.addNextIntentWithParentStack(intent);
final PendingIntent resultPendingIntent =
stackBuilder.getPendingIntent(requestCode, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
stackBuilder.getPendingIntent(requestCode, MUTABLE_PENDING_INTENT_FLAGS);
return resultPendingIntent;
}

Expand Down
Loading