narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Show PGP "please wait" message only when actually decrypting

Browse source
This commit is contained in:
fiaxh 2015-10-15 23:27:12 +01:00
parent 29a849cb92
commit 016a57f123
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file

@ -550,7 +550,11 @@ public class MessageAdapter extends ArrayAdapter<Message> {
} }
} else if (message.getEncryption() == Message.ENCRYPTION_PGP) { } else if (message.getEncryption() == Message.ENCRYPTION_PGP) {
if (activity.hasPgp()) { if (activity.hasPgp()) {
displayInfoMessage(viewHolder,activity.getString(R.string.encrypted_message),darkBackground); if (account.getPgpDecryptionService().isRunning()) {
displayInfoMessage(viewHolder, activity.getString(R.string.message_decrypting), darkBackground);
} else {
displayInfoMessage(viewHolder, activity.getString(R.string.pgp_message), darkBackground);
}
} else { } else {
displayInfoMessage(viewHolder,activity.getString(R.string.install_openkeychain),darkBackground); displayInfoMessage(viewHolder,activity.getString(R.string.install_openkeychain),darkBackground);
if (viewHolder != null) { if (viewHolder != null) {

3
src/main/res/values/strings.xml
View file

@ -30,7 +30,8 @@
<string name="minutes_ago">%d mins ago</string> <string name="minutes_ago">%d mins ago</string>
<string name="unread_conversations">unread Conversations</string> <string name="unread_conversations">unread Conversations</string>
<string name="sending">sending…</string> <string name="sending">sending…</string>
<string name="encrypted_message">Decrypting message. Please wait…</string> <string name="message_decrypting">Decrypting message. Please wait…</string>
<string name="pgp_message">OpenPGP encrypted message</string>
<string name="nick_in_use">Nickname is already in use</string> <string name="nick_in_use">Nickname is already in use</string>
<string name="admin">Admin</string> <string name="admin">Admin</string>
<string name="owner">Owner</string> <string name="owner">Owner</string>