cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ImportKeys: Add ability to "Show key" instead of "Import" for already imported keys

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-08-24 11:42:06 +02:00
parent 48266fd8e0
commit 702888bbe4
6 changed files with 71 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenKeychain/src/main/res/layout/import_keys_list_item.xml
View File

@@ -7,7 +7,6 @@
<variable name="nonInteractive" type="boolean" />
<variable name="entry" type="ImportKeysListEntry" />
<variable name="expanded" type="boolean" />
</data>
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"

10
OpenKeychain/src/main/res/layout/import_keys_list_item_extra.xml
View File

@@ -2,6 +2,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View" alias="V" />
<import type="org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry" />
<variable name="entry" type="ImportKeysListEntry" />
@@ -98,7 +99,14 @@
<Button
android:id="@+id/import_key"
style="@style/CardViewActionButton"
android:text="@string/btn_import" />
android:text="@string/btn_import"
android:visibility="@{entry.updated ? V.GONE : V.VISIBLE}" />
<Button
android:id="@+id/show_key"
style="@style/CardViewActionButton"
android:text="@string/btn_show_key"
android:visibility="@{entry.updated ? V.VISIBLE : V.GONE}" />
</LinearLayout>

8
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -532,6 +532,11 @@
<string name="import_qr_code_too_short_fingerprint">"Fingerprint is too short!"</string>
<string name="import_qr_code_button">"Scan QR Code"</string>
<string name="import_qr_code_text">"Place your camera over the QR Code!"</string>
<string name="btn_import">"Import"</string>
<string name="btn_import_keys">"Import all keys"</string>
<string name="btn_view_list">"View list"</string>
<string name="btn_refresh">"Refresh"</string>
<string name="btn_show_key">"Show key"</string>
<!-- Import from URL -->
<string name="import_url_warn_no_search_parameter">"No search query defined. You can still manually search on this keyserver."</string>
@@ -1573,9 +1578,6 @@
<string name="security_token_status_partly">"Security Token matches, partly bound to key"</string>
<string name="security_token_create">"Hold Security Token against the back of your device."</string>
<string name="security_token_reset_or_import">"This Security Token already contains a key. You can import the key using the cloud or reset the Security Token."</string>
<string name="btn_import">"Import"</string>
<string name="btn_import_keys">"Import all keys"</string>
<string name="btn_view_list">"View list"</string>
<string name="btn_reset">"Reset"</string>
<string name="security_token_import_radio">"Import key"</string>
<string name="security_token_reset_radio">"Reset Security Token"</string>