Android Netmera sdk update & Unity6 support

NetmeraUnity/Assets/Netmera/Editor/NetmeraDependencies.xml

@@ -12,9 +12,9 @@
             apply plugin: 'com.huawei.agconnect'
          -->
 
-        <androidPackage spec="com.netmera:nmcore:3.13.0-noads"/>
-        <androidPackage spec="com.netmera:nmfcm:3.13.0-noads"/>
-        <androidPackage spec="com.netmera:nmhms:3.13.0-noads"/>
+        <androidPackage spec="com.netmera:nmcore:3.15.3-noads"/>
+        <androidPackage spec="com.netmera:nmfcm:3.13.1-noads"/>
+        <androidPackage spec="com.netmera:nmhms:3.12.1-noads"/>
         <androidPackage spec="androidx.core:core:1.1.0"/>
         <androidPackage spec="com.huawei.agconnect:agconnect-core:1.5.2.300"/>
 

NetmeraUnity/Assets/Plugins/Android/mainTemplate.gradle

@@ -39,9 +39,9 @@ dependencies {
     implementation 'com.google.firebase:firebase-messaging:23.1.0' // Assets/Firebase/Editor/MessagingDependencies.xml:13
     implementation 'com.google.firebase:firebase-messaging-unity:10.0.0' // Assets/Firebase/Editor/MessagingDependencies.xml:22
     implementation 'com.huawei.agconnect:agconnect-core:1.5.2.300' // Assets/Netmera/Editor/NetmeraDependencies.xml:19
-    implementation 'com.netmera:nmcore:3.13.0-noads' // Assets/Netmera/Editor/NetmeraDependencies.xml:15
-    implementation 'com.netmera:nmfcm:3.13.0-noads' // Assets/Netmera/Editor/NetmeraDependencies.xml:16
-    implementation 'com.netmera:nmhms:3.13.0-noads' // Assets/Netmera/Editor/NetmeraDependencies.xml:17
+    implementation 'com.netmera:nmcore:3.15.3-noads' // Assets/Netmera/Editor/NetmeraDependencies.xml:15
+    implementation 'com.netmera:nmfcm:3.13.1-noads' // Assets/Netmera/Editor/NetmeraDependencies.xml:16
+    implementation 'com.netmera:nmhms:3.12.1-noads' // Assets/Netmera/Editor/NetmeraDependencies.xml:17
 // Android Resolver Dependencies End
 
 **DEPS**

NetmeraUnity/Assets/Plugins/Android/settingsTemplate.gradle

@@ -26,7 +26,7 @@ dependencyResolutionManagement {
             url "https://developer.huawei.com/repo" // Assets/Netmera/Editor/NetmeraDependencies.xml:27
         }
         maven {
-            url (unityProjectPath + "/Assets/GeneratedLocalRepo/Firebase/m2repository") // Assets/Firebase/Editor/AppDependencies.xml:22, Assets/Firebase/Editor/MessagingDependencies.xml:24
+            url (unityProjectPath + "/Assets/GeneratedLocalRepo/Firebase/m2repository")
         }
         mavenLocal()
 // Android Resolver Repos End

NetmeraUnity/ProjectSettings/AndroidResolverDependencies.xml

@@ -9,9 +9,9 @@
     <package>com.google.firebase:firebase-messaging:23.1.0</package>
     <package>com.google.firebase:firebase-messaging-unity:10.0.0</package>
     <package>com.huawei.agconnect:agconnect-core:1.5.2.300</package>
-    <package>com.netmera:nmcore:3.13.0-noads</package>
-    <package>com.netmera:nmfcm:3.13.0-noads</package>
-    <package>com.netmera:nmhms:3.13.0-noads</package>
+    <package>com.netmera:nmcore:3.15.3-noads</package>
+    <package>com.netmera:nmfcm:3.13.1-noads</package>
+    <package>com.netmera:nmhms:3.12.1-noads</package>
   </packages>
   <files>
     <file>Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0/firebase-app-unity-10.0.0.aar</file>

NetmeraUnity/ProjectSettings/ProjectSettings.asset

@@ -260,7 +260,7 @@ PlayerSettings:
   useCustomGradlePropertiesTemplate: 1
   useCustomGradleSettingsTemplate: 1
   useCustomProguardFile: 0
-  AndroidTargetArchitectures: 1
+  AndroidTargetArchitectures: 3
   AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}

NetmeraUnityAndroid/sdk/build.gradle

@@ -3,11 +3,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
@@ -29,9 +29,9 @@ android {
 
 
 dependencies {
-    implementation 'com.netmera:nmcore:3.13.0-noads'
-    implementation 'com.netmera:nmfcm:3.13.0-noads'
-    implementation 'com.netmera:nmhms:3.13.0-noads'
+    implementation 'com.netmera:nmcore:3.15.3-noads'
+    implementation 'com.netmera:nmfcm:3.13.1-noads'
+    implementation 'com.netmera:nmhms:3.12.1-noads'
     implementation 'androidx.core:core:1.1.0'
     implementation 'com.huawei.agconnect:agconnect-core:1.5.2.300'
 }

NetmeraUnityAndroid/sdk/src/main/java/com/netmera/unity/sdk/core/NetmeraCustomApp.java

@@ -27,74 +27,61 @@ public static Application getInstance() {
     public static void initNetmera(Application app) {
         mInstance = app;
         Context context = app.getApplicationContext();
-        float firebaseSenderId = getFloatMetadata(context, "netmera_firebase_senderid");
-        float huaweiSenderId = getFloatMetadata(context, "netmera_huawei_senderid");
-        String netmeraSdkKey = getStringMetadata(context, "netmera_mobile_sdkkey");
-        String baseUrl = getStringMetadata(context, "netmera_optional_baseurl");
-        if (firebaseSenderId <= 0 || netmeraSdkKey == null) {
+        String firebaseSenderId = getMetaData(context, "netmera_firebase_senderid");
+        String huaweiSenderId = getMetaData(context, "netmera_huawei_senderid");
+        String netmeraSdkKey = getMetaData(context, "netmera_mobile_sdkkey");
+        String baseUrl = getMetaData(context, "netmera_optional_baseurl");
+        if (firebaseSenderId == null || firebaseSenderId.isEmpty() || netmeraSdkKey == null) {
             Log.d(Functions.LOGTAG, "ERROR: netmera_firebase_senderid or netmera_mobile_sdkkey can not be empty.\nCheck your AndroidManifest.xml file.");
             return;
         }
-        boolean mPopupDisabled = getBoolMetadata(context, "netmera_popup_presentation_disabled");
+        boolean mPopupDisabled = Boolean.parseBoolean(getMetaData(context, "netmera_popup_presentation_disabled"));
+        boolean mIsLoggingEnabled = !Boolean.parseBoolean(getMetaData(context, "netmera_logging_disabled"));
 
         NetmeraConfiguration.Builder netmeraConfiguration = new NetmeraConfiguration.Builder()
-                .firebaseSenderId(String.valueOf(firebaseSenderId))
+                .firebaseSenderId(firebaseSenderId)
                 .apiKey(netmeraSdkKey)
                 .nmPushActionCallbacks(new NetmeraPluginPushReceiver())
-                .logging(!getBoolMetadata(context, "netmera_logging_disabled"));
+                .logging(mIsLoggingEnabled);
 
-        if (huaweiSenderId > 0) {
-            netmeraConfiguration.huaweiSenderId(String.valueOf(huaweiSenderId));
+        if (huaweiSenderId != null && !huaweiSenderId.isEmpty()) {
+            netmeraConfiguration.huaweiSenderId(huaweiSenderId);
         }
 
         NetmeraPlugin.mIsInitialized = true;
         Netmera.init(netmeraConfiguration.build(context));
         if (baseUrl != null) {
             Netmera.setBaseUrl(baseUrl);
         }
-        if (!mPopupDisabled) {
-            Netmera.enablePopupPresentation();
-        } else {
+
+        if (mPopupDisabled) {
             Netmera.disablePopupPresentation();
+        } else {
+            Netmera.enablePopupPresentation();
         }
+
         FirebaseMessaging.getInstance().setAutoInitEnabled(true);
-        Functions.log("init called: fcmSenderId: " + firebaseSenderId + " netmeraSdkKey: " + netmeraSdkKey + " popupPresentationEnabled: " + mPopupDisabled + " baseUrl: " + baseUrl, NetmeraPlugin.LogLevel.INFO);
+        Functions.log("init called: fcmSenderId: " + firebaseSenderId + " netmeraSdkKey: " + netmeraSdkKey + " popupPresentationDisabled: " + mPopupDisabled + " baseUrl: " + baseUrl, NetmeraPlugin.LogLevel.INFO);
     }
 
-    public static String getStringMetadata(Context context, String name) {
+    public static String getMetaData(Context context, String name) {
         try {
             ApplicationInfo appInfo = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
             if (appInfo.metaData != null) {
-                String trimmed = appInfo.metaData.getString(name) != null ? appInfo.metaData.getString(name).trim() : null;
-                return trimmed != null && trimmed.length() > 0 ? trimmed : null;
+                // Get the value, trim it, and return null if it's empty
+                Object value = appInfo.metaData.get(name);
+                if (value != null) {
+                    String trimmed = value.toString().trim();
+                    return trimmed.isEmpty() ? null : trimmed;
+                } else {
+                    Log.i("Netmera", "Meta data not found for " + name);
+                }
             }
         } catch (PackageManager.NameNotFoundException e) {
-            return null;
+            // Log or handle exception if necessary
+            Log.e("Netmera", "Application info not found", e);
         }
         return null;
     }
 
-    public static float getFloatMetadata(Context context, String name) {
-        try {
-            ApplicationInfo appInfo = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
-            if (appInfo.metaData != null) {
-                return appInfo.metaData.getFloat(name,0) ;
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            return 0;
-        }
-        return 0;
-    }
-
-    public static boolean getBoolMetadata(Context context, String name) {
-        try {
-            ApplicationInfo appInfo = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
-            if (appInfo.metaData != null) {
-                return appInfo.metaData.getBoolean(name);
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            return false;
-        }
-        return false;
-    }
 }

NetmeraUnityAndroid/sdk/src/main/java/com/netmera/unity/sdk/util/Functions.java

@@ -74,7 +74,9 @@ public static void logError(NetmeraPlugin.Error error) {
 
 
     public static void log(String message, NetmeraPlugin.LogLevel logLevel) {
-        if(NetmeraCustomApp.getInstance() == null || NetmeraCustomApp.getBoolMetadata(NetmeraCustomApp.getInstance(), "netmera_logging_disabled")) {
+        boolean mIsLoggingEnabled = !Boolean.parseBoolean(NetmeraCustomApp.getMetaData(NetmeraCustomApp.getInstance(), "netmera_logging_disabled"));
+
+        if(NetmeraCustomApp.getInstance() == null || !mIsLoggingEnabled) {
             return;
         }
         message = "NETMERA Android log: " + message;