Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import android.text.method.LinkMovementMethod
import android.text.util.Linkify
import android.view.LayoutInflater
import android.view.View
import android.view.View.INVISIBLE
Expand Down Expand Up @@ -95,10 +97,13 @@ object EncryptAuthenticateDialog {
val useAzeEncrypt: AppCompatCheckBox = vb.checkboxUseAze
val usageTextInfo: AppCompatTextView =
vb.textViewCryptInfo.apply {
movementMethod = LinkMovementMethod.getInstance()
autoLinkMask = Linkify.WEB_URLS
linksClickable = true
text =
HtmlCompat.fromHtml(
main.getString(R.string.encrypt_option_use_aescrypt_desc),
FROM_HTML_MODE_COMPACT,
HtmlCompat.FROM_HTML_MODE_COMPACT,
)
}
useAzeEncrypt.setOnCheckedChangeListener(
Expand Down Expand Up @@ -242,6 +247,9 @@ object EncryptAuthenticateDialog {
AESCRYPT_EXTENSION
}}",
)
usageTextInfo.movementMethod = LinkMovementMethod.getInstance()
usageTextInfo.autoLinkMask = Linkify.WEB_URLS
usageTextInfo.linksClickable = true
usageTextInfo.text =
HtmlCompat.fromHtml(
main.getString(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ package com.amaze.filemanager.ui.dialogs
import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.text.method.LinkMovementMethod
import android.text.util.Linkify
import android.view.LayoutInflater
import android.view.View
import android.widget.Toast
Expand Down Expand Up @@ -88,10 +90,13 @@ object EncryptWithPresetPasswordSaveAsDialog {
val useAzeEncrypt = vb.checkboxUseAze
val usageTextInfo =
vb.textViewCryptInfo.apply {
movementMethod = LinkMovementMethod.getInstance()
autoLinkMask = Linkify.WEB_URLS
linksClickable = true
text =
HtmlCompat.fromHtml(
main.getString(R.string.encrypt_option_use_aescrypt_desc),
HtmlCompat.FROM_HTML_MODE_LEGACY,
HtmlCompat.FROM_HTML_MODE_COMPACT,
)
}
if (ENCRYPT_PASSWORD_FINGERPRINT != password) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/dialog_encrypt_authenticate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/encrypt_option_use_aescrypt_desc"
android:text=""
android:id="@+id/text_view_crypt_info"
android:layout_gravity="center_vertical"
app:layout_constraintTop_toBottomOf="@id/checkbox_use_aze"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="5sp"
android:text="@string/encrypt_option_use_aescrypt_desc"
android:text=""
android:id="@+id/text_view_crypt_info"
android:layout_gravity="center_vertical"
android:textSize="22sp"
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,8 @@
</li>
<p style=&quot;margin-left: 40px&quot;>
This feature makes files available on the local network, so your PC and mobile devices
have to be on the same local network. You can\’t access a shared Windows folder
over the Internet or when your smartphone is connected to its mobile data it
have to be on the same local network. You can&apos;t access a shared Windows folder
over the Internet or when your smartphone is connected to its mobile data - it
has to be connected to Wi-Fi.
<br/>
<br/>
Expand Down Expand Up @@ -659,10 +659,10 @@
<string name="encrypt_option_use_aze">Use Amaze Encryption Format</string>
<string name="encrypt_option_use_aescrypt_desc"><![CDATA[
<p>AESCrypt is an open source file encryption format based on AES encryption. It is also portable, can be decrypted with AESCrypt programs on other platforms.</p>
<p><a href="https://www.aescrypt.com" target="_blank>AESCrypt website</a></p>]]>
</string>
<p>AESCrypt website: https://www.aescrypt.com</p>
]]></string>
<string name="encrypt_option_use_azecrypt_desc"><![CDATA[
<p>Amaze\'s Encryption Format is also based on AES encryption; but different from AESCrypt format, it can only be decrypted by this device; also you must not uninstall Amaze File Manager from this device nor change the way you lock screen, otherwise you will have no way to recover the encrypted file.</p>
<p>Amaze&apos;s Encryption Format is also based on AES encryption; but different from AESCrypt format, it can only be decrypted by this device; also you must not uninstall Amaze File Manager from this device nor change the way you lock screen, otherwise you will have no way to recover the encrypted file.</p>
]]></string>
<string name="encrypt_file_must_end_with_aze">Encrypted files must use \".aze\" as the file extension.</string>
<string name="encrypt_file_must_end_with_aes">Encrypted files must use \".aes\" as the file extension.</string>
Expand Down
Loading