sign unfollow event

app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt

@@ -618,12 +618,20 @@ class Account(
         LocalCache.consume(event)
     }
 
-    fun unfollow(user: User) {
+    fun unfollow(user: User, signEvent: Boolean = true): ContactListEvent? {
-        if (!isWriteable()) return
+        if (!isWriteable() && signEvent) return null
 
         val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
 
         if (contactList != null && contactList.tags.isNotEmpty()) {
+            if (!signEvent) {
+                return ContactListEvent.unfollowUser(
+                    contactList,
+                    user.pubkeyHex,
+                    keyPair.pubKey.toHexKey()
+                )
+            }
+
             val event = ContactListEvent.unfollowUser(
                 contactList,
                 user.pubkeyHex,
@@ -633,6 +641,8 @@ class Account(
             Client.send(event)
             LocalCache.consume(event)
         }
+
+        return null
     }
 
     fun unfollowHashtag(tag: String) {

app/src/main/java/com/vitorpamplona/amethyst/service/PackageUtils.kt

@@ -3,7 +3,15 @@ package com.vitorpamplona.amethyst.service
 import android.content.Context
 
 object PackageUtils {
-    fun isPackageInstalled(context: Context, target: String): Boolean {
+    private fun isPackageInstalled(context: Context, target: String): Boolean {
         return context.packageManager.getInstalledApplications(0).find { info -> info.packageName == target } != null
     }
+
+    fun isOrbotInstalled(context: Context): Boolean {
+        return isPackageInstalled(context, "org.torproject.android")
+    }
+
+    fun isAmberInstalled(context: Context): Boolean {
+        return isPackageInstalled(context, "com.greenart7c3.nostrsigner")
+    }
 }

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

@@ -165,6 +165,17 @@ class ContactListEvent(
             )
         }
 
+        fun unfollowUser(earlierVersion: ContactListEvent, pubKeyHex: String, pubKey: HexKey, createdAt: Long = TimeUtils.now()): ContactListEvent {
+            if (!earlierVersion.isTaggedUser(pubKeyHex)) return earlierVersion
+
+            return create(
+                content = earlierVersion.content,
+                tags = earlierVersion.tags.filter { it.size > 1 && it[1] != pubKeyHex },
+                pubKey = pubKey,
+                createdAt = createdAt
+            )
+        }
+
         fun unfollowUser(earlierVersion: ContactListEvent, pubKeyHex: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
             if (!earlierVersion.isTaggedUser(pubKeyHex)) return earlierVersion
 

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt

@@ -768,6 +768,9 @@ private fun DisplayFollowUnfollowButton(
     if (isLoggedInFollowingUser) {
         UnfollowButton {
             if (!accountViewModel.isWriteable()) {
+                if (PackageUtils.isAmberInstalled(context)) {
+                    event = accountViewModel.account.unfollow(baseUser, false)
+                } else {
                     scope.launch {
                         Toast
                             .makeText(
@@ -777,6 +780,7 @@ private fun DisplayFollowUnfollowButton(
                             )
                             .show()
                     }
+                }
             } else {
                 scope.launch(Dispatchers.IO) {
                     accountViewModel.account.unfollow(baseUser)
@@ -787,6 +791,9 @@ private fun DisplayFollowUnfollowButton(
         if (isUserFollowingLoggedIn) {
             FollowButton(R.string.follow_back) {
                 if (!accountViewModel.isWriteable()) {
+                    if (PackageUtils.isAmberInstalled(context)) {
+                        event = accountViewModel.account.follow(baseUser, false)
+                    } else {
                         scope.launch {
                             Toast
                                 .makeText(
@@ -796,6 +803,7 @@ private fun DisplayFollowUnfollowButton(
                                 )
                                 .show()
                         }
+                    }
                 } else {
                     scope.launch(Dispatchers.IO) {
                         accountViewModel.account.follow(baseUser)
@@ -805,7 +813,7 @@ private fun DisplayFollowUnfollowButton(
         } else {
             FollowButton(R.string.follow) {
                 if (!accountViewModel.isWriteable()) {
-                    if (PackageUtils.isPackageInstalled(context, "com.greenart7c3.nostrsigner")) {
+                    if (PackageUtils.isAmberInstalled(context)) {
                         event = accountViewModel.account.follow(baseUser, false)
                     } else {
                         scope.launch {

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt

@@ -229,7 +229,7 @@ fun LoginPage(
                 }
             }
 
-            if (PackageUtils.isPackageInstalled(context, "org.torproject.android")) {
+            if (PackageUtils.isOrbotInstalled(context)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Checkbox(
                         checked = useProxy.value,