upgrade of Redirect import activity

-> RedirectImportActivity is transparent now
-> some poinlessly data removed
-> String moved into sources
-> xml for activity simplified

OpenKeychain/src/main/AndroidManifest.xml

@@ -718,7 +718,8 @@
         <activity
             android:name=".ui.RedirectImportKeysActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:label="@string/title_activity_redirect_key">  >
+            android:label="@string/title_activity_redirect_key"
+            android:theme="@android:style/Theme.Translucent">
 
             <!-- VIEW with fingerprint scheme:
                       Handle URIs with fingerprints when scanning directly from Barcode Scanner -->

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/RedirectImportKeysActivity.java

@@ -1,27 +1,26 @@
 /*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * You should have received a copy of the GNU General Public License
- * you may not use this file except in compliance with the License.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
 package org.sufficientlysecure.keychain.ui;
 
-import android.app.Activity;
-
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
+import android.view.Window;
+
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.base.BaseActivity;
 
@@ -29,21 +28,32 @@ public class RedirectImportKeysActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.redirect_import_keys_activity);
 
-        setFullScreenDialogClose(Activity.RESULT_CANCELED, true);
+        startScanActivity();
+    }
+
+    @Override
+    protected void initLayout() {
+
+    }
+
+    private void startScanActivity() {
         final Intent intent = new Intent(this, org.sufficientlysecure.keychain.ui.ImportKeysActivity.class);
 
         new AlertDialog.Builder(this)
-                .setTitle("Import key attempt")
+                .setTitle(R.string.redirect_import_key_title)
-                .setMessage("You scanned a fingerprint with another app, please scan with Openkeychain directly to be safe" )
+                .setMessage(R.string.redirect_import_key_message)
-                .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.redirect_import_key_yes, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
                         // intent directly to ImportKeyChain activity
                         startActivity(intent);
+                        finish();
                     }
                 })
-                .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
+                .setNegativeButton(R.string.redirect_import_key_no, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
                         // close window
                         finish();
@@ -52,9 +62,4 @@ public class RedirectImportKeysActivity extends BaseActivity {
                 .setIcon(android.R.drawable.ic_dialog_alert)
                 .show();
     }
-
-    @Override
-    protected void initLayout() {
-        setContentView(R.layout.redirect_import_keys_activity);
-    }
 }

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"
+    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>

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>

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="redirect_import_key_title">"Import key attempt"</string>
-    <string name="action_settings">Settings</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>