v2.01: adjusted to latest library and Android SDK changes

Author: vmayorow

app/build.gradle

@@ -28,13 +28,13 @@ android {
             storePassword 'aGVhZHdpbmRNYWlu'
         }
     }
-    compileSdkVersion 28
+    compileSdkVersion 34
     defaultConfig {
         applicationId "com.hmdm.pager"
         minSdkVersion 14
-        targetSdkVersion 28
-        versionCode 2
-        versionName "1.02"
+        targetSdkVersion 34
+        versionCode 201
+        versionName "2.01"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -47,6 +47,7 @@ android {
             signingConfig signingConfigs.config
         }
     }
+    namespace 'com.hmdm.pager'
 }
 
 dependencies {
@@ -67,5 +68,5 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-annotations:2.9.4'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.4'
 
-    implementation files('libs/hmdm-1.0.5.aar')
+    implementation files('libs/hmdm-1.1.7.aar')
 }

app/libs/hmdm-1.0.5.aar

@@ -18,13 +18,18 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hmdm.pager">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WAKE_LOCK" android:required="false"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+
+    <queries>
+        <package android:name="com.hmdm.launcher" />
+    </queries>
 
     <application
         android:allowBackup="true"
@@ -37,15 +42,20 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
+            android:exported="true"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <service android:name=".service.PagerService"/>
+        <service android:name=".service.PagerService"
+            android:foregroundServiceType="specialUse">
+            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="Pager service"/>
+        </service>
 
         <receiver
             android:name=".receiver.BootReceiver"
@@ -61,7 +71,10 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".receiver.StartActivityReceiver" android:enabled="true"/>
+        <receiver
+            android:name=".receiver.StartActivityReceiver"
+            android:enabled="true"
+            android:exported="false"/>
 
     </application>
 

app/libs/hmdm-1.1.7.aar

@@ -23,15 +23,10 @@ public class Const {
     public static final String LOG_TAG = "com.hmdm.Pager";
     public static final int CONNECTION_TIMEOUT = 10;
 
-    public static final String INTENT_PUSH_NOTIFICATION_TYPE = "com.hmdm.push.textMessage";
-    public static final String INTENT_PUSH_NOTIFICATION_EXTRA = "com.hmdm.PUSH_DATA";
-
-    public static final String STATUS_OK = "OK";
+    public static final String PUSH_MESSAGE_TYPE = "textMessage";
 
     public static final int TASK_SUCCESS = 0;
     public static final int TASK_ERROR = 1;
-    public static final int TASK_NETWORK_ERROR = 2;
-    public static final int TASK_IDLE = 3;
 
     public static final int HMDM_RECONNECT_DELAY_FIRST = 5000;
     public static final int HMDM_RECONNECT_DELAY_NEXT = 5000;

app/src/main/AndroidManifest.xml

@@ -19,10 +19,8 @@
 
 package com.hmdm.pager;
 
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
@@ -37,12 +35,14 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.hmdm.HeadwindMDM;
 import com.hmdm.MDMException;
+import com.hmdm.MDMPushHandler;
+import com.hmdm.MDMPushMessage;
 import com.hmdm.MDMService;
 import com.hmdm.pager.db.DatabaseHelper;
 import com.hmdm.pager.db.MessageTable;
@@ -55,27 +55,30 @@
 import java.util.Date;
 import java.util.List;
 
-public class MainActivity extends AppCompatActivity implements MDMService.ResultHandler {
+public class MainActivity extends AppCompatActivity implements HeadwindMDM.EventHandler {
 
     private SettingsHelper settings;
 
-    private MDMService mdmService;
+    private HeadwindMDM headwindMDM;
     private boolean mdmConnected = false;
 
     private TextView emptyTextView;
     private RecyclerView recyclerView;
     private MessageAdapter adapter;
     private RecyclerView.LayoutManager layoutManager;
+    private Handler receiveHandler = new Handler();
 
-    private BroadcastReceiver newMessageReceiver = new BroadcastReceiver() {
+    private MDMPushHandler mdmPushHandler = new MDMPushHandler() {
         @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent.getAction().equals(Const.ACTION_NEW_MESSAGE)) {
+        public void onMessageReceived(MDMPushMessage mdmPushMessage) {
+            // We need to save incoming message in the database by the service,
+            // So we implement a delay here
+            receiveHandler.postDelayed(() -> {
                 adapter.updateMessages();
                 adapter.notifyDataSetChanged();
                 updateItemState();
                 notifyMessagesRead();
-            }
+            }, 300);
         }
     };
 
@@ -100,7 +103,7 @@ protected void onCreate(Bundle savedInstanceState) {
         recyclerView.addItemDecoration(dividerItemDecoration);
 
         settings = SettingsHelper.getInstance(this);
-        mdmService = MDMService.getInstance();
+        headwindMDM = HeadwindMDM.getInstance();
 
         Intent intent = new Intent(this, PagerService.class);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -141,27 +144,31 @@ protected void onNewIntent(Intent intent) {
     protected void onResume() {
         super.onResume();
 
-        if (mdmConnected) {
-            queryMdm();
+        String[] messageTypes = {Const.PUSH_MESSAGE_TYPE};
+        mdmPushHandler.register(messageTypes, this);
+
+        if (!headwindMDM.isConnected()) {
+            if (!headwindMDM.connect(this, this)) {
+                // Your application is running outside Headwind MDM
+                Toast.makeText(MainActivity.this, getString(R.string.mdm_connect_error), Toast.LENGTH_LONG).show();
+            }
         } else {
-            mdmService.connect(this, this);
+            // Already connected, but settings may have changed
+            // when our app was in the background, so reload them
+            queryMdm();
         }
         updateItemState();
 
         adapter.updateMessages();
         adapter.notifyDataSetChanged();
 
-        LocalBroadcastManager.getInstance(this).registerReceiver(newMessageReceiver,
-                new IntentFilter(Const.ACTION_NEW_MESSAGE));
-
         notifyMessagesRead();
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-
-        LocalBroadcastManager.getInstance(this).unregisterReceiver(newMessageReceiver);
+        mdmPushHandler.unregister(this);
     }
 
     private void updateItemState() {
@@ -217,31 +224,22 @@ private void queryMdm() {
     }
 
     @Override
-    public void onMDMConnected() {
-        mdmConnected = true;
-        MDMService.Log.i(Const.LOG_TAG, "activity connected to Headwind MDM");
-
+    public void onHeadwindMDMConnected() {
+        // Connected to Headwind MDM, now you can load settings and use other MDM functions
+        MDMService.Log.i(Const.LOG_TAG, "Activity connected to Headwind MDM");
         queryMdm();
     }
 
     @Override
-    public void onMDMDisconnected() {
-        mdmConnected = false;
-
-        // Reconnect (this could be after crash of Headwind MDM!)
-        MDMService.Log.i(Const.LOG_TAG, "activity disconnected from Headwind MDM");
-        new Handler().postDelayed(new MDMReconnectRunnable(), Const.HMDM_RECONNECT_DELAY_FIRST);
+    public void onHeadwindMDMDisconnected() {
+        MDMService.Log.i(Const.LOG_TAG, "Activity disconnected from Headwind MDM");
     }
 
-    public class MDMReconnectRunnable implements Runnable {
-        @Override
-        public void run() {
-            if (!mdmService.connect(MainActivity.this, MainActivity.this)) {
-                // Retry in 1 minute
-                MDMService.Log.i(Const.LOG_TAG, "Failed to connect to Headwind MDM, scheduling connection");
-                new Handler().postDelayed(this, Const.HMDM_RECONNECT_DELAY_NEXT);
-            }
-        }
+    @Override
+    public void onHeadwindMDMConfigChanged() {
+        // Settings were changed on the server, you need to reload them
+        MDMService.Log.i(Const.LOG_TAG, "Reloading configuration from Headwind MDM");
+        queryMdm();
     }
 
     public static class MessageViewHolder extends RecyclerView.ViewHolder {

app/src/main/java/com/hmdm/pager/Const.java

@@ -19,6 +19,7 @@
 
 package com.hmdm.pager.http.json;
 
+import android.annotation.SuppressLint;
 import android.database.Cursor;
 
 import org.json.JSONException;
@@ -47,6 +48,7 @@ public Message() {
         initDefaults();
     }
 
+    @SuppressLint("Range")
     public Message(Cursor cursor) {
         setId(cursor.getInt(cursor.getColumnIndex("_id")));
         setTs(cursor.getLong(cursor.getColumnIndex("ts")));