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

tls-psk: display list of incoming keys on receiving side

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-05-30 18:05:50 +02:00
parent fd34740c1a
commit e44d668e27
8 changed files with 295 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/res/layout/key_transfer_item.xml
View File

@@ -54,7 +54,8 @@
android:outAnimation="@anim/fade_out"
android:inAnimation="@anim/fade_in"
android:id="@+id/transfer_state"
custom:initialView="2">
android:measureAllChildren="false"
custom:initialView="04">
<Space
android:layout_width="wrap_content"
@@ -84,6 +85,14 @@
android:tint="@color/android_green_light"
/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:id="@+id/button_import"
android:text="Import"
/>
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
</LinearLayout>

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

@@ -8,7 +8,7 @@
android:id="@+id/transfer_animator"
android:inAnimation="@anim/fade_in_delayed"
android:outAnimation="@anim/fade_out"
custom:initialView="0">
custom:initialView="03">
<LinearLayout
android:layout_width="match_parent"
@@ -111,4 +111,43 @@
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:id="@+id/connection_status_2"
android:text="Connected to: 123.456.123.123"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="Received Keys:"
android:textAppearance="?android:attr/textAppearanceMedium"
style="@style/SectionHeader"
/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<org.sufficientlysecure.keychain.ui.transfer.view.ReceivedSecretKeyList
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/received_key_list"
android:padding="16dp"
/>
</ScrollView>
</LinearLayout>
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>