Merge pull request #674 from domoticz/beta-development

Beta development
domoticz · Dec 14, 2022 · fab7016 · fab7016
2 parents b0139de + c6bdc0a
commit fab7016
Show file tree

Hide file tree

Showing 131 changed files with 864 additions and 656 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     def versionPropsFile = file('version.properties')
     if (versionPropsFile.canRead()) {
@@ -40,7 +40,7 @@ android {
             versionCode version_Code
             versionName "${versionMajor}.${versionMinor}.${versionPatch} (${versionBuild})"
             minSdkVersion 23
-            targetSdkVersion 31
+            targetSdkVersion 33
             multiDexEnabled true
             wearAppUnbundled true
         }
@@ -189,7 +189,8 @@ allprojects {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    implementation "androidx.work:work-runtime:2.8.0-alpha02"
+    implementation 'androidx.core:core:1.9.0'
+    implementation "androidx.work:work-runtime:2.8.0-rc01"
     implementation 'androidx.preference:preference:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.4.2'
@@ -203,7 +204,7 @@ dependencies {
     implementation 'com.google.android.libraries.car:car-app:1.0.0-beta.1'
     implementation 'org.reactivestreams:reactive-streams:1.0.3'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.10'
-    implementation 'com.revenuecat.purchases:purchases:5.0.0-rc3'
+    implementation 'com.revenuecat.purchases:purchases:5.6.3'
 
     implementation 'com.google.firebase:firebase-core:19.0.1'
     implementation 'com.google.firebase:firebase-iid:21.1.0'
@@ -256,7 +257,7 @@ dependencies {
 
     implementation 'com.github.stfalcon:chatkit:0.3.3'
     implementation 'com.github.matthiasrobbers:shortbread:1.1.0'
-    implementation 'androidx.core:core:1.6.0'
+
     annotationProcessor 'com.github.matthiasrobbers:shortbread-compiler:1.1.0'
     implementation ('com.adevinta.android:leku:9.1.4') {
         exclude group: 'com.google.android.gms'

diff --git a/app/src/free/AndroidManifest.xml b/app/src/free/AndroidManifest.xml
@@ -49,6 +49,8 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
     <uses-permission android:name="com.android.vending.BILLING" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <supports-screens
         android:anyDensity="true"
@@ -106,12 +108,21 @@
         android:requestLegacyExternalStorage="true"
         tools:replace="android:icon, android:label, android:theme, android:name, android:allowBackup">
 
-        <activity android:exported="true" android:name="nl.hnogames.domoticz.service.NFCServiceActivity">
+        <activity android:exported="true"
+            android:name="nl.hnogames.domoticz.NFCSettingsActivity"
+            android:label="@string/category_nfc"
+            android:parentActivityName="nl.hnogames.domoticz.SettingsActivity"
+            android:resizeableActivity="true">
+        </activity>
+
+        <activity android:exported="true"
+            android:launchMode="singleTask"
+            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" />
+                <action android:name="android.nfc.action.TAG"/>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <action android:name="android.nfc.action.TECH"/>
+                <category android:name="android.intent.category.DEFAULT"/>
                 <data
                     android:host="domoticz"
                     android:scheme="app" />
@@ -336,22 +347,9 @@
                 android:value="nl.hnogames.domoticz.GeoSettingsActivity" />
         </activity>
 
-        <activity android:exported="true"
-            android:name="nl.hnogames.domoticz.NFCSettingsActivity"
-
-            android:label="@string/category_nfc"
-            android:parentActivityName="nl.hnogames.domoticz.SettingsActivity"
-            android:resizeableActivity="true">
-            <intent-filter>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <activity
             android:exported="true"
             android:name="nl.hnogames.domoticz.BluetoothSettingsActivity"
-
             android:label="@string/category_bluetooth"
             android:parentActivityName="nl.hnogames.domoticz.SettingsActivity">
             <meta-data

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -88,23 +88,6 @@
             </intent-filter>
         </service>
 
-        <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" />
-                <data
-                    android:host="domoticz"
-                    android:scheme="app" />
-            </intent-filter>
-            <meta-data
-                android:name="android.nfc.action.TECH_DISCOVERED"
-                android:resource="@xml/nfc_tech_list" />
-        </activity>
-
         <receiver
             android:name="nl.hnogames.domoticz.service.BluetoothConnectionReceiver"
             android:enabled="true"
@@ -182,7 +165,6 @@
 
         <activity android:exported="true"
             android:name="nl.hnogames.domoticz.MainActivity"
-
             android:label="@string/app_name_domoticz"
             android:launchMode="singleTop"
             android:resizeableActivity="true">
@@ -327,7 +309,6 @@
 
         <activity android:exported="true"
             android:name="nl.hnogames.domoticz.GeoSettingsActivity"
-
             android:label="@string/title_activity_server_settings"
             android:parentActivityName="nl.hnogames.domoticz.SettingsActivity"
             android:resizeableActivity="true">
@@ -338,19 +319,30 @@
 
         <activity android:exported="true"
             android:name="nl.hnogames.domoticz.NFCSettingsActivity"
-
             android:label="@string/category_nfc"
             android:parentActivityName="nl.hnogames.domoticz.SettingsActivity"
             android:resizeableActivity="true">
+        </activity>
+
+        <activity android:exported="true"
+            android:launchMode="singleTask"
+            android:name="nl.hnogames.domoticz.service.NFCServiceActivity">
             <intent-filter>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.nfc.action.TAG"/>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <action android:name="android.nfc.action.TECH"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data
+                    android:host="domoticz"
+                    android:scheme="app" />
             </intent-filter>
+            <meta-data
+                android:name="android.nfc.action.TECH_DISCOVERED"
+                android:resource="@xml/nfc_tech_list" />
         </activity>
 
         <activity android:exported="true"
             android:name="nl.hnogames.domoticz.BluetoothSettingsActivity"
-
             android:label="@string/category_bluetooth"
             android:parentActivityName="nl.hnogames.domoticz.SettingsActivity">
             <meta-data

diff --git a/app/src/main/java/nl/hnogames/domoticz/BeaconSettingsActivity.java b/app/src/main/java/nl/hnogames/domoticz/BeaconSettingsActivity.java
@@ -46,6 +46,7 @@
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
 import nl.hnogames.domoticz.adapters.BeaconAdapter;
 import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
 import nl.hnogames.domoticz.app.AppController;

diff --git a/app/src/main/java/nl/hnogames/domoticz/BluetoothSettingsActivity.java b/app/src/main/java/nl/hnogames/domoticz/BluetoothSettingsActivity.java
@@ -36,6 +36,7 @@
 import com.fastaccess.permission.base.PermissionHelper;
 import com.ftinc.scoop.Scoop;
 import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.switchmaterial.SwitchMaterial;
 import com.nhaarman.listviewanimations.appearance.simple.SwingBottomInAnimationAdapter;
 
 import java.util.ArrayList;
@@ -46,6 +47,7 @@
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
 import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
 import nl.hnogames.domoticz.containers.BluetoothInfo;
 import nl.hnogames.domoticz.helpers.StaticHelper;
@@ -68,6 +70,7 @@ public class BluetoothSettingsActivity extends AppCompatPermissionsActivity impl
     private nl.hnogames.domoticz.adapters.BluetoothAdapter adapter;
     private PermissionHelper permissionHelper;
     private BluetoothAdapter mBluetoothAdapter;
+    private SwitchMaterial switch_notifications_button;
     private Toolbar toolbar;
 
     @Override
@@ -85,6 +88,7 @@ protected void onCreate(Bundle savedInstanceState) {
         toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         coordinatorLayout = findViewById(R.id.coordinatorLayout);
+
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         this.setTitle(R.string.category_bluetooth);
@@ -93,6 +97,10 @@ protected void onCreate(Bundle savedInstanceState) {
         adapter = new nl.hnogames.domoticz.adapters.BluetoothAdapter(this, BluetoothList, this);
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
 
+        switch_notifications_button = findViewById(R.id.switch_notifications_button);
+        switch_notifications_button.setChecked(mSharedPrefs.isBluetoothNotificationsEnabled());
+        switch_notifications_button.setOnCheckedChangeListener((buttonView, isChecked) -> mSharedPrefs.setBluetoothNotificationsEnabled(isChecked));
+
         createListView();
     }
 

diff --git a/app/src/main/java/nl/hnogames/domoticz/CameraActivity.java b/app/src/main/java/nl/hnogames/domoticz/CameraActivity.java
@@ -31,6 +31,7 @@
 import java.util.TimerTask;
 
 import androidx.appcompat.widget.Toolbar;
+
 import nl.hnogames.domoticz.app.AppCompatAssistActivity;
 import nl.hnogames.domoticz.fragments.Camera;
 

diff --git a/app/src/main/java/nl/hnogames/domoticz/EventsActivity.java b/app/src/main/java/nl/hnogames/domoticz/EventsActivity.java
@@ -26,6 +26,7 @@
 import com.ftinc.scoop.Scoop;
 
 import androidx.appcompat.widget.Toolbar;
+
 import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
 import nl.hnogames.domoticz.fragments.Events;
 import nl.hnogames.domoticz.utils.SharedPrefUtil;

diff --git a/app/src/main/java/nl/hnogames/domoticz/GeoSettingsActivity.java b/app/src/main/java/nl/hnogames/domoticz/GeoSettingsActivity.java
@@ -49,6 +49,7 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
 import nl.hnogames.domoticz.adapters.LocationAdapter;
 import nl.hnogames.domoticz.app.AppCompatAssistActivity;
 import nl.hnogames.domoticz.containers.LocationInfo;

diff --git a/app/src/main/java/nl/hnogames/domoticz/GraphActivity.java b/app/src/main/java/nl/hnogames/domoticz/GraphActivity.java
@@ -27,6 +27,7 @@
 import com.ftinc.scoop.Scoop;
 
 import androidx.appcompat.widget.Toolbar;
+
 import nl.hnogames.domoticz.app.AppCompatAssistActivity;
 import nl.hnogames.domoticz.fragments.Graph;
 import nl.hnogames.domoticz.utils.SharedPrefUtil;

diff --git a/app/src/main/java/nl/hnogames/domoticz/LogsActivity.java b/app/src/main/java/nl/hnogames/domoticz/LogsActivity.java
@@ -26,6 +26,7 @@
 import com.ftinc.scoop.Scoop;
 
 import androidx.appcompat.widget.Toolbar;
+
 import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
 import nl.hnogames.domoticz.fragments.Logs;
 import nl.hnogames.domoticz.utils.SharedPrefUtil;

diff --git a/app/src/main/java/nl/hnogames/domoticz/MainActivity.java b/app/src/main/java/nl/hnogames/domoticz/MainActivity.java
@@ -83,6 +83,7 @@
 import androidx.fragment.app.FragmentTransaction;
 import androidx.work.OneTimeWorkRequest;
 import androidx.work.WorkManager;
+
 import hotchemi.android.rate.AppRate;
 import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
 import nl.hnogames.domoticz.app.AppController;
@@ -186,7 +187,7 @@ protected void onCreate(Bundle savedInstanceState) {
                     .addTestDevice("1AAE9D81347967A359E372B0445549DE")
                     .addTestDevice("440E239997F3D1DD8BC59D0ADC9B5DB5")
                     .addTestDevice("D6A4EE627F1D3912332E0BFCA8EA2AD2")
-                    .addTestDevice("2C114D01992840EC6BF853D44CB96754")
+                    .addTestDevice("7ABE5FC9B0E902B7CF857CE3A57831AB")
                     .build();
             ((AdView) findViewById(R.id.adView)).loadAd(adRequest);
         } else
@@ -689,8 +690,8 @@ private void setScreenAlwaysOn() {
     }
 
     @Override
-
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         permissionHelper.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
@@ -768,13 +769,11 @@ private void applyLanguage() {
     }
 
     private void setupMobileDevice() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             if (!PermissionsUtil.canAccessDeviceState(this))
                 permissionHelper.request(PermissionsUtil.INITIAL_DEVICE_PERMS);
             else
                 GetFirebaseToken();
-        } else {
-            GetFirebaseToken();
         }
     }