Commit c51621b1 authored by Francisco Cunha's avatar Francisco Cunha Committed by Hussein

P4A-1012 - Fix wrong string resource id, resources cleanup

parent ea3f74f0
This diff is collapsed.
......@@ -48,6 +48,6 @@ Please submit bug reports, contribute new features and ask questions at
<string name="account_delete_dlg_instructions_fmt">The account \"<xliff:g id="account">%s</xliff:g>\" will be removed from p≡p.</string>
<string name="account_recreate_dlg_instructions_fmt">All local data for \\\"<xliff:g id="account">%s</xliff:g>\\\" will be removed. Account settings will be retained.</string>
<string name="pep_app_license">Licensed under pEp security GPLv3</string>
<string name="pep_app_license">Licensed under pp security GPLv3</string>
</resources>
......@@ -28,7 +28,7 @@ class LicenseActivity : PepActivity() {
toolbarCustomizer.setToolbarColor(ContextCompat.getColor(this, R.color.colorPrimary))
initializeToolbar(true, getString(R.string.license))
findViewById<TextView>(R.id.licenseText).text = HtmlCompat.fromHtml(getString(R.string.gpl_license), HtmlCompat.FROM_HTML_MODE_LEGACY)
findViewById<TextView>(R.id.licenseText).text = HtmlCompat.fromHtml(getString(R.string.eula_license), HtmlCompat.FROM_HTML_MODE_LEGACY)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
findViewById<TextView>(R.id.licenseText).justificationMode = JUSTIFICATION_MODE_INTER_WORD
}
......
......@@ -48,6 +48,6 @@ Please submit bug reports, contribute new features and ask questions at
<string name="account_delete_dlg_instructions_fmt">The account \"<xliff:g id="account">%s</xliff:g>\" will be removed from p≡p.</string>
<string name="account_recreate_dlg_instructions_fmt">All local data for \\\"<xliff:g id="account">%s</xliff:g>\\\" will be removed. Account settings will be retained.</string>
<string name="pep_app_license">Licenced under pEp security EULA</string>
<string name="pep_app_license">Licenced under pp security EULA</string>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment