From 64facc82d222cf2e9e8f14760f5f9dc04e3c80da Mon Sep 17 00:00:00 2001
From: Nishant Srivastava <nisrulz@gmail.com>
Date: Fri, 19 Mar 2021 19:35:08 +0100
Subject: [PATCH] make project w0rk

---
 .../nisrulz/projecteasydeviceinfo/MainActivity.java      | 8 +++++---
 build.gradle                                             | 9 +++++++++
 configs/library.gradle                                   | 7 +++++--
 .../github/nisrulz/easydeviceinfo/ads/EasyAdsMod.java    | 7 ++++---
 easydeviceinfo-base/src/main/AndroidManifest.xml         | 4 +---
 easydeviceinfo-ktx/build.gradle                          | 3 ---
 6 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/github/nisrulz/projecteasydeviceinfo/MainActivity.java b/app/src/main/java/github/nisrulz/projecteasydeviceinfo/MainActivity.java
index e304f45..403fe23 100644
--- a/app/src/main/java/github/nisrulz/projecteasydeviceinfo/MainActivity.java
+++ b/app/src/main/java/github/nisrulz/projecteasydeviceinfo/MainActivity.java
@@ -340,10 +340,12 @@ public void onSuccess(final String adIdentifier, final boolean adDonotTrack) {
             case NetworkType.CELLULAR_3G:
                 deviceDataMap.put(this.getString(string.network_type), "Cellular 3G");
                 break;
-            case NetworkType.CELLULAR_4G:
-                deviceDataMap.put(this.getString(string.network_type), "Cellular 4G");
+            case NetworkType.CELLULAR_4G_OR_5G_NSA:
+                deviceDataMap.put(this.getString(string.network_type), "Cellular 4G/5G NSA");
+                break;
+            case NetworkType.CELLULAR_5G_SA:
+                deviceDataMap.put(this.getString(string.network_type), "Cellular 5G SA");
                 break;
-
             case NetworkType.WIFI_WIFIMAX:
                 deviceDataMap.put(this.getString(string.network_type), "Wifi/WifiMax");
                 break;
diff --git a/build.gradle b/build.gradle
index 72de1f4..c339960 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,6 +47,15 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+
+        jcenter() {
+            content {
+                // This is an AGP issue. Its been fixed in Canary version. Ideally it would be backported
+                // to stable version soon.
+                // https://github.com/signalapp/Signal-Android/issues/10906#issuecomment-774448564
+                includeModule("org.jetbrains.trove4j", "trove4j")
+            }
+        }
     }
 }
 
diff --git a/configs/library.gradle b/configs/library.gradle
index fca96bf..9564148 100644
--- a/configs/library.gradle
+++ b/configs/library.gradle
@@ -18,8 +18,11 @@ apply plugin: 'com.android.library'
 
 android {
     defaultConfig {
-        versionCode Versions.libraryCode
-        versionName Versions.libraryName
+        versionCode
+        versionName
+
+        buildConfigField 'int', 'VERSION_CODE', "${Versions.libraryCode}"
+        buildConfigField 'String', 'VERSION_NAME', "\"${Versions.libraryName}\""
     }
 
     // Ignore Java 8 Doclint errors
diff --git a/easydeviceinfo-ads/src/main/java/github/nisrulz/easydeviceinfo/ads/EasyAdsMod.java b/easydeviceinfo-ads/src/main/java/github/nisrulz/easydeviceinfo/ads/EasyAdsMod.java
index 76574e8..6ed8cb2 100644
--- a/easydeviceinfo-ads/src/main/java/github/nisrulz/easydeviceinfo/ads/EasyAdsMod.java
+++ b/easydeviceinfo-ads/src/main/java/github/nisrulz/easydeviceinfo/ads/EasyAdsMod.java
@@ -21,6 +21,7 @@
 
 import androidx.ads.identifier.AdvertisingIdClient;
 import androidx.ads.identifier.AdvertisingIdInfo;
+import androidx.annotation.NonNull;
 
 import com.google.common.util.concurrent.ListenableFuture;
 
@@ -46,7 +47,7 @@ public interface AdIdentifierCallback {
          * @param adIdentifier the ad identifier
          * @param adDonotTrack the ad donot track
          */
-        void onSuccess(String adIdentifier, boolean adDonotTrack);
+        void onSuccess(@NonNull String adIdentifier, boolean adDonotTrack);
     }
 
     private Context context;
@@ -57,7 +58,7 @@ public interface AdIdentifierCallback {
      *
      * @param context the context
      */
-    public EasyAdsMod(final Context context) {
+    public EasyAdsMod(@NonNull final Context context) {
         this.context = context.getApplicationContext();
     }
 
@@ -66,7 +67,7 @@ public EasyAdsMod(final Context context) {
      *
      * @param callback the callback
      */
-    public final void getAndroidAdId(final AdIdentifierCallback callback) {
+    public final void getAndroidAdId(@NonNull final AdIdentifierCallback callback) {
         executor.execute(new Runnable() {
             @Override
             public void run() {
diff --git a/easydeviceinfo-base/src/main/AndroidManifest.xml b/easydeviceinfo-base/src/main/AndroidManifest.xml
index b5a40f7..094f42e 100644
--- a/easydeviceinfo-base/src/main/AndroidManifest.xml
+++ b/easydeviceinfo-base/src/main/AndroidManifest.xml
@@ -14,6 +14,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="github.nisrulz.easydeviceinfo.base">
-    <uses-permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
-</manifest>
\ No newline at end of file
+<manifest package="github.nisrulz.easydeviceinfo.base" />
\ No newline at end of file
diff --git a/easydeviceinfo-ktx/build.gradle b/easydeviceinfo-ktx/build.gradle
index 71c1198..963c1fa 100644
--- a/easydeviceinfo-ktx/build.gradle
+++ b/easydeviceinfo-ktx/build.gradle
@@ -17,9 +17,6 @@
 apply from: "$rootProject.projectDir/configs/library.gradle"
 apply from: "$rootProject.projectDir/configs/common.gradle"
 
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
 ext.setupModuleNamesForPublishing(ModuleName.ktx, ModuleDesc.ktx)
 
 dependencies {