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

Android: Improve error checking

Browse Source
This commit is contained in:
Vishesh Handa
2019-01-16 23:55:16 +01:00
parent f74229dbc7
commit e9da9a6ae8
1 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
android/app/src/main/java/io/gitjournal/gitjournal/MainActivity.java
View File

@ -47,8 +47,12 @@ public class MainActivity extends FlutterActivity {
String cloneUrl = call.argument("cloneUrl"); String cloneUrl = call.argument("cloneUrl");
String folderName = call.argument("folderName"); String folderName = call.argument("folderName");
if (cloneUrl.isEmpty() || folderName.isEmpty()) { if (cloneUrl == null || cloneUrl.isEmpty()) {
result.error("Invalid Parameters", "Arguments Invalid", null); result.error("Invalid Parameters", "cloneUrl Invalid", null);
return;
}
if (folderName == null || folderName.isEmpty()) {
result.error("Invalid Parameters", "folderName Invalid", null);
return; return;
} }
@ -59,8 +63,8 @@ public class MainActivity extends FlutterActivity {
} else if (call.method.equals("gitPull")) { } else if (call.method.equals("gitPull")) {
String folderName = call.argument("folderName"); String folderName = call.argument("folderName");
if (folderName.isEmpty()) { if (folderName == null || folderName.isEmpty()) {
result.error("Invalid Parameters", "Arguments Invalid", null); result.error("Invalid Parameters", "folderName Invalid", null);
return; return;
} }
@ -71,8 +75,8 @@ public class MainActivity extends FlutterActivity {
} else if (call.method.equals("gitPush")) { } else if (call.method.equals("gitPush")) {
String folderName = call.argument("folderName"); String folderName = call.argument("folderName");
if (folderName.isEmpty()) { if (folderName == null || folderName.isEmpty()) {
result.error("Invalid Parameters", "Arguments Invalid", null); result.error("Invalid Parameters", "folderName Invalid", null);
return; return;
} }
@ -84,8 +88,12 @@ public class MainActivity extends FlutterActivity {
String folderName = call.argument("folderName"); String folderName = call.argument("folderName");
String filePattern = call.argument("filePattern"); String filePattern = call.argument("filePattern");
if (folderName.isEmpty() || filePattern.isEmpty()) { if (folderName == null || folderName.isEmpty()) {
result.error("Invalid Parameters", "Arguments Invalid", null); result.error("Invalid Parameters", "folderName Invalid", null);
return;
}
if (filePattern == null || filePattern.isEmpty()) {
result.error("Invalid Parameters", "filePattern Invalid", null);
return; return;
} }
@ -97,10 +105,15 @@ public class MainActivity extends FlutterActivity {
String folderName = call.argument("folderName"); String folderName = call.argument("folderName");
String filePattern = call.argument("filePattern"); String filePattern = call.argument("filePattern");
if (folderName.isEmpty() || filePattern.isEmpty()) { if (folderName == null || folderName.isEmpty()) {
result.error("Invalid Parameters", "Arguments Invalid", null); result.error("Invalid Parameters", "folderName Invalid", null);
return; return;
} }
if (filePattern == null || filePattern.isEmpty()) {
result.error("Invalid Parameters", "filePattern Invalid", null);
return;
}
String cloneLocation = filesDir + "/" + folderName; String cloneLocation = filesDir + "/" + folderName;
@ -112,8 +125,20 @@ public class MainActivity extends FlutterActivity {
String authorEmail = call.argument("authorEmail"); String authorEmail = call.argument("authorEmail");
String message = call.argument("message"); String message = call.argument("message");
if (folderName.isEmpty() || authorName.isEmpty() || authorEmail.isEmpty() || message.isEmpty()) { if (folderName == null || folderName.isEmpty()) {
result.error("Invalid Parameters", "Arguments Invalid", null); result.error("Invalid Parameters", "folderName Invalid", null);
return;
}
if (authorName == null || authorName.isEmpty()) {
result.error("Invalid Parameters", "authorName Invalid", null);
return;
}
if (authorEmail == null || authorEmail.isEmpty()) {
result.error("Invalid Parameters", "authorEmail Invalid", null);
return;
}
if (message == null || message.isEmpty()) {
result.error("Invalid Parameters", "message Invalid", null);
return; return;
} }