rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Refactoring key driver app id

Browse Source
This commit is contained in:
J-Jamet
2022-08-07 23:27:59 +02:00
parent f3fe92e4de
commit 7e45a20ee7
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ProFeatureDialogFragment.kt
View File

@@ -45,13 +45,16 @@ class ProFeatureDialogFragment : DialogFragment() {
stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_ad_free), FROM_HTML_MODE_LEGACY)).append("\n\n")
stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_buy_pro), FROM_HTML_MODE_LEGACY))
builder.setPositiveButton(R.string.download) { _, _ ->
UriUtil.gotoUrl(requireContext(), R.string.app_pro_url)
UriUtil.gotoUrl(activity,
activity.getString(R.string.play_store_url,
activity.getString(R.string.keepro_app_id))
)
}
} else {
stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_feature_generosity), FROM_HTML_MODE_LEGACY)).append("\n\n")
stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_donation), FROM_HTML_MODE_LEGACY))
builder.setPositiveButton(R.string.contribute) { _, _ ->
UriUtil.gotoUrl(requireContext(), R.string.contribution_url)
UriUtil.gotoUrl(activity, R.string.contribution_url)
}
}
builder.setMessage(stringBuilder)

6
app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyResponseHelper.kt
View File

@@ -90,9 +90,7 @@ class HardwareKeyResponseHelper {
companion object {
private val TAG = HardwareKeyResponseHelper::class.java.simpleName
private const val YUBIKEY_CHALLENGE_RESPONSE_INTENT =
"net.pp3345.ykdroid.intent.action.CHALLENGE_RESPONSE"
// TODO Change to a generic "android.yubikey.intent.action.CHALLENGE_RESPONSE"
private const val YUBIKEY_CHALLENGE_RESPONSE_INTENT = "android.yubikey.intent.action.CHALLENGE_RESPONSE"
private const val HARDWARE_KEY_CHALLENGE_KEY = "challenge"
private const val HARDWARE_KEY_RESPONSE_KEY = "response"
private const val EXTRA_BUNDLE_KEY = "EXTRA_BUNDLE_KEY"
@@ -133,7 +131,7 @@ class HardwareKeyResponseHelper {
activity.getString(R.string.error_driver_required, hardwareKey.toString())
)
.setPositiveButton(R.string.download) { _, _ ->
UriUtil.openExternalApp(activity, UriUtil.KEEPASSDX_PRO_PACKAGE)
UriUtil.openExternalApp(activity, activity.getString(R.string.key_driver_app_id))
}
.setNegativeButton(android.R.string.cancel) { _, _ -> }
builder.create().show()

10
app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.kt
View File

@@ -269,7 +269,11 @@ object UriUtil {
fun contributingUser(context: Context): Boolean {
return (Education.isEducationScreenReclickedPerformed(context)
|| isExternalAppInstalled(context, KEEPASSDX_PRO_PACKAGE, false)
|| isExternalAppInstalled(
context,
context.getString(R.string.keepro_app_id),
false
)
)
}
@@ -298,7 +302,7 @@ object UriUtil {
context.startActivity(
Intent(Intent.ACTION_VIEW)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.setData(Uri.parse("https://play.google.com/store/apps/details?id=$packageName"))
.setData(Uri.parse(context.getString(R.string.play_store_url, packageName)))
)
} else {
context.startActivity(launchIntent)
@@ -317,6 +321,4 @@ object UriUtil {
}
private const val TAG = "UriUtil"
const val KEEPASSDX_PRO_PACKAGE = "com.kunzisoft.keepass.pro"
}

4
app/src/main/res/values/donottranslate.xml
View File

@@ -30,7 +30,9 @@
<string name="app_name_part2" translatable="false">DX</string>
<string name="app_name_part3" translatable="false">Pro</string>
<string name="app_pro_url" translatable="false">https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro</string>
<string name="play_store_url" translatable="false">https://play.google.com/store/apps/details?id=%1$s</string>
<string name="keepro_app_id" translatable="false">com.kunzisoft.keepass.pro</string>
<string name="key_driver_app_id" translatable="false">com.kunzisoft.hardware.key</string>
<string name="contribution_url" translatable="false">https://www.keepassdx.com/#donation</string>
<string name="homepage_url" translatable="false">https://www.keepassdx.com</string>
<string name="external_icon_url" translatable="false">https://www.keepassdx.com/#icons</string>