Fixes 182 and removed deprecation warnings. Upgrades compileSDKVersion

Author: TimHoogstrate

geocoding_android/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.0.0
+
+* **BREAKING CHANGES**:
+  * Updates `compileSdk' (compileSdkVersion) from 33 to 34.
+  * Fixes deprecation build warnings. 
+
 ## 3.0.0
 
 * **BREAKING CHANGES**:

geocoding_android/android/build.gradle

@@ -26,7 +26,7 @@ android {
         namespace("com.baseflow.geocoding")
     }
 
-    compileSdkVersion 33
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

geocoding_android/android/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true

geocoding_android/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Tue Jan 30 14:47:38 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

geocoding_android/android/src/main/java/com/baseflow/geocoding/Geocoding.java

@@ -4,8 +4,10 @@
 import android.content.Context;
 import android.location.Address;
 import android.location.Geocoder;
-
+import android.os.Build;
+import androidx.annotation.RequiresApi;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
@@ -34,10 +36,27 @@ void setLocaleIdentifier(@Nullable Locale locale) {
      * @return a list of Address objects. Returns null or empty list if no matches were found or there is no backend service available.
      * @throws java.io.IOException if the network is unavailable or any other I/O problem occurs.
      */
+    @SuppressWarnings("deprecation")
     List<Address> placemarkFromAddress(String address) throws IOException {
-
         final Geocoder geocoder = createGeocoder(androidContext, locale);
-        return geocoder.getFromLocationName(address, 5);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            return getAddressesWithGeocodeListener(geocoder, address, 5);
+        } else {
+            return geocoder.getFromLocationName(address, 5);
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.TIRAMISU)
+    private List<Address> getAddressesWithGeocodeListener(Geocoder geocoder, String address, int maxResults) {
+        List<Address> addresses = new ArrayList<>();
+        geocoder.getFromLocationName(address, maxResults, new Geocoder.GeocodeListener() {
+            @Override
+            public void onGeocode(List<Address> geocodedAddresses) {
+                addresses.addAll(geocodedAddresses);
+            }
+        });
+        return addresses;
     }
 
     /**
@@ -48,12 +67,29 @@ List<Address> placemarkFromAddress(String address) throws IOException {
      * @return a list of Address objects. Returns null or empty list if no matches were found or there is no backend service available.
      * @throws IOException if the network is unavailable or any other I/O problem occurs.
      */
+    @SuppressWarnings("deprecation")
     List<Address> placemarkFromCoordinates(
             double latitude,
             double longitude
     ) throws IOException {
         final Geocoder geocoder = createGeocoder(androidContext, locale);
-        return geocoder.getFromLocation(latitude, longitude, 5);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            return getLocationWithGeocodeListener(geocoder, latitude, longitude, 5);
+        } else {
+            return geocoder.getFromLocation(latitude, longitude, 5);
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.TIRAMISU)
+    private List<Address> getLocationWithGeocodeListener(Geocoder geocoder, double latitude, double longitude, int maxResults) {
+        List<Address> addresses = new ArrayList<>();
+        geocoder.getFromLocation(latitude, longitude, maxResults, new Geocoder.GeocodeListener() {
+            @Override
+            public void onGeocode(List<Address> geocodedAddresses) {
+                addresses.addAll(geocodedAddresses);
+            }
+        });
+        return addresses;
     }
 
     private static Geocoder createGeocoder(Context androidContext, @Nullable Locale locale) {

geocoding_android/pubspec.yaml

@@ -1,6 +1,6 @@
 name: geocoding_android
 description: A Flutter Geocoding plugin which provides easy geocoding and reverse-geocoding features.
-version: 3.0.0
+version: 4.0.0
 repository: https://github.com/baseflow/flutter-geocoding/tree/main/geocoding_android
 issue_tracker: https://github.com/Baseflow/flutter-geocoding/issues