location detection imp

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "com.utsmm.kbz"
         minSdk 24
         targetSdk 33
-        versionCode 1
-        versionName "1.0"
+        versionCode 21
+        versionName "2.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

app/src/main/AndroidManifest.xml

@@ -35,6 +35,10 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+
 
     <!--    android:noHistory="true"-->
     <!--    android:excludeFromRecents="true"-->

app/src/main/java/com/utsmm/kbz/MainActivity.java

@@ -32,6 +32,7 @@ import com.nexgo.downloadkey.downloadflow.DownloadFlowResultEntity;
 import com.nexgo.downloadkey.downloadflow.DownloadResult;
 import com.nexgo.oaf.apiv3.device.pinpad.PinPad;
 import com.nexgo.oaf.apiv3.device.pinpad.WorkKeyTypeEnum;
+import com.utsmm.kbz.util.LocationUtil;
 import com.utsmyanmar.baselib.BaseApplication;
 import com.utsmyanmar.baselib.repo.Repository;
 import com.utsmyanmar.baselib.ui.AnimationDialog;
@@ -157,10 +158,10 @@ public class MainActivity extends AppCompatActivity implements
     }
 
     private void initKey(){
-        SystemParamsOperation.getInstance().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius");
-//        SystemParamsOperation.getInstance().setTmsAddress("https://sirius-nest.utsmyanmar.com");
-        SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt");
-//        SystemParamsOperation.getInstance().setEReceiptAddress("https://receipt-nest.utsmyanmar.com");
+//        SystemParamsOperation.getInstance().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius");
+        SystemParamsOperation.getInstance().setTmsAddress("https://sirius-nest.utsmyanmar.com");
+//        SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt");
+        SystemParamsOperation.getInstance().setEReceiptAddress("https://receipt-nest.utsmyanmar.com");
 
         PinPad pinPad = MyApplication.getInstance().deviceEngine.getPinPad();
         byte[] encryptedPIK = SystemParamsOperation.getInstance().getPIK();
@@ -427,7 +428,7 @@ public class MainActivity extends AppCompatActivity implements
     @Override
     public void onResume() {
         super.onResume();
-
+        getLocation();
         SystemParamsOperation.getInstance().setSetupEcr(false);
         SystemParamsOperation.getInstance().setDownloadedParams(false);
 
@@ -450,6 +451,24 @@ public class MainActivity extends AppCompatActivity implements
         handleAutoSettlementIntent(intent);
     }
 
+    public void getLocation() {
+        LocationUtil.getCurrentLocation(MainActivity.this, new LocationUtil.LocationCallback() {
+            @Override
+            public void onSuccess(double lat, double lng) {
+                LogUtil.d("Location", "Current Location: " + lat + ", " + lng);
+                LocationUtil.setLat(lat);
+                LocationUtil.setLng(lng);
+            }
+
+            @Override
+            public void onError(String reason) {
+                LogUtil.e("Location", "get Location error: " + reason);
+                LocationUtil.setLat(0.00);
+                LocationUtil.setLng(0.00);
+            }
+        });
+    }
+
     private void handleAutoSettlementIntent(Intent intent) {
         if (intent == null) return;
         

app/src/main/java/com/utsmm/kbz/ui/SettingsFragment.java

@@ -13,6 +13,7 @@ import androidx.navigation.Navigation;
 
 import com.google.gson.Gson;
 import com.google.gson.stream.MalformedJsonException;
+import com.utsmm.kbz.MainActivity;
 import com.utsmm.kbz.config.Constants;
 import com.nexgo.downloadkey.downloadflow.DownloadFEntity;
 import com.nexgo.downloadkey.downloadflow.DownloadFlow;
@@ -377,6 +378,9 @@ public class SettingsFragment extends DataBindingFragment {
     private void downloadParams(String lastTransName, String lastTransTime) {
         try {
             LogUtil.d(TAG, "Downloading params for transaction: " + lastTransName);
+
+            ((MainActivity) requireActivity()).getLocation();
+
             SiriusRequest siriusReq = TMSUtil.getInstance().generateRequestParams(getContext(), lastTransName, lastTransTime);
 
             mainViewModel.getParams(siriusReq)

app/src/main/java/com/utsmm/kbz/ui/core_ui/TransactionResultFragment.java

@@ -10,6 +10,8 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.stream.MalformedJsonException;
+import com.utsmm.kbz.MainActivity;
+import com.utsmm.kbz.util.LocationUtil;
 import com.utsmyanmar.baselib.emv.EmvParamOperation;
 import com.utsmyanmar.baselib.fragment.DataBindingFragment;
 import com.utsmyanmar.baselib.network.model.sirius.SiriusError;
@@ -156,6 +158,8 @@ public class TransactionResultFragment extends DataBindingFragment implements Da
                     return;
                 }
 
+                ((MainActivity) requireActivity()).getLocation();
+
                 SiriusRequest siriusReq = TMSUtil.getInstance().generateRequestParams(
                         getContext(),
                         payDetail.getTransType(),

app/src/main/java/com/utsmm/kbz/ui/disabled/DisabledTerminalFragment.java

@@ -4,6 +4,7 @@ import androidx.databinding.library.baseAdapters.BR;
 import androidx.lifecycle.Observer;
 
 import com.google.gson.stream.MalformedJsonException;
+import com.utsmm.kbz.MainActivity;
 import com.utsmyanmar.baselib.emv.EmvParamOperation;
 import com.utsmyanmar.baselib.fragment.DataBindingFragment;
 import com.utsmyanmar.baselib.network.model.sirius.SiriusRequest;
@@ -104,6 +105,7 @@ public class DisabledTerminalFragment extends DataBindingFragment {
 
     private void downloadParams(String lastTransName,String lastTransTime) {
         showLoadingDialog("Downloading...");
+        ((MainActivity) requireActivity()).getLocation();
         SiriusRequest siriusReq = TMSUtil.getInstance().generateRequestParams(getContext(),lastTransName,lastTransTime);
         mainViewModel.getParams(siriusReq).subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java

@@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider;
 import androidx.navigation.fragment.NavHostFragment;
 
 import com.utsmm.kbz.BR;
+import com.utsmm.kbz.MainActivity;
 import com.utsmm.kbz.MainViewModel;
 import com.utsmm.kbz.R;
 import com.utsmm.kbz.config.Constants;

app/src/main/java/com/utsmm/kbz/ui/qr_pay/RefundCertificateManager.java

@@ -42,8 +42,8 @@ public class RefundCertificateManager {
                 return;
             };
 
-//            String downloadBase = tmsAddress.trim() + "/api/v1/file/download?filePath="; //local
-            String downloadBase = tmsAddress.trim() + "/file/download?filePath="; // uat and prod
+            String downloadBase = tmsAddress.trim() + "/api/v1/file/download?filePath="; //local
+//            String downloadBase = tmsAddress.trim() + "/file/download?filePath="; // uat and prod
 
             String certUrl = SystemParamsOperation.getInstance().getCertificateUrl();
             String clientCertUrl = SystemParamsOperation.getInstance().getCertificateClientUrl();

app/src/main/java/com/utsmm/kbz/ui/tms/TMSProcessFragment.java

@@ -15,6 +15,7 @@ import androidx.annotation.Nullable;
 
 import com.google.gson.Gson;
 import com.google.gson.stream.MalformedJsonException;
+import com.utsmm.kbz.MainActivity;
 import com.utsmm.kbz.service.AutoAlarmReceiver;
 import com.utsmyanmar.baselib.fragment.DataBindingFragment;
 import com.utsmyanmar.baselib.network.model.sirius.SiriusError;
@@ -139,6 +140,8 @@ public class TMSProcessFragment extends DataBindingFragment {
 
     private void downloadParams(String lastTransName,String lastTransTime,TMSUpdate tmsUpdate) {
 
+        ((MainActivity) requireActivity()).getLocation();
+
         tmsProcessViewModel.setTmsDownloadStatus(TMSDownloadStatus.DOWNLOADING);
         tmsProcessViewModel.setTmsDownloadMsg("Downloading...");
 

app/src/main/java/com/utsmm/kbz/util/LocationUtil.java

@@ -0,0 +1,111 @@
+package com.utsmm.kbz.util;
+
+import android.Manifest;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+
+public class LocationUtil {
+    public interface LocationCallback {
+        void onSuccess(double lat, double lng);
+        void onError(String reason);
+    }
+
+    private static LocationListener listener;
+    private static double lat = 0.00;
+    private static double lng = 0.00;
+
+    public static void getCurrentLocation(
+            @NonNull Activity activity,
+            @NonNull LocationCallback callback) {
+
+        LocationManager lm =
+                (LocationManager) activity.getSystemService(Context.LOCATION_SERVICE);
+
+        if (lm == null) {
+            callback.onError("LocationManager is null");
+            return;
+        }
+
+        if (ActivityCompat.checkSelfPermission(activity,
+                Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+
+            ActivityCompat.requestPermissions(
+                    activity,
+                    new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
+                    201
+            );
+            callback.onError("Permission not granted");
+            return;
+        }
+
+        boolean gpsEnabled = lm.isProviderEnabled(LocationManager.GPS_PROVIDER);
+        boolean netEnabled = lm.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
+
+        if (!gpsEnabled && !netEnabled) {
+            callback.onError("No location provider enabled");
+            return;
+        }
+
+        Location location = lm.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+        if (location == null) {
+            location = lm.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
+        }
+
+        if (location != null) {
+            callback.onSuccess(location.getLatitude(), location.getLongitude());
+            return;
+        }
+
+        listener = new LocationListener() {
+            @Override
+            public void onLocationChanged(@NonNull Location location) {
+                callback.onSuccess(
+                        location.getLatitude(),
+                        location.getLongitude()
+                );
+                lm.removeUpdates(this); // 🔥 stop GPS
+            }
+        };
+
+        lm.requestLocationUpdates(
+                LocationManager.GPS_PROVIDER,
+                2000,
+                1,
+                listener
+        );
+    }
+
+    public static void stop(Context context) {
+        if (listener != null) {
+            LocationManager lm =
+                    (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+            if (lm != null) lm.removeUpdates(listener);
+            listener = null;
+        }
+    }
+
+    public static double getLat() {
+        return lat;
+    }
+
+    public static double getLng() {
+        return lng;
+    }
+
+    public static void setLat(double lat) {
+        LocationUtil.lat = lat;
+    }
+
+    public static void setLng(double lng) {
+        LocationUtil.lng = lng;
+    }
+
+}

app/src/main/java/com/utsmm/kbz/util/tms/TMSUtil.java

@@ -7,6 +7,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.kizzy.xpay.XPay;
+import com.utsmm.kbz.util.LocationUtil;
 import com.utsmyanmar.baselib.emv.EmvParamOperation;
 import com.utsmyanmar.baselib.network.model.sirius.SiriusRequest;
 import com.utsmyanmar.baselib.network.model.sirius.SiriusResponse;
@@ -139,6 +140,7 @@ public class TMSUtil {
 
     public SiriusRequest generateRequestParams(Context context,String lastTransName,String lastTransTime) {
 
+
         SiriusRequest siriusRequest = new SiriusRequest();
         siriusRequest.setSerial(getSerialNumber());
         siriusRequest.setAppPackage(BuildConfig.APPLICATION_ID);
@@ -148,6 +150,8 @@ public class TMSUtil {
         siriusRequest.setCurrentNetwork(getNetworkType(context));
         siriusRequest.setLastTransaction(lastTransName);
         siriusRequest.setLastTranTime(Long.parseLong(lastTransTime));
+        siriusRequest.setLatitude(LocationUtil.getLat());
+        siriusRequest.setLongitude(LocationUtil.getLng());
         siriusRequest.setValue("YourValueHere");
 
         return siriusRequest;

baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java

@@ -287,8 +287,8 @@ public class NetworkModule {
             tmsAddress = getTMSUrlFromNative();
         }
 
-//        String baseUrl = tmsAddress.trim() + "/api/v1/"; //for on prim
-        String baseUrl = tmsAddress.trim() + "/"; //for uat and prod
+        String baseUrl = tmsAddress.trim() + "/api/v1/"; //for on prim
+//        String baseUrl = tmsAddress.trim() + "/"; //for uat and prod
 
         final Gson gson =
                 new GsonBuilder().create();

baselib/src/main/java/com/utsmyanmar/baselib/network/model/sirius/SiriusRequest.java

@@ -18,9 +18,23 @@ public class SiriusRequest {
     private Long lastTranTime;
 
     private String value;
+    private double latitude;
+    private double longitude;
 
     public SiriusRequest() {}
-    public SiriusRequest(String serial, String appPackage, String androidVersion, String firmwareVersion, String applicationVersion, String currentNetwork, String lastTransaction, Long lastTranTime, String value) {
+    public SiriusRequest(
+            String serial,
+            String appPackage,
+            String androidVersion,
+            String firmwareVersion,
+            String applicationVersion,
+            String currentNetwork,
+            String lastTransaction,
+            Long lastTranTime,
+            double latitude,
+            double longitude,
+            String value
+    ) {
         this.serial = serial;
         this.appPackage = appPackage;
         this.androidVersion = androidVersion;
@@ -29,6 +43,8 @@ public class SiriusRequest {
         this.currentNetwork = currentNetwork;
         this.lastTransaction = lastTransaction;
         this.lastTranTime = lastTranTime;
+        this.latitude = latitude;
+        this.longitude = longitude;
         this.value = value;
     }
 
@@ -100,6 +116,22 @@ public class SiriusRequest {
         return value;
     }
 
+    public double getLatitude(){
+        return latitude;
+    }
+
+    public double getLongitude(){
+        return longitude;
+    }
+
+    public void setLatitude(double latitude){
+        this.latitude = latitude;
+    }
+
+    public void setLongitude(double longitude){
+        this.longitude = longitude;
+    }
+
     public void setValue(String value) {
         this.value = value;
     }

paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java

@@ -42,10 +42,10 @@ public class SystemParamsSettings implements Serializable {
 
 //    private String tmsAddress = "https://tms.smile-mm.com";
 //    private String tmsAddress = "http://128.199.170.203";
-//    private String tmsAddress = "https://sirius-nest.utsmyanmar.com";
-    private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; //for uat
-//    private String ereceiptAddress = "https://receipt-nest.utsmyanmar.com"; //for on prime
-    private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt"; //for uat
+    private String tmsAddress = "https://sirius-nest.utsmyanmar.com";
+//    private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; //for uat
+    private String ereceiptAddress = "https://receipt-nest.utsmyanmar.com"; //for on prime
+//    private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt"; //for uat
 
     private String binValues = "";