flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-07-21 07:03:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Android: Improve logging

Browse Source
This commit is contained in:
Vishesh Handa
2019-07-28 03:01:06 +02:00
parent a59b35efec
commit e80a380a5f
9 changed files with 10 additions and 18 deletions

3
android/app/src/main/java/io/gitjournal/gitjournal/GenerateSSHKeysTask.java

@ -25,7 +25,6 @@ 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";
@ -37,7 +36,7 @@ public class GenerateSSHKeysTask extends AsyncTask<String, Void, Void> {
return null;
}
io.gitjournal.gitjournal.Git git = new io.gitjournal.gitjournal.Git();
Git git = new Git();
String errorStr = git.generateKeys(privateKeyPath, publicKeyPath, comment);
if (!errorStr.isEmpty()) {
result.error("FAILED", errorStr, null);

2
android/app/src/main/java/io/gitjournal/gitjournal/GitAddTask.java

@ -15,8 +15,6 @@ public class GitAddTask extends AsyncTask<String, Void, Void> {
final String cloneDirPath = params[0];
final String filePattern = params[1];
Log.d("GitClone Directory", cloneDirPath);
Git git = new Git();
String errorStr = git.add(cloneDirPath, filePattern);
if (!errorStr.isEmpty()) {

2
android/app/src/main/java/io/gitjournal/gitjournal/GitCloneTask.java

@ -1,7 +1,6 @@
package io.gitjournal.gitjournal;
import android.os.AsyncTask;
import android.util.Log;
import java.io.File;
@ -20,7 +19,6 @@ public class GitCloneTask extends AsyncTask<String, Void, Void> {
final String privateKeyPath = params[3];
File cloneDir = new File(cloneDirPath);
Log.d("GitClone Directory", cloneDirPath);
Git git = new Git();
git.setSshKeys(publicKeyPath, privateKeyPath, "");

2
android/app/src/main/java/io/gitjournal/gitjournal/GitCommitTask.java

@ -1,7 +1,6 @@
package io.gitjournal.gitjournal;
import android.os.AsyncTask;
import android.util.Log;
import java.io.File;
@ -21,7 +20,6 @@ public class GitCommitTask extends AsyncTask<String, Void, Void> {
final String commitDateTimeStr = params[4];
File cloneDir = new File(cloneDirPath);
Log.d("GitClone Directory", cloneDirPath);
Git git = new Git();
String errorStr = git.commit(cloneDirPath, authorName, authorEmail, message);

2
android/app/src/main/java/io/gitjournal/gitjournal/GitInitTask.java

@ -1,7 +1,6 @@
package io.gitjournal.gitjournal;
import android.os.AsyncTask;
import android.util.Log;
public class GitInitTask extends AsyncTask<String, Void, Void> {
private final static String TAG = "GitInit";
@ -13,7 +12,6 @@ public class GitInitTask extends AsyncTask<String, Void, Void> {
protected Void doInBackground(String... params) {
String cloneDirPath = params[0];
Log.d("GitInit Directory", cloneDirPath);
Git git = new Git();
String errorStr = git.init(cloneDirPath);

3
android/app/src/main/java/io/gitjournal/gitjournal/GitPullTask.java

@ -1,7 +1,6 @@
package io.gitjournal.gitjournal;
import android.os.AsyncTask;
import android.util.Log;
public class GitPullTask extends AsyncTask<String, Void, Void> {
private final static String TAG = "GitPull";
@ -18,8 +17,6 @@ public class GitPullTask extends AsyncTask<String, Void, Void> {
final String authorName = params[3];
final String authorEmail = params[4];
Log.d("GitClone Directory", cloneDirPath);
Git git = new Git();
git.setSshKeys(publicKeyPath, privateKeyPath, "");
String errorStr = git.pull(cloneDirPath, authorName, authorEmail);

3
android/app/src/main/java/io/gitjournal/gitjournal/GitPushTask.java

@ -1,7 +1,6 @@
package io.gitjournal.gitjournal;
import android.os.AsyncTask;
import android.util.Log;
public class GitPushTask extends AsyncTask<String, Void, Void> {
private final static String TAG = "GitPush";
@ -16,8 +15,6 @@ public class GitPushTask extends AsyncTask<String, Void, Void> {
final String publicKeyPath = params[1];
final String privateKeyPath = params[2];
Log.d("GitClone Directory", cloneDirPath);
Git git = new Git();
git.setSshKeys(publicKeyPath, privateKeyPath, "");
String errorStr = git.push(cloneDirPath);

2
android/app/src/main/java/io/gitjournal/gitjournal/GitRmTask.java

@ -1,7 +1,6 @@
package io.gitjournal.gitjournal;
import android.os.AsyncTask;
import android.util.Log;
import java.io.File;
@ -18,7 +17,6 @@ public class GitRmTask extends AsyncTask<String, Void, Void> {
final String filePattern = params[1];
File cloneDir = new File(cloneDirPath);
Log.d("GitClone Directory", cloneDirPath);
Git git = new Git();
String errorStr = git.rm(cloneDirPath, filePattern);

9
android/app/src/main/java/io/gitjournal/gitjournal/MainActivity.java

@ -11,6 +11,7 @@ import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.Map;
import io.flutter.app.FlutterActivity;
import io.flutter.plugin.common.MethodCall;
@ -46,6 +47,14 @@ public class MainActivity extends FlutterActivity implements MethodCallHandler {
final String privateKeyPath = sshKeysLocation + "/id_rsa";
final String publicKeyPath = sshKeysLocation + "/id_rsa.pub";
Log.d("GitJournalAndroid", "Called method " + call.method);
if (call.arguments instanceof Map) {
Map<String, Object> map = (Map<String, Object>) call.arguments;
for (Map.Entry<String, Object> entry : map.entrySet()) {
Log.d("GitJournalAndroid", ". " + entry.getKey() + ": " + entry.getValue().toString());
}
}
if (call.method.equals("getBaseDirectory")) {
result.success(filesDir);
return;