From d1f00b6d77a3651c623f2b943f743750fa309494 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 14 Apr 2021 10:04:25 +1000 Subject: [PATCH 1/3] Don't run local backup jobs for now --- .../java/org/thoughtcrime/securesms/ApplicationContext.java | 2 -- .../org/thoughtcrime/securesms/service/LocalBackupListener.java | 1 - 2 files changed, 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index ec89c1028f..0ebcdc36a7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/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) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java index e33d9481e3..0b1b3f8423 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java +++ b/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; From 2d42d22df47f5db368a0de1bf2ebca0befba17be Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 14 Apr 2021 10:49:19 +1000 Subject: [PATCH 2/3] Don't close cursor prematurely --- .../org/thoughtcrime/securesms/MediaPreviewActivity.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java index 60b5cbeb25..908943f5a8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/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); From 5bcac3b39c646eb8dea17b52ef26ff7d0e346656 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 14 Apr 2021 10:51:21 +1000 Subject: [PATCH 3/3] Update version number --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 75fe0bc590..575c1b3b39 100644 --- a/app/build.gradle +++ b/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,