remove expiring messages manager

AndroidManifest.xml

@@ -313,8 +313,6 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name=".service.ExpirationListener" />
-
     <provider android:name=".providers.PartProvider"
               android:grantUriPermissions="true"
               android:exported="false"

src/org/thoughtcrime/securesms/ApplicationContext.java

@@ -34,7 +34,6 @@ import org.thoughtcrime.securesms.crypto.PRNGFixes;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobmanager.persistence.JavaJobSerializer;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
-import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.util.ScreenLockUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.webrtc.PeerConnectionFactory;
@@ -59,7 +58,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
 
   private static final String TAG = ApplicationContext.class.getName();
 
-  private ExpiringMessageManager expiringMessageManager;
   private JobManager             jobManager;
 
   private volatile boolean isAppVisible;
@@ -80,7 +78,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     initializeRandomNumberFix();
     initializeLogging();
     initializeJobManager();
-    initializeExpiringMessageManager();
     //initializeSignedPreKeyCheck(); -- keys are generated in the core, however, not sure if this is needed for the lock screen
     initializePeriodicTasks();
     initializeWebRtc();
@@ -103,10 +100,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     return jobManager;
   }
 
-  public ExpiringMessageManager getExpiringMessageManager() {
-    return expiringMessageManager;
-  }
-
   public boolean isAppVisible() {
     return isAppVisible;
   }
@@ -150,10 +143,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
                                 .build();
   }
 
-  private void initializeExpiringMessageManager() {
-    this.expiringMessageManager = new ExpiringMessageManager(this);
-  }
-
   private void initializePeriodicTasks() {
     //DirectoryRefreshListener.schedule(this); -- directory in this sense seems to be the address book
     //LocalBackupListener.schedule(this); -- disabled for now, there is no automatic backup; maybe the implicit IMAP backup is sufficient

src/org/thoughtcrime/securesms/ConversationActivity.java

@@ -1055,7 +1055,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         dcContext.markseenMsgs(messageIds);
 
         MessageNotifier.updateNotification(context, threadId, false);
-//        MarkReadReceiver.process(context, messageIds);
 
         return null;
       }

src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java

@@ -44,7 +44,6 @@ import org.thoughtcrime.securesms.components.ThreadPhotoRailView;
 import org.thoughtcrime.securesms.connect.ApplicationDcContext;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.database.Address;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.database.loaders.ThreadMediaLoader;
 import org.thoughtcrime.securesms.mms.GlideApp;
@@ -514,7 +513,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
           new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... params) {
-              DatabaseFactory.getRecipientDatabase(context).setColor(recipient, selectedColor);
+//              DatabaseFactory.getRecipientDatabase(context).setColor(recipient, selectedColor);
 
 //              if (recipient.resolve().getRegistered() == RecipientDatabase.RegisteredState.REGISTERED) {
 //                ApplicationContext.getInstance(context)

src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java

@@ -1,23 +1,15 @@
+// called when the user click the "clear" or "mark read" button in the system notification
+
 package org.thoughtcrime.securesms.notifications;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
 import android.support.v4.app.NotificationManagerCompat;
 
-import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.connect.ApplicationDcContext;
 import org.thoughtcrime.securesms.connect.DcHelper;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.MessagingDatabase.ExpirationInfo;
-import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo;
-import org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId;
-import org.thoughtcrime.securesms.service.ExpiringMessageManager;
-
-import java.util.LinkedList;
-import java.util.List;
 
 public class MarkReadReceiver extends BroadcastReceiver {
 
@@ -40,46 +32,4 @@ public class MarkReadReceiver extends BroadcastReceiver {
       new MarkAsNoticedAsyncTask(threadIds, dcContext, true).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
   }
-
-  public static void process(@NonNull Context context, @NonNull int[] markedReadMessages) {
-
-  }
-
-  public static void process(@NonNull Context context, @NonNull List<MarkedMessageInfo> markedReadMessages) {
-    if (markedReadMessages.isEmpty()) return;
-
-    List<SyncMessageId> syncMessageIds = new LinkedList<>();
-
-    for (MarkedMessageInfo messageInfo : markedReadMessages) {
-      scheduleDeletion(context, messageInfo.getExpirationInfo());
-      syncMessageIds.add(messageInfo.getSyncMessageId());
-    }
-
-//    ApplicationContext.getInstance(context)
-//                      .getJobManager()
-//                      .add(new MultiDeviceReadUpdateJob(context, syncMessageIds));
-
-//    Map<Address, List<SyncMessageId>> addressMap = Stream.of(markedReadMessages)
-//                                                         .map(MarkedMessageInfo::getSyncMessageId)
-//                                                         .collect(Collectors.groupingBy(SyncMessageId::getAddress));
-//
-//    for (Address address : addressMap.keySet()) {
-//      List<Long> timestamps = Stream.of(addressMap.get(address)).map(SyncMessageId::getTimetamp).toList();
-//
-//      ApplicationContext.getInstance(context)
-//                        .getJobManager()
-//                        .add(new SendReadReceiptJob(context, address, timestamps));
-//    }
-  }
-
-  private static void scheduleDeletion(Context context, ExpirationInfo expirationInfo) {
-    if (expirationInfo.getExpiresIn() > 0 && expirationInfo.getExpireStarted() <= 0) {
-      ExpiringMessageManager expirationManager = ApplicationContext.getInstance(context).getExpiringMessageManager();
-
-      if (expirationInfo.isMms()) DatabaseFactory.getMmsDatabase(context).markExpireStarted(expirationInfo.getId());
-      else                        DatabaseFactory.getSmsDatabase(context).markExpireStarted(expirationInfo.getId());
-
-      expirationManager.scheduleDeletion(expirationInfo.getId(), expirationInfo.isMms(), expirationInfo.getExpiresIn());
-    }
-  }
 }

src/org/thoughtcrime/securesms/service/ExpirationListener.java

@@ -1,26 +0,0 @@
-package org.thoughtcrime.securesms.service;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import org.thoughtcrime.securesms.ApplicationContext;
-
-public class ExpirationListener extends BroadcastReceiver {
-
-  @Override
-  public void onReceive(Context context, Intent intent) {
-    ApplicationContext.getInstance(context).getExpiringMessageManager().checkSchedule();
-  }
-
-  public static void setAlarm(Context context, long waitTimeMillis) {
-    Intent        intent        = new Intent(context, ExpirationListener.class);
-    PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, intent, 0);
-    AlarmManager  alarmManager  = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
-
-    alarmManager.cancel(pendingIntent);
-    alarmManager.set(AlarmManager.RTC, System.currentTimeMillis() + waitTimeMillis, pendingIntent);
-  }
-}

src/org/thoughtcrime/securesms/service/ExpiringMessageManager.java

@@ -1,152 +0,0 @@
-package org.thoughtcrime.securesms.service;
-
-import android.content.Context;
-import android.util.Log;
-
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.MmsDatabase;
-import org.thoughtcrime.securesms.database.SmsDatabase;
-import org.thoughtcrime.securesms.database.model.MessageRecord;
-
-import java.util.Comparator;
-import java.util.TreeSet;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
-public class ExpiringMessageManager {
-
-  private static final String TAG = ExpiringMessageManager.class.getSimpleName();
-
-  private final TreeSet<ExpiringMessageReference> expiringMessageReferences = new TreeSet<>(new ExpiringMessageComparator());
-  private final Executor                          executor                  = Executors.newSingleThreadExecutor();
-
-  private final SmsDatabase smsDatabase;
-  private final MmsDatabase mmsDatabase;
-  private final Context     context;
-
-  public ExpiringMessageManager(Context context) {
-    this.context     = context.getApplicationContext();
-    this.smsDatabase = DatabaseFactory.getSmsDatabase(context);
-    this.mmsDatabase = DatabaseFactory.getMmsDatabase(context);
-
-    executor.execute(new LoadTask());
-    executor.execute(new ProcessTask());
-  }
-
-  public void scheduleDeletion(long id, boolean mms, long expiresInMillis) {
-    scheduleDeletion(id, mms, System.currentTimeMillis(), expiresInMillis);
-  }
-
-  public void scheduleDeletion(long id, boolean mms, long startedAtTimestamp, long expiresInMillis) {
-    long expiresAtMillis = startedAtTimestamp + expiresInMillis;
-
-    synchronized (expiringMessageReferences) {
-      expiringMessageReferences.add(new ExpiringMessageReference(id, mms, expiresAtMillis));
-      expiringMessageReferences.notifyAll();
-    }
-  }
-
-  public void checkSchedule() {
-    synchronized (expiringMessageReferences) {
-      expiringMessageReferences.notifyAll();
-    }
-  }
-
-  private class LoadTask implements Runnable {
-    public void run() {
-      SmsDatabase.Reader smsReader = smsDatabase.readerFor(smsDatabase.getExpirationStartedMessages());
-      MmsDatabase.Reader mmsReader = mmsDatabase.getExpireStartedMessages();
-
-      MessageRecord messageRecord;
-
-      while ((messageRecord = smsReader.getNext()) != null) {
-        expiringMessageReferences.add(new ExpiringMessageReference(messageRecord.getId(),
-                                                                   messageRecord.isMms(),
-                                                                   messageRecord.getExpireStarted() + messageRecord.getExpiresIn()));
-      }
-
-      while ((messageRecord = mmsReader.getNext()) != null) {
-        expiringMessageReferences.add(new ExpiringMessageReference(messageRecord.getId(),
-                                                                   messageRecord.isMms(),
-                                                                   messageRecord.getExpireStarted() + messageRecord.getExpiresIn()));
-      }
-
-      smsReader.close();
-      mmsReader.close();
-    }
-  }
-
-  @SuppressWarnings("InfiniteLoopStatement")
-  private class ProcessTask implements Runnable {
-    public void run() {
-      while (true) {
-        ExpiringMessageReference expiredMessage = null;
-
-        synchronized (expiringMessageReferences) {
-          try {
-            while (expiringMessageReferences.isEmpty()) expiringMessageReferences.wait();
-
-            ExpiringMessageReference nextReference = expiringMessageReferences.first();
-            long                     waitTime      = nextReference.expiresAtMillis - System.currentTimeMillis();
-
-            if (waitTime > 0) {
-              ExpirationListener.setAlarm(context, waitTime);
-              expiringMessageReferences.wait(waitTime);
-            } else {
-              expiredMessage = nextReference;
-              expiringMessageReferences.remove(nextReference);
-            }
-
-          } catch (InterruptedException e) {
-            Log.w(TAG, e);
-          }
-        }
-
-        if (expiredMessage != null) {
-          if (expiredMessage.mms) mmsDatabase.delete(expiredMessage.id);
-          else                    smsDatabase.deleteMessage(expiredMessage.id);
-        }
-      }
-    }
-  }
-
-  private static class ExpiringMessageReference {
-    private final long    id;
-    private final boolean mms;
-    private final long    expiresAtMillis;
-
-    private ExpiringMessageReference(long id, boolean mms, long expiresAtMillis) {
-      this.id = id;
-      this.mms = mms;
-      this.expiresAtMillis = expiresAtMillis;
-    }
-
-    @Override
-    public boolean equals(Object other) {
-      if (other == null) return false;
-      if (!(other instanceof ExpiringMessageReference)) return false;
-
-      ExpiringMessageReference that = (ExpiringMessageReference)other;
-      return this.id == that.id && this.mms == that.mms && this.expiresAtMillis == that.expiresAtMillis;
-    }
-
-    @Override
-    public int hashCode() {
-      return (int)this.id ^ (mms ? 1 : 0) ^ (int)expiresAtMillis;
-    }
-  }
-
-  private static class ExpiringMessageComparator implements Comparator<ExpiringMessageReference> {
-    @Override
-    public int compare(ExpiringMessageReference lhs, ExpiringMessageReference rhs) {
-      if      (lhs.expiresAtMillis < rhs.expiresAtMillis) return -1;
-      else if (lhs.expiresAtMillis > rhs.expiresAtMillis) return 1;
-      else if (lhs.id < rhs.id)                           return -1;
-      else if (lhs.id > rhs.id)                           return 1;
-      else if (!lhs.mms && rhs.mms)                       return -1;
-      else if (lhs.mms && !rhs.mms)                       return 1;
-      else                                                return 0;
-    }
-  }
-
-}