arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-22 12:32:03 +00:00
Code Issues Releases Wiki Activity

Implement showing fingerprint.

Browse Source
This commit is contained in:
Tom Hacohen 2020-08-27 16:44:55 +03:00
parent b9d3dc691b
commit 290aa159b2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt
View File

@ -29,6 +29,7 @@ import androidx.core.content.ContextCompat
import at.bitfire.ical4android.TaskProvider.Companion.OPENTASK_PROVIDERS import at.bitfire.ical4android.TaskProvider.Companion.OPENTASK_PROVIDERS
import at.bitfire.vcard4android.ContactsStorageException import at.bitfire.vcard4android.ContactsStorageException
import com.etebase.client.CollectionManager import com.etebase.client.CollectionManager
import com.etebase.client.Utils
import com.etebase.client.exceptions.EtebaseException import com.etebase.client.exceptions.EtebaseException
import com.etesync.syncadapter.* import com.etesync.syncadapter.*
import com.etesync.journalmanager.Crypto import com.etesync.journalmanager.Crypto
@ -82,13 +83,18 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
private val formattedFingerprint: String? private val formattedFingerprint: String?
get() { get() {
try { try {
val settings = AccountSettings(this, account) if (settings.isLegacy) {
return Crypto.AsymmetricCryptoManager.getPrettyKeyFingerprint(settings.keyPair!!.publicKey) 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) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
return null return e.localizedMessage
} }
} }
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {