diff options
4 files changed, 122 insertions, 112 deletions
diff --git a/app/src/main/res/layout/configure_tools_dialog_encrypt_decrypt_keys.xml b/app/src/main/res/layout/configure_tools_dialog_encrypt_decrypt_keys.xml index 1e8e64a..d21c4e6 100644 --- a/app/src/main/res/layout/configure_tools_dialog_encrypt_decrypt_keys.xml +++ b/app/src/main/res/layout/configure_tools_dialog_encrypt_decrypt_keys.xml | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | <!-- | 3 | <!-- |
4 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | 4 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon |
5 | * Copyright (C) 2017-2018 Pacien TRAN-GIRARD | 5 | * Copyright (C) 2017-2020 Pacien TRAN-GIRARD |
6 | * | 6 | * |
7 | * This program is free software: you can redistribute it and/or modify | 7 | * This program is free software: you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by | 8 | * it under the terms of the GNU General Public License as published by |
@@ -19,33 +19,36 @@ | |||
19 | --> | 19 | --> |
20 | 20 | ||
21 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 21 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
22 | android:layout_width="match_parent" | 22 | android:layout_width="match_parent" |
23 | android:layout_height="wrap_content" | 23 | android:layout_height="wrap_content" |
24 | android:orientation="vertical" | 24 | android:orientation="vertical" |
25 | android:paddingBottom="@dimen/dialog_vertical_margin" | 25 | android:paddingLeft="@dimen/dialog_horizontal_margin" |
26 | android:paddingLeft="@dimen/dialog_horizontal_margin" | 26 | android:paddingTop="@dimen/dialog_vertical_margin" |
27 | android:paddingRight="@dimen/dialog_horizontal_margin" | 27 | android:paddingRight="@dimen/dialog_horizontal_margin" |
28 | android:paddingTop="@dimen/dialog_vertical_margin"> | 28 | android:paddingBottom="@dimen/dialog_vertical_margin"> |
29 | 29 | ||
30 | <EditText | 30 | <EditText |
31 | android:id="@+id/enc_dec_net_name" | 31 | android:id="@+id/enc_dec_net_name" |
32 | android:layout_width="match_parent" | 32 | android:layout_width="match_parent" |
33 | android:layout_height="wrap_content" | 33 | android:layout_height="wrap_content" |
34 | android:hint="@string/configure_tools_generate_config_net_name_hint" | 34 | android:hint="@string/configure_tools_generate_config_net_name_hint" |
35 | android:inputType="text"/> | 35 | android:importantForAutofill="no" |
36 | android:inputType="text" /> | ||
36 | 37 | ||
37 | <EditText | 38 | <EditText |
38 | android:id="@+id/enc_dec_current_passphrase" | 39 | android:id="@+id/enc_dec_current_passphrase" |
39 | android:layout_width="match_parent" | 40 | android:layout_width="match_parent" |
40 | android:layout_height="match_parent" | 41 | android:layout_height="match_parent" |
41 | android:hint="@string/configure_tools_private_key_encryption_current_passphrase" | 42 | android:hint="@string/configure_tools_private_key_encryption_current_passphrase" |
42 | android:inputType="textVisiblePassword"/> | 43 | android:importantForAutofill="no" |
44 | android:inputType="textVisiblePassword" /> | ||
43 | 45 | ||
44 | <EditText | 46 | <EditText |
45 | android:id="@+id/enc_dec_new_passphrase" | 47 | android:id="@+id/enc_dec_new_passphrase" |
46 | android:layout_width="match_parent" | 48 | android:layout_width="match_parent" |
47 | android:layout_height="match_parent" | 49 | android:layout_height="match_parent" |
48 | android:hint="@string/configure_tools_private_key_encryption_new_passphrase" | 50 | android:hint="@string/configure_tools_private_key_encryption_new_passphrase" |
49 | android:inputType="textVisiblePassword"/> | 51 | android:importantForAutofill="no" |
52 | android:inputType="textVisiblePassword" /> | ||
50 | 53 | ||
51 | </LinearLayout> | 54 | </LinearLayout> |
diff --git a/app/src/main/res/layout/configure_tools_dialog_network_generate.xml b/app/src/main/res/layout/configure_tools_dialog_network_generate.xml index 614cc16..a1c054a 100644 --- a/app/src/main/res/layout/configure_tools_dialog_network_generate.xml +++ b/app/src/main/res/layout/configure_tools_dialog_network_generate.xml | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | <!-- | 3 | <!-- |
4 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | 4 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon |
5 | * Copyright (C) 2017-2018 Pacien TRAN-GIRARD | 5 | * Copyright (C) 2017-2020 Pacien TRAN-GIRARD |
6 | * | 6 | * |
7 | * This program is free software: you can redistribute it and/or modify | 7 | * This program is free software: you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by | 8 | * it under the terms of the GNU General Public License as published by |
@@ -19,33 +19,36 @@ | |||
19 | --> | 19 | --> |
20 | 20 | ||
21 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 21 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
22 | android:layout_width="match_parent" | 22 | android:layout_width="match_parent" |
23 | android:layout_height="wrap_content" | 23 | android:layout_height="wrap_content" |
24 | android:orientation="vertical" | 24 | android:orientation="vertical" |
25 | android:paddingBottom="@dimen/dialog_vertical_margin" | 25 | android:paddingLeft="@dimen/dialog_horizontal_margin" |
26 | android:paddingLeft="@dimen/dialog_horizontal_margin" | 26 | android:paddingTop="@dimen/dialog_vertical_margin" |
27 | android:paddingRight="@dimen/dialog_horizontal_margin" | 27 | android:paddingRight="@dimen/dialog_horizontal_margin" |
28 | android:paddingTop="@dimen/dialog_vertical_margin"> | 28 | android:paddingBottom="@dimen/dialog_vertical_margin"> |
29 | 29 | ||
30 | <EditText | 30 | <EditText |
31 | android:id="@+id/new_net_name" | 31 | android:id="@+id/new_net_name" |
32 | android:layout_width="match_parent" | 32 | android:layout_width="match_parent" |
33 | android:layout_height="match_parent" | 33 | android:layout_height="match_parent" |
34 | android:hint="@string/configure_tools_generate_config_net_name_hint" | 34 | android:hint="@string/configure_tools_generate_config_net_name_hint" |
35 | android:inputType="text"/> | 35 | android:importantForAutofill="no" |
36 | android:inputType="text" /> | ||
36 | 37 | ||
37 | <EditText | 38 | <EditText |
38 | android:id="@+id/new_node_name" | 39 | android:id="@+id/new_node_name" |
39 | android:layout_width="match_parent" | 40 | android:layout_width="match_parent" |
40 | android:layout_height="match_parent" | 41 | android:layout_height="match_parent" |
41 | android:hint="@string/configure_tools_generate_config_node_name_hint" | 42 | android:hint="@string/configure_tools_generate_config_node_name_hint" |
42 | android:inputType="text"/> | 43 | android:importantForAutofill="no" |
44 | android:inputType="text" /> | ||
43 | 45 | ||
44 | <EditText | 46 | <EditText |
45 | android:id="@+id/new_passphrase" | 47 | android:id="@+id/new_passphrase" |
46 | android:layout_width="match_parent" | 48 | android:layout_width="match_parent" |
47 | android:layout_height="match_parent" | 49 | android:layout_height="match_parent" |
48 | android:hint="@string/configure_tools_generate_config_optional_passphrase_hint" | 50 | android:hint="@string/configure_tools_generate_config_optional_passphrase_hint" |
49 | android:inputType="textVisiblePassword"/> | 51 | android:importantForAutofill="no" |
52 | android:inputType="textVisiblePassword" /> | ||
50 | 53 | ||
51 | </LinearLayout> | 54 | </LinearLayout> |
diff --git a/app/src/main/res/layout/configure_tools_dialog_network_join.xml b/app/src/main/res/layout/configure_tools_dialog_network_join.xml index 9171284..f3672b3 100644 --- a/app/src/main/res/layout/configure_tools_dialog_network_join.xml +++ b/app/src/main/res/layout/configure_tools_dialog_network_join.xml | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | <!-- | 3 | <!-- |
4 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | 4 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon |
5 | * Copyright (C) 2017-2018 Pacien TRAN-GIRARD | 5 | * Copyright (C) 2017-2020 Pacien TRAN-GIRARD |
6 | * | 6 | * |
7 | * This program is free software: you can redistribute it and/or modify | 7 | * This program is free software: you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by | 8 | * it under the terms of the GNU General Public License as published by |
@@ -20,59 +20,62 @@ | |||
20 | 20 | ||
21 | <layout xmlns:android="http://schemas.android.com/apk/res/android"> | 21 | <layout xmlns:android="http://schemas.android.com/apk/res/android"> |
22 | 22 | ||
23 | <data> | 23 | <data> |
24 | 24 | ||
25 | <variable | 25 | <variable |
26 | name="scanAction" | 26 | name="scanAction" |
27 | type="kotlin.jvm.functions.Function0<kotlin.Unit>"/> | 27 | type="kotlin.jvm.functions.Function0<kotlin.Unit>" /> |
28 | 28 | ||
29 | </data> | 29 | </data> |
30 | 30 | ||
31 | <LinearLayout | 31 | <LinearLayout |
32 | android:layout_width="match_parent" | 32 | android:layout_width="match_parent" |
33 | android:layout_height="wrap_content" | 33 | android:layout_height="wrap_content" |
34 | android:orientation="vertical" | 34 | android:orientation="vertical" |
35 | android:paddingBottom="@dimen/dialog_vertical_margin" | 35 | android:paddingLeft="@dimen/dialog_horizontal_margin" |
36 | android:paddingLeft="@dimen/dialog_horizontal_margin" | 36 | android:paddingTop="@dimen/dialog_vertical_margin" |
37 | android:paddingRight="@dimen/dialog_horizontal_margin" | 37 | android:paddingRight="@dimen/dialog_horizontal_margin" |
38 | android:paddingTop="@dimen/dialog_vertical_margin"> | 38 | android:paddingBottom="@dimen/dialog_vertical_margin"> |
39 | 39 | ||
40 | <EditText | 40 | <EditText |
41 | android:id="@+id/net_name" | 41 | android:id="@+id/net_name" |
42 |