safeDispatch/build.gradle

@@ -25,7 +25,7 @@ android {
     buildToolsVersion "31.0.0"
 
     defaultConfig {
-        applicationId "com.safemobile.dispatch"
+        applicationId "com.safemobile.safedispatch"
         minSdkVersion 21
         targetSdkVersion 31
         versionName androidGitVersion.name()

safeDispatch/release/output-metadata.json

@@ -4,16 +4,16 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "com.safemobile.dispatch",
+  "applicationId": "com.safemobile.safedispatch",
   "variantName": "release",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 8000033,
-      "versionName": "8.0.33",
-      "outputFile": "SafeDispatchMobile_v.8.0.33-release.apk"
+      "versionCode": 8000035,
+      "versionName": "8.0.35",
+      "outputFile": "SafeDispatchMobile_v.8.0.35-release.apk"
     }
   ],
   "elementType": "File"

safeDispatch/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.safemobile.dispatch">
+    package="com.safemobile.safedispatch">
 
     <!-- require OpenGL ES version 2 for Google Maps -->
     <uses-feature
@@ -40,7 +40,7 @@
         <service android:name="com.safemobile.services.TCPService" />
 
         <activity
-            android:name=".SDMobileActivity"
+            android:name="com.safemobile.safedispatch.SDMobileActivity"
             android:configChanges="orientation"
             android:exported="true"
             android:label="@string/app_name_demo"
@@ -52,41 +52,41 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".SetupActivity"
+            android:name="com.safemobile.safedispatch.SetupActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".TabLayoutActivity"
+            android:name="com.safemobile.safedispatch.TabLayoutActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".LiveActivity"
+            android:name="com.safemobile.safedispatch.LiveActivity"
             android:exported="false"
             android:configChanges="orientation"
             android:screenOrientation="landscape"
             android:label="@string/title_activity_google_maps" />
         <activity
-            android:name=".HistoryActivity"
+            android:name="com.safemobile.safedispatch.HistoryActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".MessagesActivity"
+            android:name="com.safemobile.safedispatch.MessagesActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".AlarmActivity"
+            android:name="com.safemobile.safedispatch.AlarmActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".RadioActivity"
+            android:name="com.safemobile.safedispatch.RadioActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".RecordingsActivity"
+            android:name="com.safemobile.safedispatch.RecordingsActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".NotificationActivity"
+            android:name="com.safemobile.safedispatch.NotificationActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
     </application>

safeDispatch/src/main/java/com/safemobile/safedispatch/AlarmActivity.java

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import java.util.ArrayList;
 import java.util.Locale;

safeDispatch/src/main/java/com/safemobile/safedispatch/GoogleMapsInfoBubble.java

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.content.Context;
 import android.util.Log;

safeDispatch/src/main/java/com/safemobile/safedispatch/HistoryActivity.java

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;

safeDispatch/src/main/java/com/safemobile/safedispatch/IconContextMenu.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import java.util.ArrayList;
 

safeDispatch/src/main/java/com/safemobile/safedispatch/LiveActivity.java

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.app.AlertDialog;

safeDispatch/src/main/java/com/safemobile/safedispatch/MapDemo.java

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.os.Bundle;
 import androidx.fragment.app.FragmentActivity;

safeDispatch/src/main/java/com/safemobile/safedispatch/MessagesActivity.java

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.app.AlertDialog;

safeDispatch/src/main/java/com/safemobile/safedispatch/NotificationActivity.java

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.content.Intent;

safeDispatch/src/main/java/com/safemobile/safedispatch/RadioActivity.java

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.app.AlertDialog;

safeDispatch/src/main/java/com/safemobile/safedispatch/RecordingsActivity.java

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.app.AlertDialog;

safeDispatch/src/main/java/com/safemobile/safedispatch/SDMobileActivity.java

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.app.AlertDialog;

safeDispatch/src/main/java/com/safemobile/safedispatch/SDMobileActivity_beforeMod.java

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import java.util.ArrayList;
 import java.util.List;

safeDispatch/src/main/java/com/safemobile/safedispatch/SetupActivity.java

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import java.util.Locale;
 

safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import java.io.BufferedReader;
 import java.io.IOException;