android sdk 2.6.4

Author: WuWenhui

.idea/workspace.xml

@@ -87,12 +87,7 @@ public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBindin
     public void onMethodCall(MethodCall call, @NonNull Result result) {
         Log.d(TAG, "invoke " + call.method);
         if (METHOD_CONFIG.equalsIgnoreCase(call.method)) {
-            String oaid = call.argument("oaid");
-            String gaid = call.argument("gaid");
-            Boolean adEnabled = call.argument("adEnabled");
-            Boolean macDisabled = call.argument("macDisabled");
-            Boolean imeiDisabled = call.argument("imeiDisabled");
-            config(adEnabled, oaid, gaid, macDisabled, imeiDisabled);
+            config(call);
             result.success("OK");
         } else if (METHOD_CLIPBOARD_ENABLED.equalsIgnoreCase(call.method)) {
             Boolean enabled = call.argument("enabled");
@@ -147,22 +142,58 @@ public void onInstall(AppData appData, boolean retry) {
         }
     }
 
-    private void config(Boolean adEnabled, String oaid, String gaid,
-                        Boolean macDisabled, Boolean imeiDisabled) {
+    private void config(MethodCall call) {
+
         Configuration.Builder builder = new Configuration.Builder();
-        builder.adEnabled(checkBoolean(adEnabled));
-        builder.oaid(oaid);
-        builder.gaid(gaid);
-        if (checkBoolean(macDisabled)) {
-            builder.macDisabled();
+
+        if (call.hasArgument("androidId")) {
+            String androidId = call.argument("androidId");
+            builder.androidId(androidId);
+        }
+        if (call.hasArgument("serialNumber")) {
+            String serialNumber = call.argument("serialNumber");
+            builder.serialNumber(serialNumber);
+        }
+        if (call.hasArgument("adEnabled")) {
+            Boolean adEnabled = call.argument("adEnabled");
+            builder.adEnabled(checkBoolean(adEnabled));
+        }
+        if (call.hasArgument("oaid")) {
+            String oaid = call.argument("oaid");
+            builder.oaid(oaid);
+        }
+        if (call.hasArgument("gaid")) {
+            String gaid = call.argument("gaid");
+            builder.gaid(gaid);
+        }
+        if(call.hasArgument("imeiDisabled")){
+            Boolean imeiDisabled = call.argument("imeiDisabled");
+            if (checkBoolean(imeiDisabled)) {
+                builder.imeiDisabled();
+            }
         }
-        if (checkBoolean(imeiDisabled)) {
-            builder.imeiDisabled();
+        if (call.hasArgument("imei")) {
+            String imei = call.argument("imei");
+            builder.imei(imei);
         }
+        if(call.hasArgument("macDisabled")){
+            Boolean macDisabled = call.argument("macDisabled");
+            if (checkBoolean(macDisabled)) {
+                builder.macDisabled();
+            }
+        }
+        if (call.hasArgument("mac")) {
+            String macAddress = call.argument("mac");
+            builder.macAddress(macAddress);
+        }
+
         configuration = builder.build();
-        Log.d(TAG, String.format("Configuration: adEnabled=%s, oaid=%s, gaid=%s, macDisabled=%s, imeiDisabled=%s",
-                configuration.isAdEnabled(), configuration.getOaid(), configuration.getGaid(),
-                configuration.isMacDisabled(), configuration.isImeiDisabled()));
+//        Log.d(TAG, String.format("Configuration: adEnabled=%s, oaid=%s, gaid=%s, macDisabled=%s, imeiDisabled=%s, "
+//                        + "androidId=%s, serialNumber=%s, imei=%s, mac=%s",
+//                configuration.isAdEnabled(), configuration.getOaid(), configuration.getGaid(),
+//                configuration.isMacDisabled(), configuration.isImeiDisabled(),
+//                configuration.getAndroidId(), configuration.getSerialNumber(),
+//                configuration.getImei(), configuration.getMacAddress()));
 
     }
 

android/libs/OpenInstall_v2.6.3.jar renamed to android/libs/OpenInstall_v2.6.4.jar

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\OP\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"android":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\OP\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"openinstall_flutter_plugin","dependencies":[]}],"date_created":"2022-08-01 17:19:48.747105","version":"2.8.1"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\OP\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"android":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\OP\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"openinstall_flutter_plugin","dependencies":[]}],"date_created":"2022-09-23 15:21:31.755660","version":"2.8.1"}