Merge remote-tracking branch 'origin/HEAD'

Add .profm sorting to build.gradle

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 96
-        versionName "0.26.0"
+        versionCode 98
+        versionName "0.26.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -181,3 +181,35 @@ dependencies {
 ktlint {
     disabledRules.set(["no-wildcard-imports"])
 }
+
+// https://gitlab.com/fdroid/wiki/-/wikis/HOWTO:-diff-&-fix-APKs-for-Reproducible-Builds#differing-assetsdexoptbaselineprofm-easy-to-fix
+// NB: Android Studio can't find the imports; this does not affect the
+// actual build since Gradle can find them just fine.
+import com.android.tools.profgen.ArtProfileKt
+import com.android.tools.profgen.ArtProfileSerializer
+import com.android.tools.profgen.DexFile
+
+project.afterEvaluate {
+    tasks.each { task ->
+        if (task.name.startsWith("compile") && task.name.endsWith("ReleaseArtProfile")) {
+            task.doLast {
+                outputs.files.each { file ->
+                    if (file.name.endsWith(".profm")) {
+                        println("Sorting ${file} ...")
+                        def version = ArtProfileSerializer.valueOf("METADATA_0_0_2")
+                        def profile = ArtProfileKt.ArtProfile(file)
+                        def keys = new ArrayList(profile.profileData.keySet())
+                        def sortedData = new LinkedHashMap()
+                        Collections.sort keys, new DexFile.Companion()
+                        keys.each { key -> sortedData[key] = profile.profileData[key] }
+                        new FileOutputStream(file).with {
+                            write(version.magicBytes$profgen)
+                            write(version.versionBytes$profgen)
+                            version.write$profgen(it, sortedData, "")
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ContactListEvent.kt

@@ -23,7 +23,12 @@ class ContactListEvent(
     val verifiedFollowKeySet: Set<HexKey> by lazy {
         tags.filter { it[0] == "p" }.mapNotNull {
             it.getOrNull(1)?.let { unverifiedHex: String ->
-                decodePublicKey(unverifiedHex).toHexKey()
+                try {
+                    decodePublicKey(unverifiedHex).toHexKey()
+                } catch (e: Exception) {
+                    Log.w("ContactListEvent", "Can't parse tags as a follows: ${it[1]}", e)
+                    null
+                }
             }
         }.toSet()
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowsFeedFilter.kt

@@ -16,7 +16,7 @@ object UserProfileFollowsFeedFilter : FeedFilter<User>() {
     override fun feed(): List<User> {
         return user?.latestContactList?.unverifiedFollowKeySet()?.map {
             LocalCache.getOrCreateUser(it)
-        }
+        }?.toSet()
             ?.filter { account.isAcceptable(it) }
             ?.reversed() ?: emptyList()
     }