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

tls-psk: display a note if there are no keys to send

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-06-08 17:46:59 +02:00
parent 5cff30e7ba
commit 049b93ff03
4 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenKeychain/src/main/res/layout/transfer_fragment.xml
View File

@@ -104,11 +104,30 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<org.sufficientlysecure.keychain.ui.transfer.view.TransferSecretKeyList
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/transfer_key_list"
/>
android:orientation="vertical">
<org.sufficientlysecure.keychain.ui.transfer.view.TransferSecretKeyList
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/transfer_key_list"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="16dp"
android:gravity="center_horizontal"
android:padding="12dp"
android:textAppearance="?android:textAppearanceMedium"
android:id="@+id/transfer_key_list_empty"
android:text="@string/transfer_list_empty"
/>
</LinearLayout>
</ScrollView>

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

@@ -1902,5 +1902,6 @@
<string name="transfer_error_connect">"Connection failed!"</string>
<string name="transfer_error_listen">"Error waiting for connection!"</string>
<string name="transfer_not_available">"Sorry, this feature can only be used on Android 5 or newer :("</string>
<string name="transfer_list_empty">No keys on this device that could be sent. Waiting for incoming keys…</string>
</resources>