Merge branch 'dev' of https://github.com/loki-project/session-android into specific-group-updates

app/build.gradle

@@ -157,8 +157,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.2'
 }
 
-def canonicalVersionCode = 150
-def canonicalVersionName = "1.9.0"
+def canonicalVersionCode = 151
+def canonicalVersionName = "1.9.1"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

@@ -84,7 +84,6 @@ import org.thoughtcrime.securesms.notifications.OptimizedMessageNotifier;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.thoughtcrime.securesms.service.LocalBackupListener;
 import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
 import org.thoughtcrime.securesms.sskenvironment.ProfileManager;
 import org.thoughtcrime.securesms.sskenvironment.ReadReceiptManager;
@@ -363,7 +362,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     }
 
     private void initializePeriodicTasks() {
-        LocalBackupListener.schedule(this);
         BackgroundPollWorker.schedulePeriodic(this); // Loki
 
         if (BuildConfig.PLAY_STORE_DISABLED) {

app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -311,11 +311,6 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
   private int cleanupMedia() {
     int restartItem = mediaPager.getCurrentItem();
 
-    PagerAdapter adapter = mediaPager.getAdapter();
-    if (adapter instanceof CursorPagerAdapter) {
-      ((CursorPagerAdapter)adapter).cursor.close();
-    }
-
     mediaPager.removeAllViews();
     mediaPager.setAdapter(null);
 

app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java

@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.service;
 
-
 import android.content.Context;
 import android.content.Intent;
 

libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt

@@ -54,7 +54,7 @@ class JobQueue : JobDelegate {
         // of the order in which the jobs were added.
         val currentTime = System.currentTimeMillis()
         jobTimestampMap.putIfAbsent(currentTime, AtomicInteger())
-        job.id = jobTimestampMap[currentTime]!!.getAndIncrement().toString()
+        job.id = currentTime.toString() + jobTimestampMap[currentTime]!!.getAndIncrement().toString()
 
         MessagingConfiguration.shared.storage.persistJob(job)
     }