Merge remote-tracking branch 'origin/main'

# Conflicts:
#	vastlib/consumer-rules.pro

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"

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)
     }
 
 }

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)
+    }
+}

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'

vastlib/consumer-rules.pro

@@ -1,4 +1,4 @@
 -repackageclasses 'com.iab.ak'
--keep class kotlinx.coroutines.** { *; }
+-keep class kotlinx.** { *; }
 -keep class kotlin.** { *; }
--dontwarn kotlinx.coroutines.**
+-dontwarn kotlinx.coroutines.**

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>

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)}")
+        LogUtils.info("get android Id ${Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)}, $id")
-        return if(id == null || id?.contains("00000000") == true) Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID) else id!!
+        return id!!
     }
 
     private class AdvertisingConnection : ServiceConnection {