Сравнить коммиты

...
4 Коммитов
Автор SHA1 Сообщение Дата
Anton Tananaev 290a7d80eb Update app version number 2018-01-19 17:43:43 +13:00
Anton Tananaev 44228feb2f Fix SOS functionality 2018-01-19 17:43:18 +13:00
Anton Tananaev d887bc4119 Update version number 2018-01-09 08:26:19 +13:00
Anton Tananaev c892a20104 Fix lost API connection logic 2018-01-09 08:25:57 +13:00
3 изменённых файлов: 19 добавлений и 10 удалений
+2 -2
Просмотреть файл
@@ -9,8 +9,8 @@ android {
buildConfigField "boolean", "HIDDEN_APP", "false" buildConfigField "boolean", "HIDDEN_APP", "false"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 27 targetSdkVersion 27
versionCode 43 versionCode 45
versionName '5.6' versionName '5.8'
} }
lintOptions { lintOptions {
+16 -8
Просмотреть файл
@@ -53,6 +53,8 @@ public class PositionProvider implements LostApiClient.ConnectionCallbacks, Loca
private Location lastLocation; private Location lastLocation;
private boolean started;
public PositionProvider(Context context, PositionListener listener) { public PositionProvider(Context context, PositionListener listener) {
this.context = context; this.context = context;
this.listener = listener; this.listener = listener;
@@ -66,6 +68,7 @@ public class PositionProvider implements LostApiClient.ConnectionCallbacks, Loca
} }
public void startUpdates() { public void startUpdates() {
started = true;
apiClient = new LostApiClient.Builder(context).addConnectionCallbacks(this).build(); apiClient = new LostApiClient.Builder(context).addConnectionCallbacks(this).build();
apiClient.connect(); apiClient.connect();
} }
@@ -84,11 +87,14 @@ public class PositionProvider implements LostApiClient.ConnectionCallbacks, Loca
@SuppressLint("MissingPermission") @SuppressLint("MissingPermission")
@Override @Override
public void onConnected() { public void onConnected() {
LocationRequest request = LocationRequest.create() if (started) {
.setPriority(getPriority(preferences.getString(MainFragment.KEY_ACCURACY, "medium"))) LocationRequest request = LocationRequest.create()
.setInterval(distance > 0 || angle > 0 ? MINIMUM_INTERVAL : interval); .setPriority(getPriority(preferences.getString(MainFragment.KEY_ACCURACY, "medium")))
.setInterval(distance > 0 || angle > 0 ? MINIMUM_INTERVAL : interval);
LocationServices.FusedLocationApi.requestLocationUpdates(apiClient, request, this); LocationServices.FusedLocationApi.requestLocationUpdates(apiClient, request, this);
} else {
apiClient.disconnect();
}
} }
@Override @Override
@@ -111,9 +117,11 @@ public class PositionProvider implements LostApiClient.ConnectionCallbacks, Loca
} }
public void stopUpdates() { public void stopUpdates() {
LocationServices.FusedLocationApi.removeLocationUpdates(apiClient, this); if (apiClient.isConnected()) {
LocationServices.FusedLocationApi.removeLocationUpdates(apiClient, this);
apiClient.disconnect(); apiClient.disconnect();
}
started = false;
} }
public static double getBatteryLevel(Context context) { public static double getBatteryLevel(Context context) {
+1
Просмотреть файл
@@ -104,6 +104,7 @@ public class ShortcutActivity extends AppCompatActivity implements LostApiClient
private void sendAlarm() { private void sendAlarm() {
apiClient = new LostApiClient.Builder(this).addConnectionCallbacks(this).build(); apiClient = new LostApiClient.Builder(this).addConnectionCallbacks(this).build();
apiClient.connect();
} }
@SuppressWarnings("MissingPermission") @SuppressWarnings("MissingPermission")