upadte

python/tools/garble/java_garble.py

@@ -170,17 +170,14 @@ class JavaGarble:
                     curly_braces = line.count("{")
                     curly_braces -= line.count("}")
                 
-                if curly_braces > 0:
+                    
+                if curly_braces >= 1:
                     curly_braces += line.count("{")
                     curly_braces -= line.count("}")
-
-                # 一个花括号表示在方法的直接作用域内
-                if curly_braces == 1:
                     if "return" in line:
                         curly_braces = -10000
                         continue
-
-                    if ";\n" in line:
+                    if ";\n" in line and len(line) > 10:
                         line += "\n%s" % self.__insert_code()
 
                 fout.write(line)

python/tools/garble/model/logic_model.java

@@ -31,10 +31,10 @@ while((int)${name} < (${name} - 1)){
     ${content}
 }
 //sep
-if(android.text.TextUtils.isEmpty(Build.BOARD)){
+if(android.text.TextUtils.isEmpty(android.os.Build.BOARD)){
     ${content}
 }
 //sep
-if(Build.DEVICE.contains("${string}")){
+if(android.os.Build.DEVICE.contains("${string}")){
     ${content}
 }
\ No newline at end of file