refine trojan config parsing

trojan-gfw · Feb 16, 2020 · f132f7c · f132f7c
1 parent 42d6ceb
commit f132f7c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/MainActivity.java b/app/src/main/java/io/github/trojan_gfw/igniter/MainActivity.java
@@ -337,12 +337,15 @@ protected void onResume() {
                 try (FileInputStream fis = new FileInputStream(file)) {
                     byte[] content = new byte[(int) file.length()];
                     fis.read(content);
-                    JSONObject json = new JSONObject(new String(content));
-                    remoteAddrText.setText(json.getString("remote_addr"));
-                    remotePortText.setText(String.valueOf(json.getInt("remote_port")));
-                    passwordText.setText(json.getJSONArray("password").getString(0));
-                    ipv6Switch.setChecked(json.getBoolean("enable_ipv6"));
-                    verifySwitch.setChecked(json.getJSONObject("ssl").getBoolean("verify"));
+                    String contentStr = new String(content);
+                    TrojanConfig ins = Globals.getTrojanConfigInstance();
+                    ins.fromJSON(contentStr);
+
+                    remoteAddrText.setText(ins.getRemoteAddr());
+                    remotePortText.setText(String.valueOf(ins.getRemotePort()));
+                    passwordText.setText(ins.getPassword());
+                    ipv6Switch.setChecked(ins.getEnableIpv6());
+                    verifySwitch.setChecked(ins.getVerifyCert());
                 }
             } catch (Exception e) {
                 e.printStackTrace();

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/TrojanConfig.java b/app/src/main/java/io/github/trojan_gfw/igniter/TrojanConfig.java
@@ -68,6 +68,22 @@ public String generateTrojanConfigJSON() {
         }
     }
 
+    public void fromJSON(String jsonStr) {
+        try {
+            JSONObject json = new JSONObject(jsonStr);
+            this.setLocalAddr(json.getString("local_addr"))
+                    .setLocalPort(json.getInt("local_port"))
+                    .setRemoteAddr(json.getString("remote_addr"))
+                    .setRemotePort(json.getInt("remote_port"))
+                    .setPassword(json.getJSONArray("password").getString(0))
+                    .setEnableIpv6(json.getBoolean("enable_ipv6"))
+                    .setVerifyCert(json.getJSONObject("ssl").getBoolean("verify"));
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     public boolean isValidRunningConfig() {
         return !TextUtils.isEmpty(this.caCertPath)
                 && !TextUtils.isEmpty(this.remoteAddr)
@@ -119,7 +135,7 @@ public TrojanConfig setPassword(String password) {
         return this;
     }
 
-    public boolean isVerifyCert() {
+    public boolean getVerifyCert() {
         return verifyCert;
     }
 
@@ -137,7 +153,7 @@ public TrojanConfig setCaCertPath(String caCertPath) {
         return this;
     }
 
-    public boolean isEnableIpv6() {
+    public boolean getEnableIpv6() {
         return enableIpv6;
     }