io.appium.settings 3.2.1 → 3.3.0

package/app/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 28
-        versionCode 28
-        versionName "3.2.1"
+        versionCode 29
+        versionName "3.3.0"
         applicationId "io.appium.settings"
     }
 

package/app/src/main/java/io/appium/settings/LocationService.java

@@ -50,6 +50,7 @@ public class LocationService extends Service {
     private static final String LONGITUDE_PARAMETER_KEY = "longitude";
     private static final String LATITUDE_PARAMETER_KEY = "latitude";
     private static final String ALTITUDE_PARAMETER_KEY = "altitude";
+    private static final String SPEED_PARAMETER_KEY = "speed";
 
     private static final long UPDATE_INTERVAL_MS = 2000L;
 
@@ -197,6 +198,17 @@ public class LocationService extends Service {
             Log.e(TAG, String.format("altitude should be a valid number. '%s' is given instead",
                     intent.getStringExtra(ALTITUDE_PARAMETER_KEY)));
         }
+        try {
+            if (intent.hasExtra(SPEED_PARAMETER_KEY)) {
+                float speed = Float.valueOf(intent.getStringExtra(SPEED_PARAMETER_KEY));
+
+                locationFactory.setLocation(latitude, longitude, altitude, speed);
+                return;
+            }
+        } catch (NumberFormatException e) {
+            Log.e(TAG, String.format("speed should be a valid number larger then 0.0. '%s' is given instead",
+                    intent.getStringExtra(SPEED_PARAMETER_KEY)));
+        }
 
         locationFactory.setLocation(latitude, longitude, altitude);
     }

package/app/src/main/java/io/appium/settings/location/LocationFactory.java

@@ -25,6 +25,8 @@ public class LocationFactory {
     private double latitude;
     private double longitude;
     private double altitude;
+    private float speed;
+    private boolean hasSpeed = false;
 
 
     public synchronized Location createLocation(String providerName, float accuracy) {
@@ -34,7 +36,9 @@ public class LocationFactory {
         l.setLatitude(latitude);
         l.setLongitude(longitude);
         l.setAltitude(altitude);
-        l.setSpeed(0);
+        if (hasSpeed) {
+            l.setSpeed(speed);
+        }
         l.setBearing(0);
 
         l.setTime(System.currentTimeMillis());
@@ -44,9 +48,16 @@ public class LocationFactory {
         return l;
     }
 
+    public synchronized void setLocation(double latitude, double longitude, double altitude, float speed) {
+        this.setLocation(latitude, longitude, altitude);
+        this.speed = speed;
+        this.hasSpeed = true;
+    }
+
     public synchronized void setLocation(double latitude, double longitude, double altitude) {
         this.latitude = latitude;
         this.longitude = longitude;
         this.altitude = altitude;
+        this.hasSpeed = false;
     }
 }

package/app/src/main/java/io/appium/settings/receivers/LocationInfoReceiver.java

@@ -45,7 +45,7 @@ public class LocationInfoReceiver extends BroadcastReceiver
         if (location != null) {
             setResultCode(Activity.RESULT_OK);
             // Decimal separator is a dot
-            setResultData(String.format(Locale.US, "%.5f %.5f %.5f",
+            setResultData(String.format(Locale.US, "%.7f %.7f %.7f",
                     location.getLatitude(), location.getLongitude(), location.getAltitude()));
         } else {
             setResultCode(Activity.RESULT_CANCELED);

package/app/src/main/java/io/appium/settings/receivers/SmsReader.java

@@ -58,7 +58,10 @@ public class SmsReader extends BroadcastReceiver implements HasAction {
                 do {
                     JSONObject item = new JSONObject();
                     for (String[] entry : SMS_INFO_MAPPING) {
-                        item.put(entry[1], formatJsonNull(cursor.getString(cursor.getColumnIndex(entry[0]))));
+                        int columnIndex = cursor.getColumnIndex(entry[0]);
+                        if (columnIndex >= 0) {
+                            item.put(entry[1], formatJsonNull(cursor.getString(columnIndex)));
+                        }
                     }
                     items.put(item);
                 } while (cursor.moveToNext() && items.length() < maxCount);

package/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.0.2'
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "io.appium.settings",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "App for dealing with Android settings",
   "main": "index.js",
   "scripts": {