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

Merge pull request #2032 from rhari991/insecure-warning-on-card

Browse Source 
Added insecure warning to import card
This commit is contained in:
Dominik Schürmann
2017-02-07 20:38:51 +01:00
committed by GitHub
parent aeb76563c7 ba1bd8d48a
commit 6b4182d591
9 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
app:keyRevokedOrExpired="@{entry.revokedOrExpired}"
app:keyRevokedOrExpiredOrInsecure="@{entry.revokedOrExpiredOrInsecure}"
app:keySecret="@{entry.secretKey}"
app:keyUserId="@{entry.primaryUserId.name}"
app:query="@{entry.query}" />
@@ -51,7 +51,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textAppearance="?android:attr/textAppearanceSmall"
app:keyRevokedOrExpired="@{entry.revokedOrExpired}"
app:keyRevokedOrExpiredOrInsecure="@{entry.revokedOrExpiredOrInsecure}"
app:keyUserEmail="@{entry.primaryUserId.email}"
app:query="@{entry.query}" />
@@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
app:keyCreation="@{entry.date}"
app:keyRevokedOrExpired="@{entry.revokedOrExpired}" />
app:keyRevokedOrExpiredOrInsecure="@{entry.revokedOrExpiredOrInsecure}" />
</LinearLayout>

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

@@ -85,9 +85,10 @@
android:layout_centerVertical="true"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:visibility="@{entry.revokedOrExpired ? V.VISIBLE : V.GONE}"
android:visibility="@{entry.revokedOrExpiredOrInsecure ? V.VISIBLE : V.GONE}"
app:keyExpired="@{entry.expired}"
app:keyRevoked="@{entry.revoked}" />
app:keyRevoked="@{entry.revoked}"
app:keySecure="@{entry.secure}"/>
</RelativeLayout>