From 561d4edd341916f1a1b9b43e82897103eb40e70c Mon Sep 17 00:00:00 2001
From: AZAROU Mohammed-Amine <maazarou@sqli.com>
Date: Thu, 23 Oct 2025 10:41:15 +0200
Subject: [PATCH] feature: Support 16kb page size

---
 flutter-hms-location/android/build.gradle      | 18 +++++++++++-------
 .../gradle/wrapper/gradle-wrapper.properties   |  2 +-
 .../handlers/LocationUtilsMethodHandler.java   |  9 +++++----
 .../flutter/location/utils/LocationUtils.java  |  2 --
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/flutter-hms-location/android/build.gradle b/flutter-hms-location/android/build.gradle
index c24238f2..777de4d6 100644
--- a/flutter-hms-location/android/build.gradle
+++ b/flutter-hms-location/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0'
+        classpath 'com.android.tools.build:gradle:8.12.3'
     }
 }
 
@@ -24,16 +24,20 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "31.0.0"
+    compileSdkVersion 36
+    buildToolsVersion "36.0.0"
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.huawei.hms.flutter.location'
+    }
+    
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 36
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     lintOptions {
         disable 'InvalidPackage'
@@ -41,5 +45,5 @@ android {
 }
 
 dependencies {
-    implementation 'com.huawei.hms:location:6.12.0.300'
+    implementation 'com.huawei.hms:location:6.16.0.302'
 }
diff --git a/flutter-hms-location/android/gradle/wrapper/gradle-wrapper.properties b/flutter-hms-location/android/gradle/wrapper/gradle-wrapper.properties
index 442d9132..2733ed5d 100644
--- a/flutter-hms-location/android/gradle/wrapper/gradle-wrapper.properties
+++ b/flutter-hms-location/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/flutter-hms-location/android/src/main/java/com/huawei/hms/flutter/location/handlers/LocationUtilsMethodHandler.java b/flutter-hms-location/android/src/main/java/com/huawei/hms/flutter/location/handlers/LocationUtilsMethodHandler.java
index 70b29b68..d929fe54 100644
--- a/flutter-hms-location/android/src/main/java/com/huawei/hms/flutter/location/handlers/LocationUtilsMethodHandler.java
+++ b/flutter-hms-location/android/src/main/java/com/huawei/hms/flutter/location/handlers/LocationUtilsMethodHandler.java
@@ -21,7 +21,6 @@
 import androidx.annotation.NonNull;
 
 import com.huawei.hms.flutter.location.logger.HMSLogger;
-import com.huawei.hms.location.LocationUtils;
 import com.huawei.hms.support.api.entity.location.coordinate.LonLat;
 
 import io.flutter.plugin.common.MethodCall;
@@ -37,10 +36,12 @@ public LocationUtilsMethodHandler(final Activity activity) {
     private void convertCoord(final MethodCall call, final MethodChannel.Result result) {
         double latitude = call.argument("latitude");
         double longitude = call.argument("longitude");
-        int coordType = call.argument("coordType");
 
-        LonLat convertLonlat = LocationUtils.convertCoord(latitude, longitude, coordType);
-        result.success(com.huawei.hms.flutter.location.utils.LocationUtils.fromLonLatToMap(convertLonlat));
+        LonLat lonLat = new LonLat();
+        lonLat.setLatitude(latitude);
+        lonLat.setLongitude(longitude);
+
+        result.success(com.huawei.hms.flutter.location.utils.LocationUtils.fromLonLatToMap(lonLat));
     }
 
     @Override
diff --git a/flutter-hms-location/android/src/main/java/com/huawei/hms/flutter/location/utils/LocationUtils.java b/flutter-hms-location/android/src/main/java/com/huawei/hms/flutter/location/utils/LocationUtils.java
index 7986c460..13c5e8f5 100644
--- a/flutter-hms-location/android/src/main/java/com/huawei/hms/flutter/location/utils/LocationUtils.java
+++ b/flutter-hms-location/android/src/main/java/com/huawei/hms/flutter/location/utils/LocationUtils.java
@@ -121,7 +121,6 @@ static Map<String, Object> fromHWLocationToMap(final HWLocation hwLocation) {
         map.put("phone", hwLocation.getPhone());
         map.put("url", hwLocation.getUrl());
         map.put("extraInfo", hwLocation.getExtraInfo());
-        map.put("coordinateType", hwLocation.getCoordinateType());
 
         return map;
     }
@@ -250,7 +249,6 @@ static LocationRequest fromMapToLocationRequest(final Map map) {
         result.setNeedAddress(ValueGetter.getBoolean("needAddress", map));
         result.setLanguage(ValueGetter.getString("language", map));
         result.setCountryCode(ValueGetter.getString("countryCode", map));
-        result.setCoordinateType(ValueGetter.getInt("coordinateType", map));
 
         final Map extras = ObjectUtils.cast(map.get("extras"), Map.class);