Make sure that the free Manifest also builds

Author: galadril

app/src/free/AndroidManifest.xml

@@ -69,6 +69,8 @@
         android:name="nl.hnogames.domoticz.premium.permission.MAPS_RECEIVE"
         android:protectionLevel="signature" />
 
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
+
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <application
         android:allowBackup="false"
@@ -91,12 +93,9 @@
             android:name="nl.hnogames.domoticz.service.NFCServiceActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-                <category android:name="android.intent.category.DEFAULT" />
                 <data
                     android:host="domoticz"
                     android:scheme="app" />
@@ -418,9 +417,11 @@
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="@string/google_maps_key" />
+
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
+
         <meta-data
             android:name="com.google.android.gms.vision.DEPENDENCIES"
             android:value="barcode" />

app/src/main/AndroidManifest.xml

@@ -190,7 +190,7 @@ protected void onCreate(Bundle savedInstanceState) {
                     .addTestDevice("1AAE9D81347967A359E372B0445549DE")
                     .addTestDevice("440E239997F3D1DD8BC59D0ADC9B5DB5")
                     .addTestDevice("D6A4EE627F1D3912332E0BFCA8EA2AD2")
-                    .addTestDevice("6C2390A9FF8F555BD01BA560068CD366")
+                    .addTestDevice("2C114D01992840EC6BF853D44CB96754")
                     .build();
             ((AdView) findViewById(R.id.adView)).loadAd(adRequest);
         } else

app/src/main/java/nl/hnogames/domoticz/MainActivity.java

@@ -230,6 +230,7 @@ private void setAdsLayout(DataObjectHolder holder) {
                     .addTestDevice("440E239997F3D1DD8BC59D0ADC9B5DB5")
                     .addTestDevice("D6A4EE627F1D3912332E0BFCA8EA2AD2")
                     .addTestDevice("6C2390A9FF8F555BD01BA560068CD366")
+                    .addTestDevice("2C114D01992840EC6BF853D44CB96754")
                     .build();
 
             AdLoader adLoader = new AdLoader.Builder(mContext, mContext.getString(R.string.ad_unit_id))

app/src/main/java/nl/hnogames/domoticz/adapters/CamerasAdapter.java

@@ -904,6 +904,7 @@ private void setAdsLayout(DataObjectHolder holder) {
                     .addTestDevice("440E239997F3D1DD8BC59D0ADC9B5DB5")
                     .addTestDevice("D6A4EE627F1D3912332E0BFCA8EA2AD2")
                     .addTestDevice("6C2390A9FF8F555BD01BA560068CD366")
+                    .addTestDevice("2C114D01992840EC6BF853D44CB96754")
                     .build();
 
             AdLoader adLoader = new AdLoader.Builder(context, context.getString(R.string.ad_unit_id))

app/src/main/java/nl/hnogames/domoticz/adapters/DashboardAdapter.java

@@ -181,6 +181,7 @@ private void setAdsLayout(DataObjectHolder holder) {
                     .addTestDevice("440E239997F3D1DD8BC59D0ADC9B5DB5")
                     .addTestDevice("D6A4EE627F1D3912332E0BFCA8EA2AD2")
                     .addTestDevice("6C2390A9FF8F555BD01BA560068CD366")
+                    .addTestDevice("2C114D01992840EC6BF853D44CB96754")
                     .build();
 
             AdLoader adLoader = new AdLoader.Builder(mContext, mContext.getString(R.string.ad_unit_id))

app/src/main/java/nl/hnogames/domoticz/adapters/PlansAdapter.java

@@ -307,6 +307,7 @@ private void setAdsLayout(DataObjectHolder holder) {
                     .addTestDevice("440E239997F3D1DD8BC59D0ADC9B5DB5")
                     .addTestDevice("D6A4EE627F1D3912332E0BFCA8EA2AD2")
                     .addTestDevice("6C2390A9FF8F555BD01BA560068CD366")
+                    .addTestDevice("2C114D01992840EC6BF853D44CB96754")
                     .build();
 
             AdLoader adLoader = new AdLoader.Builder(context, context.getString(R.string.ad_unit_id))

app/src/main/java/nl/hnogames/domoticz/adapters/SceneAdapter.java

@@ -615,7 +615,7 @@ private void setAdsLayout(DataObjectHolder holder) {
                     .addTestDevice("1AAE9D81347967A359E372B0445549DE")
                     .addTestDevice("440E239997F3D1DD8BC59D0ADC9B5DB5")
                     .addTestDevice("D6A4EE627F1D3912332E0BFCA8EA2AD2")
-                    .addTestDevice("6C2390A9FF8F555BD01BA560068CD366")
+                    .addTestDevice("2C114D01992840EC6BF853D44CB96754")
                     .build();
 
             AdLoader adLoader = new AdLoader.Builder(context, context.getString(R.string.ad_unit_id))

app/src/main/java/nl/hnogames/domoticz/adapters/SwitchesAdapter.java

@@ -28,6 +28,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -606,6 +607,17 @@ public static void openPremiumAppStore(Context context) {
         }
     }
 
+    public static boolean checkPremiumLicense(final Context context, final SharedPrefUtil mSharedPrefs) {
+        PackageManager manager = context.getPackageManager();
+        if (manager.checkSignatures("nl.hnogames.domoticz", "nl.hnogames.domoticz.premium")
+                == PackageManager.SIGNATURE_MATCH) {
+            return true;
+        }
+        else{
+            return false;
+        }
+    }
+
     public static void checkAPK(final Context context, final SharedPrefUtil mSharedPrefs) {
         if (context == null || mSharedPrefs == null)
             return; //should not happen

app/src/main/java/nl/hnogames/domoticz/utils/UsefulBits.java

@@ -47,6 +47,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 
     <supports-screens
         android:anyDensity="true"
@@ -107,12 +108,9 @@
         <activity android:exported="true" android:name="nl.hnogames.domoticz.service.NFCServiceActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-                <category android:name="android.intent.category.DEFAULT" />
                 <data
                     android:host="domoticz"
                     android:scheme="app" />

app/src/paid/AndroidManifest.xml

@@ -1,4 +1,4 @@
-#Fri May 20 17:24:25 CEST 2022
-VERSION_BUILD=8738
+#Tue May 24 13:35:35 CEST 2022
+VERSION_BUILD=8760
 VERSION_CODE=620
 VERSION_PATCH=320

app/version.properties

@@ -1,4 +1,4 @@
-#Fri May 20 17:24:25 CEST 2022
+#Tue May 24 13:35:35 CEST 2022
 VERSION_BUILD=3675
 VERSION_CODE=254
 VERSION_PATCH=254