Merge pull request #173 from muun/55.1-release-branch

Apollo: Release source code for 55.1 (1501)

Author: fmucci-muun

android/CHANGELOG.md

@@ -6,6 +6,13 @@ follow [https://changelog.md/](https://changelog.md/) guidelines.
 
 ## [Unreleased]
 
+## [55.1] - 2025-08-22
+
+### FIXED
+
+- Api < 24 crash on missing method
+- Null context fixed on dialog
+
 ## [55.0] - 2025-08-07
 
 ### CHANGED

android/apolloui/build.gradle

@@ -98,8 +98,8 @@ android {
         applicationId "io.muun.apollo"
         minSdk 19
         targetSdk 34
-        versionCode 1500
-        versionName "55.0"
+        versionCode 1501
+        versionName "55.1"
 
         // Needed to make sure these classes are available in the main DEX file for API 19
         // See: https://spin.atomicobject.com/2018/07/16/support-kitkat-multidex/

android/apolloui/src/main/java/io/muun/apollo/data/afs/HardwareCapabilitiesProvider.kt

@@ -224,15 +224,15 @@ class HardwareCapabilitiesProvider(private val context: Context) {
             }
         }
 
-    private fun File.getTotalSpaceSafe() = try {
-        totalSpace
+    private fun File?.getTotalSpaceSafe() = try {
+        this?.totalSpace ?: UNKNOWN_BYTES_AMOUNT
     } catch (e: Exception) {
         Timber.e(HardwareCapabilityError("totalSpace", e))
         UNKNOWN_BYTES_AMOUNT
     }
 
-    private fun File.getFreeSpaceSafe() = try {
-        freeSpace
+    private fun File?.getFreeSpaceSafe() = try {
+        this?.freeSpace ?: UNKNOWN_BYTES_AMOUNT
     } catch (e: Exception) {
         Timber.e(HardwareCapabilityError("freeSpace", e))
         UNKNOWN_BYTES_AMOUNT
@@ -268,18 +268,26 @@ class HardwareCapabilitiesProvider(private val context: Context) {
      * TODO: once our minSdk > 28 (OS.supportsMediaDrmClose()) we could do this with kotlin's
      *  try-with-resources.
      */
-    private fun getDrmIdFromClosableMediaDrm(drmProviderUuid: UUID): String {
+    private fun getDrmIdFromClosableMediaDrm(drmProviderUuid: UUID): String? {
         var mediaDrm: MediaDrm? = null
         try {
             mediaDrm = MediaDrm(drmProviderUuid)
-            val deviceIdBytes = mediaDrm.getPropertyByteArray(MediaDrm.PROPERTY_DEVICE_UNIQUE_ID)
+            val deviceIdBytes = getSafeDeviceId(mediaDrm) ?: return null
 
             return Encodings.bytesToHex(Hashes.sha256(deviceIdBytes))
         } finally {
             mediaDrm?.let(::releaseMediaDRM)
         }
     }
 
+    private fun getSafeDeviceId(mediaDrm: MediaDrm): ByteArray? {
+        return try {
+            mediaDrm.getPropertyByteArray(MediaDrm.PROPERTY_DEVICE_UNIQUE_ID)
+        } catch (e: Exception) {
+            null
+        }
+    }
+
     private fun releaseMediaDRM(drmObject: MediaDrm) {
         if (OS.supportsMediaDrmClose()) {
             drmObject.close()

android/apolloui/src/main/java/io/muun/apollo/presentation/ui/fragments/sync/SyncPresenter.java

@@ -114,7 +114,7 @@ public void handleError(Throwable error) {
             view.showErrorDialog(
                     getContext().getString(R.string.network_error_message),
                     null,
-                    () -> navigator.navigateToLauncher(getContext())
+                    () -> navigator.navigateToLauncher(view.getViewContext())
             );
         } else {
             super.handleError(error);

common/src/main/java/io/muun/common/utils/ByteArray.java

@@ -36,9 +36,11 @@ public static byte[] slice(byte[] bytes, int index) {
      */
     public static byte[] concat(byte[]... parts) {
 
-        final int totalLength = Arrays.stream(parts)
-                .map(x -> x.length)
-                .reduce(0, Integer::sum);
+        int totalLength = 0;
+
+        for (byte[] part : parts) {
+            totalLength += part.length;
+        }
 
         final byte[] concatenatedArray = new byte[totalLength];
         int currentPosition = 0;