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
---
 .../res/layout/redirect_import_keys_activity.xml   | 73 ++++++++++++++++++++++
 OpenKeychain/src/main/res/values-w820dp/dimens.xml |  6 ++
 OpenKeychain/src/main/res/values/dimens.xml        |  3 +
 OpenKeychain/src/main/res/values/strings.xml       |  2 +
 4 files changed, 84 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml
 create mode 100644 OpenKeychain/src/main/res/values-w820dp/dimens.xml

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml b/OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml
new file mode 100644
index 000000000..2f63d143d
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <include
+        android:id="@+id/toolbar_include"
+        layout="@layout/toolbar_standalone" />
+
+    <!--
+        fitsSystemWindows and layout_marginTop from
+        https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+    -->
+    <LinearLayout
+        android:layout_below="@id/toolbar_include"
+        android:fitsSystemWindows="true"
+        android:layout_marginTop="@dimen/minus_statusbar_height"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include layout="@layout/notify_area" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:id="@+id/import_keys_top_layout"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <FrameLayout
+                android:id="@+id/import_keys_top_container"
+                android:layout_width="match_parent"
+                android:layout_height="64dp"
+                android:orientation="vertical" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider" />
+
+        </LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/import_keys_list_container"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:orientation="vertical"
+            android:layout_weight="1" />
+
+        <RelativeLayout
+            android:id="@+id/import_footer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <View
+                android:id="@+id/import_divider"
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider" />
+
+            <RelativeLayout
+                android:id="@+id/import_snackbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/import_import" />
+
+        </RelativeLayout>
+    </LinearLayout>
+</RelativeLayout>
diff --git a/OpenKeychain/src/main/res/values-w820dp/dimens.xml b/OpenKeychain/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 000000000..63fc81644
--- /dev/null
+++ b/OpenKeychain/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml
index 2aae06e2e..254dc02bb 100644
--- a/OpenKeychain/src/main/res/values/dimens.xml
+++ b/OpenKeychain/src/main/res/values/dimens.xml
@@ -5,4 +5,7 @@
     <dimen name="big_toolbar">120dp</dimen>
     <dimen name="huge_toolbar">222dp</dimen>
     <dimen name="minus_statusbar_height">0dp</dimen>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
 </resources>
\ No newline at end of file
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
---
 .../res/layout/redirect_import_keys_activity.xml   | 73 +---------------------
 OpenKeychain/src/main/res/values/dimens.xml        |  2 -
 OpenKeychain/src/main/res/values/strings.xml       |  7 ++-
 3 files changed, 8 insertions(+), 74 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml b/OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml
index 2f63d143d..af9a8add6 100644
--- a/OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml
@@ -1,73 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <include
-        android:id="@+id/toolbar_include"
-        layout="@layout/toolbar_standalone" />
-
-    <!--
-        fitsSystemWindows and layout_marginTop from
-        https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
-    -->
-    <LinearLayout
-        android:layout_below="@id/toolbar_include"
-        android:fitsSystemWindows="true"
-        android:layout_marginTop="@dimen/minus_statusbar_height"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <include layout="@layout/notify_area" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:id="@+id/import_keys_top_layout"
-            android:visibility="gone"
-            tools:visibility="visible">
-
-            <FrameLayout
-                android:id="@+id/import_keys_top_container"
-                android:layout_width="match_parent"
-                android:layout_height="64dp"
-                android:orientation="vertical" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dip"
-                android:background="?android:attr/listDivider" />
-
-        </LinearLayout>
-
-        <FrameLayout
-            android:id="@+id/import_keys_list_container"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:orientation="vertical"
-            android:layout_weight="1" />
-
-        <RelativeLayout
-            android:id="@+id/import_footer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <View
-                android:id="@+id/import_divider"
-                android:layout_width="match_parent"
-                android:layout_height="1dip"
-                android:background="?android:attr/listDivider" />
-
-            <RelativeLayout
-                android:id="@+id/import_snackbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignBottom="@id/import_import" />
-
-        </RelativeLayout>
-    </LinearLayout>
+    android:layout_height="match_parent">
 </RelativeLayout>
diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml
index 254dc02bb..2630c407f 100644
--- a/OpenKeychain/src/main/res/values/dimens.xml
+++ b/OpenKeychain/src/main/res/values/dimens.xml
@@ -5,7 +5,5 @@
     <dimen name="big_toolbar">120dp</dimen>
     <dimen name="huge_toolbar">222dp</dimen>
     <dimen name="minus_statusbar_height">0dp</dimen>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
 </resources>
\ No newline at end of file
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-w820dp/dimens.xml | 6 ------
 OpenKeychain/src/main/res/values/dimens.xml        | 1 -
 OpenKeychain/src/main/res/values/strings.xml       | 6 +++---
 3 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/values-w820dp/dimens.xml

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values-w820dp/dimens.xml b/OpenKeychain/src/main/res/values-w820dp/dimens.xml
deleted file mode 100644
index 63fc81644..000000000
--- a/OpenKeychain/src/main/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
-         (such as screen margins) for screens with more than 820dp of available width. This
-         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>
diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml
index 2630c407f..2aae06e2e 100644
--- a/OpenKeychain/src/main/res/values/dimens.xml
+++ b/OpenKeychain/src/main/res/values/dimens.xml
@@ -5,5 +5,4 @@
     <dimen name="big_toolbar">120dp</dimen>
     <dimen name="huge_toolbar">222dp</dimen>
     <dimen name="minus_statusbar_height">0dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
 </resources>
\ No newline at end of file
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


From 8933263665c3f6fdb464b88828f47417820f39e8 Mon Sep 17 00:00:00 2001
From: Lubo Viluda <lubo.viluda@gmail.com>
Date: Tue, 12 Apr 2016 16:43:06 +0200
Subject: unnecesary code removed

- setContentView removed
- R.layout.redirect_import_keys_activity.xml removed
---
 OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml b/OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml
deleted file mode 100644
index af9a8add6..000000000
--- a/OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-</RelativeLayout>
-- 
cgit v1.2.3