- Fixed issue when encrypting message and decrypting on other app

- Bug: save private key when using import - Update gopenpgp internal lib - Update flutter secure storage - Update flutter shared prefs - Bug: fixed internal gopenpgp if key is already unlocked - Android SDK target update (30)
MarinX · Jan 20, 2021 · 797f2d1 · 797f2d1
1 parent d53ca6f
commit 797f2d1
Show file tree

Hide file tree

Showing 11 changed files with 103 additions and 75 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -32,7 +32,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -46,7 +46,7 @@ android {
     defaultConfig {
         applicationId "com.marinbasic.yapgp"
         minSdkVersion 18
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

diff --git a/android/app/src/main/kotlin/com/marinbasic/yapgp/MainActivity.java b/android/app/src/main/kotlin/com/marinbasic/yapgp/MainActivity.java
@@ -1,20 +1,19 @@
 package com.marinbasic.yapgp;
 
 import androidx.annotation.NonNull;
+
 import com.google.android.gms.tasks.Tasks;
-import com.proton.gopenpgp.crypto.Crypto;
-import com.proton.gopenpgp.crypto.Identity;
-import com.proton.gopenpgp.crypto.Key;
-import com.proton.gopenpgp.helper.Helper;
 
-import org.json.JSONException;
-import org.json.JSONObject;
 
+import org.json.JSONObject;
 
 import java.util.concurrent.Callable;
-import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
+import crypto.Crypto;
+import crypto.Key;
+import crypto.UserInfo;
+import helper.Helper;
 import io.flutter.embedding.android.FlutterActivity;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.plugin.common.MethodChannel;
@@ -55,9 +54,11 @@ public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
 
                                     return resultJSON;
                                 case "Encrypt":
-                                    String pgpMessage = Helper.encryptMessageArmored(
-                                            call.argument("pubKey"),
-                                            call.argument("message")
+                                    String pgpMessage = Helper.encryptSignMessageArmored(
+                                            call.argument("pubKey").toString(),
+                                            call.argument("privKey").toString(),
+                                            call.argument("passphrase").toString().getBytes(),
+                                            call.argument("message").toString()
                                     );
 
                                     resultJSON.put("message", pgpMessage);
@@ -80,10 +81,10 @@ public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
                                     return resultJSON;
                                 case "Identity":
                                     Key pubKey;
-                                    Identity id;
+                                    UserInfo id;
                                     try{
                                         pubKey = Crypto.newKeyFromArmored(call.argument("pubKey"));
-                                        id = pubKey.identity();
+                                        id = pubKey.primaryIdentity();
                                     }catch (Exception e) {
                                         resultJSON.put("error", "Invalid PGP public key");
                                         return resultJSON;
@@ -97,13 +98,14 @@ public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
                                     return resultJSON;
                                 case "Import":
                                     Key privateKey;
-                                    Identity identity;
+                                    UserInfo identity;
                                     String password = call.argument("passphrase");
                                     if(password == null) {
                                         password = "";
                                     }
                                     try {
                                         privateKey = Crypto.newKeyFromArmored(call.argument("privKey"));
+
                                         if(privateKey.isLocked() && password.isEmpty()) {
                                             resultJSON.put("error", "Private key locked with password");
                                             return resultJSON;
@@ -113,7 +115,7 @@ public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
                                             resultJSON.put("error", "Invalid password");
                                             return resultJSON;
                                         }
-                                        identity = privateKey.identity();
+                                        identity = privateKey.primaryIdentity();
 
                                         resultJSON.put("publicKey", privateKey.getArmoredPublicKey());
                                         resultJSON.put("privateKey", privateKey.armor());
@@ -133,9 +135,7 @@ public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
                                                 call.argument("message"),
                                                 Crypto.getUnixTime()
                                         );
-                                        Long time = Helper.createdCleartextMessageArmored(call.argument("message"));
                                         resultJSON.put("msg", msg);
-                                        resultJSON.put("time", time);
                                     }catch (Exception e) {
                                         resultJSON.put("error", "Contact key does not match PGP signed message");
                                         return resultJSON;
@@ -154,6 +154,7 @@ public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
                                         resultJSON.put("time", Crypto.getUnixTime());
 
                                     }catch (Exception e) {
+                                        e.printStackTrace();
                                         resultJSON.put("error", "Cannot create signature");
                                         return resultJSON;
                                     }

diff --git a/android/gopenpgp/gopenpgp.aar b/android/gopenpgp/gopenpgp.aar
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
 android.bundle.enableUncompressedNativeLibs=false
+android.enableR8=true
diff --git a/lib/models/signature.dart b/lib/models/signature.dart
@@ -1,19 +1,15 @@
 class Signature {
   String message;
-  DateTime datetime;
 
-  Signature({this.message, this.datetime});
+  Signature({this.message});
 
   Signature.fromJson(Map<String, dynamic> json) {
     message = json['msg'];
-    datetime = new DateTime.fromMillisecondsSinceEpoch(json['time'] * 1000);
-    print(json['time']);
   }
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     data['msg'] = this.message;
-    data['time'] = this.datetime;
     return data;
   }
 }
diff --git a/lib/services/pgp_service.dart b/lib/services/pgp_service.dart
@@ -13,8 +13,8 @@ class PGPService {
     return PGP.fromJson(jsonDecode(result));
   }
 
-  Future<String> encrypt(String msg, PGP key) async {
-    String result = await ch.invokeMethod("Encrypt", {"pubKey": key.publicKey, "message": msg});
+  Future<String> encrypt(String msg, PGP key, PGP contact) async {
+    String result = await ch.invokeMethod("Encrypt", {"pubKey": contact.publicKey,"privKey": key.privateKey,"passphrase": key.passphrase, "message": msg});
     var json = jsonDecode(result);
     return json["message"];
   }

diff --git a/lib/views/encrypt.dart b/lib/views/encrypt.dart
@@ -75,7 +75,7 @@ class EncryptState extends State<Encrypt> {
                     .toString();
                 PGP mykey  = _keys.where((element) => element.privateKey == privKey).first;
 
-                _service.encrypt(message, mykey).then((value) {
+                _service.encrypt(message, mykey, contact).then((value) {
                   setState(() {
                     isLoading = false;
                     _controller.text = value;

diff --git a/lib/views/import_key.dart b/lib/views/import_key.dart
@@ -71,7 +71,7 @@ class ImportKeyState extends State<ImportKey> {
                         privKey,
                         _fbKey.currentState.value["password"].toString(),
                       )
-                      .then((value) {
+                      .then(Store.addKey).then((value) {
                     Navigator.pop(context, value);
                   }).catchError((e) {
                     _utils.showSnackbar(builderContext, e.message);

diff --git a/lib/views/verify_sign.dart b/lib/views/verify_sign.dart
@@ -100,17 +100,6 @@ class VerifySignatureState extends State<VerifySignature> {
                           ],
                         ),
                       ),
-                      Card(
-                        child: Column(
-                          mainAxisSize: MainAxisSize.min,
-                          children: <Widget>[
-                            ListTile(
-                              title: Text('Signed at'),
-                              subtitle: Text(sig.datetime.toString()),
-                            ),
-                          ],
-                        ),
-                      ),
                     ],
                   ) :
                   FormBuilder(