Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-26 19:56:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix up wearable reply stuff a little.

Browse Source 
1) Don't include MasterSecret in PendingIntents.

2) Correctly reply to non-push group threads, rather than
   just an individual in that group.

// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-06-13 20:23:30 -07:00
parent f0b2cc5590
commit 13eed3baa7
7 changed files with 102 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
View File

@@ -5,34 +5,38 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.os.AsyncTask;
import android.support.annotation.Nullable;
import android.util.Log;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.DatabaseFactory;
public class MarkReadReceiver extends BroadcastReceiver {
public class MarkReadReceiver extends MasterSecretBroadcastReceiver {
public static final String CLEAR_ACTION = "org.thoughtcrime.securesms.notifications.CLEAR";
private static final String TAG = MarkReadReceiver.class.getSimpleName();
public static final String CLEAR_ACTION = "org.thoughtcrime.securesms.notifications.CLEAR";
public static final String THREAD_IDS_EXTRA = "thread_ids";
@Override
public void onReceive(final Context context, Intent intent) {
if (!intent.getAction().equals(CLEAR_ACTION))
protected void onReceive(final Context context, Intent intent,
@Nullable final MasterSecret masterSecret)
{
if (!CLEAR_ACTION.equals(intent.getAction()))
return;
final long[] threadIds = intent.getLongArrayExtra("thread_ids");
final MasterSecret masterSecret = intent.getParcelableExtra("master_secret");
final long[] threadIds = intent.getLongArrayExtra(THREAD_IDS_EXTRA);
if (threadIds != null && masterSecret != null) {
Log.w("MarkReadReceiver", "threadIds length: " + threadIds.length);
if (threadIds != null) {
Log.w("TAG", "threadIds length: " + threadIds.length);
((NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE))
.cancel(MessageNotifier.NOTIFICATION_ID);
.cancel(MessageNotifier.NOTIFICATION_ID);
new AsyncTask<Void, Void, Void>() {
@Override
protected Void doInBackground(Void... params) {
for (long threadId : threadIds) {
Log.w("MarkReadReceiver", "Marking as read: " + threadId);
Log.w(TAG, "Marking as read: " + threadId);
DatabaseFactory.getThreadDatabase(context).setRead(threadId);
}