From f74229dbc7885b831906ff596a8d5094e2c9b0c8 Mon Sep 17 00:00:00 2001
From: Vishesh Handa <me@vhanda.in>
Date: Wed, 16 Jan 2019 23:37:19 +0100
Subject: [PATCH] Fix sshkey custom comment

Custom comments had been implemented but were not working.
---
 .../io/gitjournal/gitjournal/GenerateSSHKeysTask.java  | 10 ++++++----
 .../java/io/gitjournal/gitjournal/MainActivity.java    |  3 ++-
 lib/gitapp.dart                                        |  7 ++++---
 lib/storage/git.dart                                   |  7 ++++---
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/android/app/src/main/java/io/gitjournal/gitjournal/GenerateSSHKeysTask.java b/android/app/src/main/java/io/gitjournal/gitjournal/GenerateSSHKeysTask.java
index def1a113..80327af5 100644
--- a/android/app/src/main/java/io/gitjournal/gitjournal/GenerateSSHKeysTask.java
+++ b/android/app/src/main/java/io/gitjournal/gitjournal/GenerateSSHKeysTask.java
@@ -14,6 +14,7 @@ import org.apache.commons.io.FileUtils;
 import io.flutter.plugin.common.MethodChannel.Result;
 
 public class GenerateSSHKeysTask extends AsyncTask<String, Void, Void> {
+    private final static String TAG = "GenerateSSHKeys";
     private Result result;
 
     public GenerateSSHKeysTask(Result _result) {
@@ -28,13 +29,14 @@ public class GenerateSSHKeysTask extends AsyncTask<String, Void, Void> {
         }
 
         String comment = params[1];
+        Log.d(TAG, "Comment: " + comment);
 
         final String privateKeyPath = keysDir + "/id_rsa";
         final String publicKeyPath = keysDir + "/id_rsa.pub";
 
         File privateKeyFile = new File(privateKeyPath);
         if (privateKeyFile.exists()) {
-            Log.d("GenerateSSHKeys", "Private key already exists");
+            Log.d(TAG, "Private key already exists");
             result.error("FAILED", "Private key already exists", null);
             return null;
         }
@@ -48,11 +50,11 @@ public class GenerateSSHKeysTask extends AsyncTask<String, Void, Void> {
             kpair.writePublicKey(publicKeyPath, comment);
             kpair.dispose();
         } catch (JSchException ex) {
-            Log.d("GenerateSSHKeys", ex.toString());
+            Log.d(TAG, ex.toString());
             result.error("FAILED", ex.getMessage(), null);
             return null;
         } catch (IOException ex) {
-            Log.d("GenerateSSHKeys", ex.toString());
+            Log.d(TAG, ex.toString());
             result.error("FAILED", ex.getMessage(), null);
             return null;
         }
@@ -61,7 +63,7 @@ public class GenerateSSHKeysTask extends AsyncTask<String, Void, Void> {
         try {
             publicKey = FileUtils.readFileToString(new File(publicKeyPath), Charset.defaultCharset());
         } catch (IOException ex) {
-            Log.d("GenerateSSHKeys", ex.toString());
+            Log.d(TAG, ex.toString());
             result.error("FAILED", "Failed to read the public key", null);
             return null;
         }
diff --git a/android/app/src/main/java/io/gitjournal/gitjournal/MainActivity.java b/android/app/src/main/java/io/gitjournal/gitjournal/MainActivity.java
index 8c439159..1b2bc3c9 100644
--- a/android/app/src/main/java/io/gitjournal/gitjournal/MainActivity.java
+++ b/android/app/src/main/java/io/gitjournal/gitjournal/MainActivity.java
@@ -124,6 +124,7 @@ public class MainActivity extends FlutterActivity {
                         } else if (call.method.equals("generateSSHKeys")) {
                             String comment = call.argument("comment");
                             if (comment == null || comment.isEmpty()) {
+                                Log.d("generateSSHKeys", "Defaulting to default comment");
                                 comment = "Generated on Android";
                             }
 
@@ -136,7 +137,7 @@ public class MainActivity extends FlutterActivity {
                             try {
                                 publicKey = FileUtils.readFileToString(new File(publicKeyPath), Charset.defaultCharset());
                             } catch (IOException ex) {
-                                Log.d("GenerateSSHKeys", ex.toString());
+                                Log.d("getSSHPublicKey", ex.toString());
                                 result.error("FAILED", "Failed to read the public key", null);
                             }
 
diff --git a/lib/gitapp.dart b/lib/gitapp.dart
index 844b2132..2cf135c5 100644
--- a/lib/gitapp.dart
+++ b/lib/gitapp.dart
@@ -21,9 +21,10 @@ class GitApp extends StatelessWidget {
 buildGitButtons() {
   return <Widget>[
     RaisedButton(
-      child: Text("Generate Keys"),
-      onPressed: generateSSHKeys,
-    ),
+        child: Text("Generate Keys"),
+        onPressed: () {
+          generateSSHKeys(comment: "Git Sample App");
+        }),
     RaisedButton(
       child: Text("Git Clone"),
       onPressed: () async {
diff --git a/lib/storage/git.dart b/lib/storage/git.dart
index a0ae4543..12f3dd7c 100644
--- a/lib/storage/git.dart
+++ b/lib/storage/git.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 
 const _platform = const MethodChannel('gitjournal.io/git');
@@ -29,11 +30,11 @@ Future<String> gitClone(String cloneUrl, String folderName) async {
   return null;
 }
 
-Future<String> generateSSHKeys({comment: ""}) async {
-  print("generateSSHKeyss");
+Future<String> generateSSHKeys({@required String comment}) async {
+  print("generateSSHKeyss: " + comment);
   try {
     String publicKey = await _platform.invokeMethod('generateSSHKeys', {
-      comment: comment,
+      'comment': comment,
     });
     print("Public Key " + publicKey);
     return publicKey;