Skip to content

Commit 763c7ad

Browse files
committed
Added a try/catch block to prevent a crash.| #138.
1 parent 5ec5483 commit 763c7ad

File tree

1 file changed

+20
-13
lines changed

1 file changed

+20
-13
lines changed

FlowCrypt/src/main/java/com/flowcrypt/email/service/CheckClipboardToFindPrivateKeyService.java

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import com.flowcrypt.email.js.PgpKey;
2828
import com.flowcrypt.email.model.KeyDetails;
2929

30+
import org.acra.ACRA;
31+
3032
import java.io.IOException;
3133
import java.lang.ref.WeakReference;
3234

@@ -203,20 +205,25 @@ public void handleMessage(Message msg) {
203205
if (js != null) {
204206
String clipboardText = (String) msg.obj;
205207

206-
String normalizedArmoredKey = js.crypto_key_normalize(clipboardText);
207-
PgpKey pgpKey = js.crypto_key_read(normalizedArmoredKey);
208-
209-
if (js.is_valid_key(pgpKey, isMustBePrivateKey)) {
210-
try {
211-
KeyDetails keyDetails = new KeyDetails(null, clipboardText, null,
212-
null,
213-
false, pgpKey.getPrimaryUserId());
214-
Messenger messenger = msg.replyTo;
215-
messenger.send(Message.obtain(null, ReplyHandler.MESSAGE_WHAT,
216-
keyDetails));
217-
} catch (RemoteException e) {
218-
e.printStackTrace();
208+
try {
209+
String normalizedArmoredKey = js.crypto_key_normalize(clipboardText);
210+
PgpKey pgpKey = js.crypto_key_read(normalizedArmoredKey);
211+
212+
if (js.is_valid_key(pgpKey, isMustBePrivateKey)) {
213+
try {
214+
KeyDetails keyDetails = new KeyDetails(null, clipboardText, null,
215+
null,
216+
false, pgpKey.getPrimaryUserId());
217+
Messenger messenger = msg.replyTo;
218+
messenger.send(Message.obtain(null, ReplyHandler.MESSAGE_WHAT,
219+
keyDetails));
220+
} catch (RemoteException e) {
221+
e.printStackTrace();
222+
}
219223
}
224+
} catch (Exception e) {
225+
e.printStackTrace();
226+
ACRA.getErrorReporter().handleException(e);
220227
}
221228
}
222229
break;

0 commit comments

Comments
 (0)