From 290aa159b229de8205c1a293a8307020af7dc30d Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Thu, 27 Aug 2020 16:44:55 +0300
Subject: [PATCH] Implement showing fingerprint.

---
 .../com/etesync/syncadapter/ui/AccountActivity.kt  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt
index 50f365a7..6d3445b1 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt
@@ -29,6 +29,7 @@ import androidx.core.content.ContextCompat
 import at.bitfire.ical4android.TaskProvider.Companion.OPENTASK_PROVIDERS
 import at.bitfire.vcard4android.ContactsStorageException
 import com.etebase.client.CollectionManager
+import com.etebase.client.Utils
 import com.etebase.client.exceptions.EtebaseException
 import com.etesync.syncadapter.*
 import com.etesync.journalmanager.Crypto
@@ -82,13 +83,18 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
     private val formattedFingerprint: String?
         get() {
             try {
-                val settings = AccountSettings(this, account)
-                return Crypto.AsymmetricCryptoManager.getPrettyKeyFingerprint(settings.keyPair!!.publicKey)
+                if (settings.isLegacy) {
+                    val settings = AccountSettings(this, account)
+                    return Crypto.AsymmetricCryptoManager.getPrettyKeyFingerprint(settings.keyPair!!.publicKey)
+                } else {
+                    val etebase = EtebaseLocalCache.getEtebase(this, HttpClient.sharedClient, settings)
+                    val invitationManager = etebase.invitationManager
+                    return Utils.prettyFingerprint(invitationManager.pubkey)
+                }
             } catch (e: Exception) {
                 e.printStackTrace()
-                return null
+                return e.localizedMessage
             }
-
         }
 
     override fun onCreate(savedInstanceState: Bundle?) {