.gitignore

@@ -184,6 +184,3 @@ $RECYCLE.BIN/
 /.idea/misc.xml
 /.idea
 /.idea/modules.xml
-
-/safeDispatch/debug
-/safeDispatch/release

safeDispatch/release/output-metadata.json

@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.safemobile.safedispatch",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 8000091,
+      "versionName": "8.0.91",
+      "outputFile": "SafeDispatchMobile_v.8.0.91-release.apk"
+    }
+  ],
+  "elementType": "File"
+}

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

@@ -101,7 +101,7 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
             timeGMT = vehicle.timeGMT;
             address = vehicle.Address != null ? vehicle.Address : "";
             name = vehicle.name;
-            speed = String.format(context.getResources().getString(R.string.speedMph), (int)(0.621371192 * vehicle.speed));
+            speed = String.format(context.getResources().getString(R.string.speedMph), vehicle.speed);
             gpsLocation = "[" + String.format("%.4f", vehicle.lat) + "," + String.format("%.4f",vehicle.lng) + "]";
         } else {
             HistPos histPos = histPosList.get(position);
@@ -109,7 +109,7 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
             //positionTime = new Date((new Date()).getTime() - histPos.timeGMT);
             timeGMT = histPos.timeGMT;
             address = histPos.Address != null ? histPos.Address : "";
-            speed = String.format(context.getResources().getString(R.string.speedMph),  (int)(0.621371192 * histPos.speed));
+            speed = String.format(context.getResources().getString(R.string.speedMph), histPos.speed);
             gpsLocation = "[" + String.format("%.4f", histPos.lat) + "," + String.format("%.4f",histPos.lng) + "]";
         }
 

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

@@ -2354,16 +2354,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 		// cancel old notification
 		mNotificationManager.cancel(icon);
 
-		PendingIntent pendingIntent;
+		PendingIntent pendingIntent = PendingIntent.getActivity(context, NOTIFICATION_ACTIVITY_RESULT, intent, PendingIntent.FLAG_CANCEL_CURRENT);
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-			pendingIntent = PendingIntent.getActivity(context, NOTIFICATION_ACTIVITY_RESULT, intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
-
-		}else {
-			pendingIntent = PendingIntent.getActivity(context, NOTIFICATION_ACTIVITY_RESULT, intent, PendingIntent.FLAG_CANCEL_CURRENT);
-
-		}
-
-
 		createNotificationChannel(icon, contentTitle, contentText, pendingIntent);
 	}