Merge branch 'dev' into dev

app/src/main/kotlin/me/eternal/purrfectsnap/bridge/BridgeService.kt

@@ -229,7 +229,6 @@ class BridgeService : Service() {
             pendingSocialSnapshotCallback?.let { callback ->
                 pendingSocialSnapshotCallback = null
                 callback(parsedFriends, parsedGroups)
-                return
             }
             remoteSideContext.database.replaceMessagingData(parsedFriends, parsedGroups)
             remoteSideContext.database.receiveMessagingDataCallback(parsedFriends, parsedGroups)

app/src/main/kotlin/me/eternal/purrfectsnap/download/DownloadProcessor.kt

@@ -121,6 +121,7 @@ class DownloadProcessor (
                     inputFile.outputStream().use {
                         bitmap.compress(compressFormat, 100, it)
                     }
+                    bitmap.recycle()
                     fileType = FileType.fromFile(inputFile)
                 }
             }
@@ -673,6 +674,10 @@ class DownloadProcessor (
                                     mergedBitmap.compress(compressFormat, 100, it)
                                 }
 
+                                originalBitmap.recycle()
+                                overlayBitmap.recycle()
+                                mergedBitmap.recycle()
+
                                 saveMediaToGallery(pendingTask, mergedImage, downloadMetadata)
                                 mergedImage.delete()
                                 renamedOverlayMedia.delete()

app/src/main/kotlin/me/eternal/purrfectsnap/download/FFMpegProcessor.kt

@@ -92,6 +92,10 @@ class FFMpegProcessor(
 
     private val sharedExecutor = Executors.newSingleThreadExecutor()
 
+    protected fun finalize() {
+        runCatching { sharedExecutor.shutdown() }
+    }
+
     private suspend fun newFFMpegTask(globalArguments: ArgumentList, inputArguments: ArgumentList, outputArguments: ArgumentList) = suspendCancellableCoroutine<FFmpegSession> {
         val stringBuilder = StringBuilder()
         arrayOf(globalArguments, inputArguments, outputArguments).forEach { argumentList ->

app/src/main/kotlin/me/eternal/purrfectsnap/storage/Messaging.kt

@@ -138,6 +138,11 @@ fun AppDatabase.replaceMessagingData(
         } finally {
             database.endTransaction()
         }
+        
+        // Notify with the full updated list from the DB
+        val allFriends = getFriends(descOrder = true)
+        val allGroups = getGroups()
+        receiveMessagingDataCallback(allFriends, allGroups)
     }
 }
 

app/src/main/kotlin/me/eternal/purrfectsnap/ui/manager/pages/social/AddFriendDialog.kt

@@ -256,11 +256,7 @@ class AddFriendDialog(
                 )
             }
 
-            if (context.bridgeService != null) {
-                context.bridgeService?.requestEphemeralSocialSnapshot(updateSnapshot)
-            } else {
-                context.database.receiveMessagingDataCallback = updateSnapshot
-            }
+            context.database.receiveMessagingDataCallback = updateSnapshot
             context.requestSocialSnapshotRefresh()
 
             coroutineScope.launch(Dispatchers.IO) {