updated to support android 10 and fixed some bugs

Author: JobGetabu

README.md

@@ -125,7 +125,6 @@ allprojects {
 
 ## TODO 
 
-- [ ] Add library to jcenter
 - [x] migrate to androidX
 - [ ] Add kotlin docs
 - [ ] Creating geofences

app/build.gradle

@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId "ax.synt.droidlocation.demo"
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
-        versionName "2.0"
+        versionName "2.1"
     }
     buildTypes {
         release {
@@ -19,8 +19,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'androidx.appcompat:appcompat:1.0.2'
-    compile project(':droidLocationLibrary')
-    compile 'com.google.android.gms:play-services-location:16.0.0'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation project(':droidLocationLibrary')
+    implementation 'com.google.android.gms:play-services-location:16.0.0'
 }

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 

droidLocationLibrary/build.gradle

@@ -23,7 +23,7 @@ ext {
     siteUrl = 'https://github.com/syntaxltd/DroidLocation'
     gitUrl = 'https://github.com/syntaxltd/DroidLocation.git'
 
-    libraryVersion = '2.0.0'
+    libraryVersion = '2.0.1'
 
     developerId = 'JobGetabu'
     developerName = 'Job Getabu'
@@ -35,13 +35,13 @@ ext {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 2
-        versionName "2.0"
+        versionName "2.1"
     }
     buildTypes {
         release {
@@ -52,11 +52,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    provided "com.google.android.gms:play-services-location:16.0.0"
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    compileOnly "com.google.android.gms:play-services-location:16.0.0"
 
-    compile 'androidx.appcompat:appcompat:1.0.2'
+    api 'androidx.appcompat:appcompat:1.2.0'
 }
 
-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
+//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
+//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'

droidLocationLibrary/src/main/java/ax/synt/droidlocation/DroidLocationActivity.java

@@ -24,6 +24,7 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
+
         droidLocationDelegate.showLocationSettingDialog(requestCode);
     }
 

droidLocationLibrary/src/main/java/ax/synt/droidlocation/DroidLocationDelegate.java

@@ -136,6 +136,8 @@ public void onClick(DialogInterface dialogInterface, int i) {
     @Deprecated
     // warning: Use @
     private void showLocationServicesRequireDialog() {
+        if(droidLocationRequest == null) return;
+
         String title = TextUtils.isEmpty(droidLocationRequest.locationSettingsDialogTitle) ? activity.getString(R.string.location_services_off) : droidLocationRequest.locationSettingsDialogTitle;
         String message = TextUtils.isEmpty(droidLocationRequest.locationSettingsDialogMessage) ? activity.getString(R.string.open_location_settings) : droidLocationRequest.locationSettingsDialogMessage;
         String negativeButtonText = TextUtils.isEmpty(droidLocationRequest.locationSettingsDialogNegativeButtonText) ? activity.getString(android.R.string.cancel) : droidLocationRequest.locationSettingsDialogNegativeButtonText;
@@ -245,8 +247,10 @@ private void checkForPermissionAndRequestLocation(LocationRequest locationReques
                 showPermissionRequireDialog();
             else
                 requestPermission();
-        } else
+        } else{
+            if(droidLocationRequest == null) return;
             startLocationBGService(locationRequest, droidLocationRequest.fallBackToLastLocationTime);
+        }
     }
 
     private void unregisterLocationBroadcastReceiver() {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Apr 26 20:58:16 EAT 2019
+#Sun Oct 18 03:52:33 EAT 2020
 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-6.5-all.zip