From d6deaf15428582ed49512c494e5d80d93d4fd9ff Mon Sep 17 00:00:00 2001
From: pc9527 <peng@angelmobi.com>
Date: Fri, 12 Jan 2024 11:35:50 +0800
Subject: [PATCH] fix get DeviceID

---
 app/src/main/AndroidManifest.xml                      |  1 +
 .../main/java/com/example/kvast_sdk/MainActivity.kt   |  1 -
 .../main/java/com/example/kvast_sdk/MyApplication.kt  | 11 +++++++++++
 vastlib/build.gradle                                  |  4 ++++
 vastlib/consumer-rules.pro                            |  5 +++--
 vastlib/src/main/AndroidManifest.xml                  |  1 +
 .../com/example/vastlib/utils/AndroidIdManager.kt     |  6 +++---
 7 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/com/example/kvast_sdk/MyApplication.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 50b4a8f..a113ceb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
+        android:name=".MyApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
diff --git a/app/src/main/java/com/example/kvast_sdk/MainActivity.kt b/app/src/main/java/com/example/kvast_sdk/MainActivity.kt
index d9f5c05..d72056d 100644
--- a/app/src/main/java/com/example/kvast_sdk/MainActivity.kt
+++ b/app/src/main/java/com/example/kvast_sdk/MainActivity.kt
@@ -14,7 +14,6 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        Sdk.init(this.applicationContext)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/kvast_sdk/MyApplication.kt b/app/src/main/java/com/example/kvast_sdk/MyApplication.kt
new file mode 100644
index 0000000..ecf8813
--- /dev/null
+++ b/app/src/main/java/com/example/kvast_sdk/MyApplication.kt
@@ -0,0 +1,11 @@
+package com.example.kvast_sdk
+
+import android.app.Application
+import com.iab.ak.Sdk
+
+class MyApplication:Application() {
+    override fun onCreate() {
+        super.onCreate()
+        Sdk.init(this)
+    }
+}
\ No newline at end of file
diff --git a/vastlib/build.gradle b/vastlib/build.gradle
index 1c3ff68..50ac7c0 100644
--- a/vastlib/build.gradle
+++ b/vastlib/build.gradle
@@ -21,6 +21,10 @@ android {
     }
 
     buildTypes {
+        debug {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
diff --git a/vastlib/consumer-rules.pro b/vastlib/consumer-rules.pro
index 8089094..a759091 100644
--- a/vastlib/consumer-rules.pro
+++ b/vastlib/consumer-rules.pro
@@ -1,3 +1,4 @@
 -repackageclasses 'com.iab.ak'
-#-keep class kotlinx.coroutines.** { *; }
-#-dontwarn kotlinx.coroutines.**
\ No newline at end of file
+-keep class kotlinx.** { *; }
+-keep class kotlin.** { *; }
+-dontwarn kotlinx.coroutines.**
diff --git a/vastlib/src/main/AndroidManifest.xml b/vastlib/src/main/AndroidManifest.xml
index beb787f..9e49bf2 100644
--- a/vastlib/src/main/AndroidManifest.xml
+++ b/vastlib/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
     <application
         android:usesCleartextTraffic="true"/>
 </manifest>
\ No newline at end of file
diff --git a/vastlib/src/main/java/com/example/vastlib/utils/AndroidIdManager.kt b/vastlib/src/main/java/com/example/vastlib/utils/AndroidIdManager.kt
index 51cf892..68fc49b 100644
--- a/vastlib/src/main/java/com/example/vastlib/utils/AndroidIdManager.kt
+++ b/vastlib/src/main/java/com/example/vastlib/utils/AndroidIdManager.kt
@@ -51,7 +51,7 @@ object AndroidIdManager {
                 } else {
                    null
                 }
-              id
+               id = if(id == null || id?.contains("00000000") == true) Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID) else id
             }catch (e:NameNotFoundException){
                 e.printStackTrace()
                id =  Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)
@@ -59,8 +59,8 @@ object AndroidIdManager {
 
             }
         }
-//        LogUtils.info("get android Id ${Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)}")
-        return if(id == null || id?.contains("00000000") == true) Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID) else id!!
+        LogUtils.info("get android Id ${Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)}, $id")
+        return id!!
     }
 
     private class AdvertisingConnection : ServiceConnection {