From 9c20ce90df0fe2f5f9dd6b20d319decd15515d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Fri, 6 Dec 2024 14:14:35 -0500 Subject: [PATCH] save archive with extension .jac GitLab: https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1256 Change-Id: I0e3e5e358b439e9df7fe0483bec60fe86577fcc8 --- .../cx/ring/account/JamiAccountSummaryFragment.kt | 12 +++--------- .../net/jami/account/JamiAccountSummaryPresenter.kt | 4 ++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/jami-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.kt b/jami-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.kt index 11481b8b8..24101027b 100644 --- a/jami-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.kt +++ b/jami-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.kt @@ -80,7 +80,6 @@ import net.jami.model.Account import net.jami.model.Contact import net.jami.model.Profile import net.jami.services.AccountService -import net.jami.utils.VCardUtils import java.io.File import javax.inject.Inject @@ -225,14 +224,10 @@ class JamiAccountSummaryFragment : } //=============== AppBar management end =================== - fun setAccount(accountId: String) { - presenter.setAccountId(accountId) - } - override fun accountChanged(account: Account, profile: Profile) { mAccount = account - mBestName = account.registeredName.ifEmpty { account.displayUsername ?: account.username!! } - mBestName = "$mBestName.gz" + val bestName = account.registeredName.ifEmpty { account.displayUsername ?: account.username!! } + mBestName = "$bestName.jac" mBinding?.let { binding -> binding.userPhoto.setImageDrawable(AvatarDrawable.build(binding.root.context, account, profile, true)) binding.username.setText(profile.displayName) @@ -255,7 +250,7 @@ class JamiAccountSummaryFragment : QRCodeFragment.newInstance( QRCodeFragment.MODE_SCAN or QRCodeFragment.MODE_SHARE, QRCodeFragment.MODE_SHARE, - net.jami.model.Uri.fromString(account.uri!!) + Uri.fromString(account.uri!!) ).show(parentFragmentManager, QRCodeFragment.TAG) } binding.username.setOnEditorActionListener { _, actionId, _ -> @@ -808,7 +803,6 @@ class JamiAccountSummaryFragment : val TAG = JamiAccountSummaryFragment::class.simpleName!! private val FRAGMENT_DIALOG_RENAME = "$TAG.dialog.deviceRename" private val FRAGMENT_DIALOG_PASSWORD = "$TAG.dialog.changePassword" - private val FRAGMENT_DIALOG_BACKUP = "$TAG.dialog.backup" private fun slideAnimator(start: Int, end: Int, summary: View) = ValueAnimator.ofInt(start, end).apply { addUpdateListener { valueAnimator: ValueAnimator -> diff --git a/jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryPresenter.kt index 9596c97f0..c3143cf6a 100644 --- a/jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryPresenter.kt +++ b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryPresenter.kt @@ -89,11 +89,11 @@ class JamiAccountSummaryPresenter @Inject constructor( val deviceName: String? get() = mAccountService.getAccount(mAccountID)?.deviceName - fun downloadAccountsArchive(dest: File, scheme: String, password: String?) { + fun downloadAccountsArchive(dest: File, scheme: String, password: String) { val accountId = mAccountID ?: return view?.showExportingProgressDialog() mCompositeDisposable.add( - mAccountService.exportToFile(accountId, dest.absolutePath, scheme, password!!) + mAccountService.exportToFile(accountId, dest.absolutePath, scheme, password) .observeOn(mUiScheduler) .subscribe({ view?.displayCompleteArchive(dest) }) { view?.passwordChangeEnded(accountId, false) }) -- GitLab