From 7efeebc6381784a9362e5514fb50084c662dd335 Mon Sep 17 00:00:00 2001
From: Lubo Viluda <lubo.viluda@gmail.com>
Date: Sun, 20 Mar 2016 11:52:36 +0100
Subject: #1661 - Don't expose CertifyActivity

*Add new activity - RedirectImportKeysActivity, which prompts user to
use Openkeychain directly
*Add intent filter for the activity
*Change intent filter for CertifyActivity
---
 OpenKeychain/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 70db4029b..acc0c7f20 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1740,4 +1740,6 @@
         <item>50 EUR</item>
         <item>100 EUR</item>
     </string-array>
+    <string name="title_activity_redirect_key">RedirectKeyActivity</string>
+    <string name="action_settings">Settings</string>
 </resources>
-- 
cgit v1.2.3


From 298f89d36e5239f272709b6ec86e4b4b5d29b2a6 Mon Sep 17 00:00:00 2001
From: Lubo Viluda <lubo.viluda@gmail.com>
Date: Thu, 24 Mar 2016 00:54:28 +0100
Subject: upgrade of Redirect import activity

-> RedirectImportActivity is transparent now
-> some poinlessly data removed
-> String moved into sources
-> xml for activity simplified
---
 OpenKeychain/src/main/res/values/strings.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index acc0c7f20..95e089275 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1740,6 +1740,9 @@
         <item>50 EUR</item>
         <item>100 EUR</item>
     </string-array>
-    <string name="title_activity_redirect_key">RedirectKeyActivity</string>
-    <string name="action_settings">Settings</string>
+    <string name="redirect_import_key_title">"Import key attempt"</string>
+    <string name="redirect_import_key_message">"You scanned a fingerprint with another app, please scan with Openkeychain directly to be safe"</string>
+    <string name="redirect_import_key_yes">Scan again</string>
+    <string name="redirect_import_key_no">Close</string>
+    <string name="title_activity_redirect_key">Key import redirection</string>
 </resources>
-- 
cgit v1.2.3


From a7a0d9dd4b545ea65444efad5ca96cb7bca919ef Mon Sep 17 00:00:00 2001
From: Lubo Viluda <lubo.viluda@gmail.com>
Date: Tue, 12 Apr 2016 15:41:42 +0200
Subject: Unnecesary code removed and string repaired

- Unnecesary import from RedirectImportKeyActivity.java removed
- ..\value-w820dp\dimens.xml was unnecesary
- \..value\dimens.xml unnecasary line
- string sources repaired
---
 OpenKeychain/src/main/res/values/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 95e089275..725cd7b41 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1742,7 +1742,7 @@
     </string-array>
     <string name="redirect_import_key_title">"Import key attempt"</string>
     <string name="redirect_import_key_message">"You scanned a fingerprint with another app, please scan with Openkeychain directly to be safe"</string>
-    <string name="redirect_import_key_yes">Scan again</string>
-    <string name="redirect_import_key_no">Close</string>
-    <string name="title_activity_redirect_key">Key import redirection</string>
+    <string name="redirect_import_key_yes">"Scan again"</string>
+    <string name="redirect_import_key_no">"Close"</string>
+    <string name="title_activity_redirect_key">"Key import redirection"</string>
 </resources>
-- 
cgit v1.2.3