13eed3baa7
1) Don't include MasterSecret in PendingIntents. 2) Correctly reply to non-push group threads, rather than just an individual in that group. // FREEBIE
49 lines
1.7 KiB
Java
49 lines
1.7 KiB
Java
package org.thoughtcrime.securesms.notifications;
|
|
|
|
import android.app.NotificationManager;
|
|
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 MasterSecretBroadcastReceiver {
|
|
|
|
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
|
|
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_EXTRA);
|
|
|
|
if (threadIds != null) {
|
|
Log.w("TAG", "threadIds length: " + threadIds.length);
|
|
|
|
((NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE))
|
|
.cancel(MessageNotifier.NOTIFICATION_ID);
|
|
|
|
new AsyncTask<Void, Void, Void>() {
|
|
@Override
|
|
protected Void doInBackground(Void... params) {
|
|
for (long threadId : threadIds) {
|
|
Log.w(TAG, "Marking as read: " + threadId);
|
|
DatabaseFactory.getThreadDatabase(context).setRead(threadId);
|
|
}
|
|
|
|
MessageNotifier.updateNotification(context, masterSecret);
|
|
return null;
|
|
}
|
|
}.execute();
|
|
}
|
|
}
|
|
}
|