diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6ec0841..11e6b47 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -23,7 +24,8 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/TrackbookAppTheme"> + android:theme="@style/TrackbookAppTheme" + tools:ignore="GoogleAppIndexingWarning"> diff --git a/app/src/main/java/org/y20k/trackbook/TrackerService.java b/app/src/main/java/org/y20k/trackbook/TrackerService.java index 6e16866..121685a 100755 --- a/app/src/main/java/org/y20k/trackbook/TrackerService.java +++ b/app/src/main/java/org/y20k/trackbook/TrackerService.java @@ -39,6 +39,9 @@ import android.os.IBinder; import android.preference.PreferenceManager; import android.widget.Toast; +import androidx.core.app.NotificationCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import org.y20k.trackbook.core.Track; import org.y20k.trackbook.helpers.LocationHelper; import org.y20k.trackbook.helpers.LogHelper; @@ -48,9 +51,6 @@ import org.y20k.trackbook.helpers.TrackbookKeys; import java.util.List; -import androidx.core.app.NotificationCompat; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; - import static android.hardware.Sensor.TYPE_STEP_COUNTER; @@ -414,7 +414,7 @@ public class TrackerService extends Service implements TrackbookKeys, SensorEven float averageSpeed = 0f; // compute average speed if new location came from network provider - if (trackSize > 1 && mCurrentBestLocation.getProvider().equals(LocationManager.NETWORK_PROVIDER)) { + if (trackSize > 1 && LocationManager.NETWORK_PROVIDER.equals(mCurrentBestLocation.getProvider())) { Location firstWayPoint = mTrack.getWayPointLocation(0); float distance = firstWayPoint.distanceTo(previousLocation); long timeDifference = previousLocation.getElapsedRealtimeNanos() - firstWayPoint.getElapsedRealtimeNanos(); diff --git a/build.gradle b/build.gradle index 36428b1..0cbbd32 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -27,8 +27,8 @@ allprojects { versionCode = 37 versionName = '1.2.3' - compileSdkVersion = 28 - targetSdkVersion = 27 + compileSdkVersion = 29 + targetSdkVersion = 29 minSdkVersion = 22 constraintlayoutVersion = '1.1.3' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e7fef96..ba57b94 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 24 13:40:20 CEST 2019 +#Mon Sep 09 18:28:26 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip