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

improve logging when PGP decryption fails

Browse source
This commit is contained in:
Daniel Gultsch 2023-10-28 17:44:27 +02:00
parent 30d681bcb8
commit ea5ffe92ea
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java
View file

@ -156,7 +156,8 @@ public class PgpDecryptionService {
&& manager.getAutoAcceptFileSize() > 0) { && manager.getAutoAcceptFileSize() > 0) {
manager.createNewDownloadConnection(message); manager.createNewDownloadConnection(message);
} }
} catch (IOException e) { } catch (final IOException e) {
Log.d(Config.LOGTAG,"decryption failed", e);
message.setEncryption(Message.ENCRYPTION_DECRYPTION_FAILED); message.setEncryption(Message.ENCRYPTION_DECRYPTION_FAILED);
} }
mXmppConnectionService.updateMessage(message); mXmppConnectionService.updateMessage(message);
@ -170,6 +171,7 @@ public class PgpDecryptionService {
} }
break; break;
case OpenPgpApi.RESULT_CODE_ERROR: case OpenPgpApi.RESULT_CODE_ERROR:
Log.d(Config.LOGTAG,"decryption failed (api error)");
message.setEncryption(Message.ENCRYPTION_DECRYPTION_FAILED); message.setEncryption(Message.ENCRYPTION_DECRYPTION_FAILED);
mXmppConnectionService.updateMessage(message); mXmppConnectionService.updateMessage(message);
break; break;

5
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -1259,7 +1259,7 @@ public class XmppConnectionService extends Service {
if (Config.supportOpenPgp()) { if (Config.supportOpenPgp()) {
this.pgpServiceConnection = new OpenPgpServiceConnection(this, "org.sufficientlysecure.keychain", new OpenPgpServiceConnection.OnBound() { this.pgpServiceConnection = new OpenPgpServiceConnection(this, "org.sufficientlysecure.keychain", new OpenPgpServiceConnection.OnBound() {
@Override @Override
public void onBound(IOpenPgpService2 service) { public void onBound(final IOpenPgpService2 service) {
for (Account account : accounts) { for (Account account : accounts) {
final PgpDecryptionService pgp = account.getPgpDecryptionService(); final PgpDecryptionService pgp = account.getPgpDecryptionService();
if (pgp != null) { if (pgp != null) {
@ -1269,7 +1269,8 @@ public class XmppConnectionService extends Service {
} }
@Override @Override
public void onError(Exception e) { public void onError(final Exception exception) {
Log.e(Config.LOGTAG,"could not bind to OpenKeyChain", exception);
} }
}); });
this.pgpServiceConnection.bindToService(); this.pgpServiceConnection.bindToService();