kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix totp not showing if set in password without extra content

Browse source
This commit is contained in:
Mohamed 2017-11-19 12:41:36 +01:00
parent c1db901fea
commit de4de6516b
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt
View file

@ -235,14 +235,14 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
crypto_copy_username.setOnClickListener { copyUsernameToClipBoard(entry.username) } crypto_copy_username.setOnClickListener { copyUsernameToClipBoard(entry.username) }
crypto_username_show.typeface = monoTypeface crypto_username_show.typeface = monoTypeface
crypto_username_show.text = entry.username crypto_username_show.text = entry.username
} else {
crypto_username_show.visibility = View.GONE
crypto_username_show_label.visibility = View.GONE
crypto_copy_username.visibility = View.GONE
} }
} }
if (entry.hasTotp()) { if (entry.hasTotp()) {
crypto_extra_show_layout.visibility = View.VISIBLE
crypto_extra_show.typeface = monoTypeface
crypto_extra_show.text = entry.extraContent
crypto_totp_show.visibility = View.VISIBLE crypto_totp_show.visibility = View.VISIBLE
crypto_totp_show_label.visibility = View.VISIBLE crypto_totp_show_label.visibility = View.VISIBLE
crypto_copy_totp.visibility = View.VISIBLE crypto_copy_totp.visibility = View.VISIBLE

3
app/src/main/res/layout/decrypt_layout.xml
View file

@ -132,6 +132,7 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_toLeftOf="@id/crypto_copy_username" android:layout_toLeftOf="@id/crypto_copy_username"
android:layout_toStartOf="@id/crypto_copy_username" android:layout_toStartOf="@id/crypto_copy_username"
android:visibility="invisible"
android:text="@string/username" android:text="@string/username"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textStyle="bold" /> android:textStyle="bold" />
@ -145,6 +146,7 @@
android:layout_below="@id/crypto_username_show_label" android:layout_below="@id/crypto_username_show_label"
android:layout_toLeftOf="@id/crypto_copy_username" android:layout_toLeftOf="@id/crypto_copy_username"
android:layout_toStartOf="@id/crypto_copy_username" android:layout_toStartOf="@id/crypto_copy_username"
android:visibility="invisible"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textIsSelectable="true" android:textIsSelectable="true"
android:typeface="monospace" /> android:typeface="monospace" />
@ -156,6 +158,7 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:visibility="invisible"
android:contentDescription="@string/copy_username" android:contentDescription="@string/copy_username"
android:background="@color/background" android:background="@color/background"
android:src="@drawable/ic_content_copy"/> android:src="@drawable/ic_content_copy"/>