TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-27 12:39:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

move old message notifier to optimized message notifier

Browse Source
This commit is contained in:
ryanzhao
2020-06-26 16:18:19 +10:00
parent 871d707460
commit 2a88de3f61
28 changed files with 83 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java
View File

@@ -24,6 +24,7 @@ import android.content.Intent;
import android.os.AsyncTask;
import android.support.v4.app.NotificationManagerCompat;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo;
import org.whispersystems.libsignal.logging.Log;
@@ -66,7 +67,7 @@ public class AndroidAutoHeardReceiver extends BroadcastReceiver {
messageIdsCollection.addAll(messageIds);
}
MessageNotifier.updateNotification(context);
ApplicationContext.getInstance(context).messageNotifier.updateNotification(context);
MarkReadReceiver.process(context, messageIdsCollection);
return null;

3
src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java
View File

@@ -25,6 +25,7 @@ import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.app.RemoteInput;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.database.Address;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo;
@@ -86,7 +87,7 @@ public class AndroidAutoReplyReceiver extends BroadcastReceiver {
List<MarkedMessageInfo> messageIds = DatabaseFactory.getThreadDatabase(context).setRead(replyThreadId, true);
MessageNotifier.updateNotification(context);
ApplicationContext.getInstance(context).messageNotifier.updateNotification(context);
MarkReadReceiver.process(context, messageIds);
return null;

3
src/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java
View File

@@ -6,6 +6,7 @@ import android.content.Context;
import android.content.Intent;
import android.os.AsyncTask;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.database.DatabaseFactory;
public class DeleteNotificationReceiver extends BroadcastReceiver {
@@ -18,7 +19,7 @@ public class DeleteNotificationReceiver extends BroadcastReceiver {
@Override
public void onReceive(final Context context, Intent intent) {
if (DELETE_NOTIFICATION_ACTION.equals(intent.getAction())) {
MessageNotifier.clearReminder(context);
ApplicationContext.getInstance(context).messageNotifier.clearReminder(context);
final long[] ids = intent.getLongArrayExtra(EXTRA_IDS);
final boolean[] mms = intent.getBooleanArrayExtra(EXTRA_MMS);

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

@@ -61,7 +61,7 @@ public class MarkReadReceiver extends BroadcastReceiver {
process(context, messageIdsCollection);
MessageNotifier.updateNotification(context);
ApplicationContext.getInstance(context).messageNotifier.updateNotification(context);
return null;
}

5
src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
View File

@@ -25,6 +25,7 @@ import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.app.RemoteInput;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.database.Address;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo;
@@ -59,7 +60,7 @@ public class RemoteReplyReceiver extends BroadcastReceiver {
final Address address = intent.getParcelableExtra(ADDRESS_EXTRA);
final ReplyMethod replyMethod = (ReplyMethod) intent.getSerializableExtra(REPLY_METHOD);
final CharSequence responseText = remoteInput.getCharSequence(MessageNotifier.EXTRA_REMOTE_REPLY);
final CharSequence responseText = remoteInput.getCharSequence(DefaultMessageNotifier.EXTRA_REMOTE_REPLY);
if (address == null) throw new AssertionError("No address specified");
if (replyMethod == null) throw new AssertionError("No reply method specified");
@@ -91,7 +92,7 @@ public class RemoteReplyReceiver extends BroadcastReceiver {
List<MarkedMessageInfo> messageIds = DatabaseFactory.getThreadDatabase(context).setRead(threadId, true);
MessageNotifier.updateNotification(context);
ApplicationContext.getInstance(context).messageNotifier.updateNotification(context);
MarkReadReceiver.process(context, messageIds);
return null;

4
src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
View File

@@ -177,14 +177,14 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
replyAction = new Action.Builder(R.drawable.ic_reply_white_36dp,
actionName,
wearableReplyIntent)
.addRemoteInput(new RemoteInput.Builder(MessageNotifier.EXTRA_REMOTE_REPLY).setLabel(label).build())
.addRemoteInput(new RemoteInput.Builder(DefaultMessageNotifier.EXTRA_REMOTE_REPLY).setLabel(label).build())
.build();
}
Action wearableReplyAction = new Action.Builder(R.drawable.ic_reply,
actionName,
wearableReplyIntent)
.addRemoteInput(new RemoteInput.Builder(MessageNotifier.EXTRA_REMOTE_REPLY).setLabel(label).build())
.addRemoteInput(new RemoteInput.Builder(DefaultMessageNotifier.EXTRA_REMOTE_REPLY).setLabel(label).build())
.build();