From 94f3fc5a5f3d7eb6a242c038ea97bc549d89e320 Mon Sep 17 00:00:00 2001 From: andrew Date: Thu, 19 Oct 2023 22:02:37 +1030 Subject: [PATCH] Rename and empty RecoveryPasswordActivity --- app/src/main/AndroidManifest.xml | 2 +- .../onboarding/RecoveryPasswordActivity.kt | 50 ++++++++++ .../securesms/onboarding/SeedActivity.kt | 94 ------------------- .../main/res/layout-sw400dp/activity_seed.xml | 77 --------------- app/src/main/res/layout/activity_seed.xml | 79 ---------------- app/src/main/res/values-ar-rSA/strings.xml | 4 - app/src/main/res/values-ar/strings.xml | 4 - app/src/main/res/values-az-rAZ/strings.xml | 4 - app/src/main/res/values-az/strings.xml | 4 - app/src/main/res/values-bal-rBA/strings.xml | 4 - app/src/main/res/values-bal/strings.xml | 4 - app/src/main/res/values-ca-rES/strings.xml | 4 - app/src/main/res/values-ca/strings.xml | 4 - app/src/main/res/values-cs-rCZ/strings.xml | 4 - app/src/main/res/values-cs/strings.xml | 4 - app/src/main/res/values-da-rDK/strings.xml | 4 - app/src/main/res/values-da/strings.xml | 4 - app/src/main/res/values-de-rDE/strings.xml | 4 - app/src/main/res/values-de/strings.xml | 4 - app/src/main/res/values-el-rGR/strings.xml | 4 - app/src/main/res/values-el/strings.xml | 4 - app/src/main/res/values-eo-rUY/strings.xml | 4 - app/src/main/res/values-eo/strings.xml | 4 - app/src/main/res/values-es-rES/strings.xml | 4 - app/src/main/res/values-es/strings.xml | 4 - app/src/main/res/values-fa-rIR/strings.xml | 4 - app/src/main/res/values-fa/strings.xml | 4 - app/src/main/res/values-fi-rFI/strings.xml | 4 - app/src/main/res/values-fi/strings.xml | 4 - app/src/main/res/values-fr-rFR/strings.xml | 4 - app/src/main/res/values-fr/strings.xml | 4 - app/src/main/res/values-hi-rIN/strings.xml | 4 - app/src/main/res/values-hi/strings.xml | 4 - app/src/main/res/values-hu-rHU/strings.xml | 4 - app/src/main/res/values-hu/strings.xml | 4 - app/src/main/res/values-hy-rAM/strings.xml | 4 - app/src/main/res/values-hy/strings.xml | 4 - app/src/main/res/values-in-rID/strings.xml | 3 - app/src/main/res/values-in/strings.xml | 3 - app/src/main/res/values-it-rIT/strings.xml | 4 - app/src/main/res/values-it/strings.xml | 4 - app/src/main/res/values-ja-rJP/strings.xml | 4 - app/src/main/res/values-ja/strings.xml | 4 - app/src/main/res/values-ko-rKR/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lt-rLT/strings.xml | 3 - app/src/main/res/values-lt/strings.xml | 3 - app/src/main/res/values-nb-rNO/strings.xml | 4 - app/src/main/res/values-nb/strings.xml | 4 - app/src/main/res/values-nl-rNL/strings.xml | 4 - app/src/main/res/values-nl/strings.xml | 4 - app/src/main/res/values-pl-rPL/strings.xml | 4 - app/src/main/res/values-pl/strings.xml | 4 - app/src/main/res/values-pt-rBR/strings.xml | 4 - app/src/main/res/values-pt-rPT/strings.xml | 4 - app/src/main/res/values-pt/strings.xml | 4 - app/src/main/res/values-ru-rRU/strings.xml | 4 - app/src/main/res/values-ru/strings.xml | 4 - app/src/main/res/values-sk-rSK/strings.xml | 4 - app/src/main/res/values-sk/strings.xml | 4 - app/src/main/res/values-sr-rSP/strings.xml | 3 - app/src/main/res/values-sr/strings.xml | 3 - app/src/main/res/values-sv-rSE/strings.xml | 4 - app/src/main/res/values-sv/strings.xml | 4 - app/src/main/res/values-tr-rTR/strings.xml | 4 - app/src/main/res/values-tr/strings.xml | 4 - app/src/main/res/values-uk-rUA/strings.xml | 4 - app/src/main/res/values-uk/strings.xml | 4 - app/src/main/res/values-vi-rVN/strings.xml | 4 - app/src/main/res/values-vi/strings.xml | 4 - app/src/main/res/values-zh-rCN/strings.xml | 4 - app/src/main/res/values-zh-rTW/strings.xml | 4 - app/src/main/res/values-zh/strings.xml | 4 - app/src/main/res/values/strings.xml | 5 +- 74 files changed, 52 insertions(+), 515 deletions(-) create mode 100644 app/src/main/java/org/thoughtcrime/securesms/onboarding/RecoveryPasswordActivity.kt delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/onboarding/SeedActivity.kt delete mode 100644 app/src/main/res/layout-sw400dp/activity_seed.xml delete mode 100644 app/src/main/res/layout/activity_seed.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 56a4f2975b..ad84947575 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -157,7 +157,7 @@ android:label="@string/activity_edit_closed_group_title" android:screenOrientation="portrait" /> String = { fileName -> + MnemonicUtilities.loadFileContents(this, fileName) + } + MnemonicCodec(loadFileContents).encode(hexEncodedSeed!!, MnemonicCodec.Language.Configuration.english) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + supportActionBar!!.title = resources.getString(R.string.activity_recovery_password) + } + + private fun revealSeed() { + TextSecurePreferences.setHasViewedSeed(this, true) + } + + private fun copySeed() { + revealSeed() + val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + val clip = ClipData.newPlainText("Seed", seed) + clipboard.setPrimaryClip(clip) + Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show() + } +} + +fun Context.startSeedActivity() { + Intent(this, RecoveryPasswordActivity::class.java).also(::startActivity) +} diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/SeedActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/SeedActivity.kt deleted file mode 100644 index 92a05952de..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/SeedActivity.kt +++ /dev/null @@ -1,94 +0,0 @@ -package org.thoughtcrime.securesms.onboarding - -import android.content.ClipData -import android.content.ClipboardManager -import android.content.Context -import android.content.Intent -import android.os.Bundle -import android.text.Spannable -import android.text.SpannableString -import android.text.style.ForegroundColorSpan -import android.widget.LinearLayout -import android.widget.Toast -import network.loki.messenger.R -import network.loki.messenger.databinding.ActivitySeedBinding -import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsession.utilities.getColorFromAttr -import org.session.libsignal.crypto.MnemonicCodec -import org.session.libsignal.utilities.hexEncodedPrivateKey -import org.thoughtcrime.securesms.BaseActionBarActivity -import org.thoughtcrime.securesms.crypto.IdentityKeyUtil -import org.thoughtcrime.securesms.crypto.MnemonicUtilities -import org.thoughtcrime.securesms.util.getAccentColor -import org.thoughtcrime.securesms.util.show - -class SeedActivity : BaseActionBarActivity() { - - private lateinit var binding: ActivitySeedBinding - - private val seed by lazy { - var hexEncodedSeed = IdentityKeyUtil.retrieve(this, IdentityKeyUtil.LOKI_SEED) - if (hexEncodedSeed == null) { - hexEncodedSeed = IdentityKeyUtil.getIdentityKeyPair(this).hexEncodedPrivateKey // Legacy account - } - val loadFileContents: (String) -> String = { fileName -> - MnemonicUtilities.loadFileContents(this, fileName) - } - MnemonicCodec(loadFileContents).encode(hexEncodedSeed!!, MnemonicCodec.Language.Configuration.english) - } - - // region Lifecycle - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - binding = ActivitySeedBinding.inflate(layoutInflater) - setContentView(binding.root) - supportActionBar!!.title = resources.getString(R.string.activity_seed_title) - val seedReminderViewTitle = SpannableString("You're almost finished! 90%") // Intentionally not yet translated - seedReminderViewTitle.setSpan(ForegroundColorSpan(getAccentColor()), 24, 27, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) - with(binding) { - var redactedSeed = seed - var index = 0 - for (character in seed) { - if (character.isLetter()) { - redactedSeed = redactedSeed.replaceRange(index, index + 1, "▆") - } - index += 1 - } - seedTextView.setTextColor(getAccentColor()) - seedTextView.text = redactedSeed - seedTextView.setOnLongClickListener { revealSeed(); true } - revealButton.setOnLongClickListener { revealSeed(); true } - copyButton.setOnClickListener { copySeed() } - } - } - // endregion - - // region Updating - private fun revealSeed() { - val seedReminderViewTitle = SpannableString("Account secured! 100%") // Intentionally not yet translated - seedReminderViewTitle.setSpan(ForegroundColorSpan(getAccentColor()), 17, 21, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) - with(binding) { - val seedTextViewLayoutParams = seedTextView.layoutParams as LinearLayout.LayoutParams - seedTextViewLayoutParams.height = seedTextView.height - seedTextView.layoutParams = seedTextViewLayoutParams - seedTextView.setTextColor(getColorFromAttr(android.R.attr.textColorPrimary)) - seedTextView.text = seed - } - TextSecurePreferences.setHasViewedSeed(this, true) - } - // endregion - - // region Interaction - private fun copySeed() { - revealSeed() - val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager - val clip = ClipData.newPlainText("Seed", seed) - clipboard.setPrimaryClip(clip) - Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show() - } - // endregion -} - -fun Context.startSeedActivity() { - Intent(this, SeedActivity::class.java).also(::startActivity) -} diff --git a/app/src/main/res/layout-sw400dp/activity_seed.xml b/app/src/main/res/layout-sw400dp/activity_seed.xml deleted file mode 100644 index 886d317b29..0000000000 --- a/app/src/main/res/layout-sw400dp/activity_seed.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - -