Merge pull request #101 from makeen-project/ALS-1806

ALS 1806 Map style change bug fixes
makeen-project · Sep 11, 2024 · 539397d · 539397d
2 parents 57017f3 + 696fb7f
commit 539397d
Show file tree

Hide file tree

Showing 13 changed files with 92 additions and 8 deletions.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -40,6 +40,9 @@ jobs:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '20'
 
       - name: Setup Bundler
         run: |

diff --git a/app/src/main/java/com/aws/amazonlocation/ui/main/MainActivity.kt b/app/src/main/java/com/aws/amazonlocation/ui/main/MainActivity.kt
@@ -1283,4 +1283,11 @@ class MainActivity :
             mBinding.bottomNavigationMain.selectedItemId = R.id.menu_tracking
         }
     }
+
+    fun initClient(){
+        mAWSLocationHelper.locationCredentialsProvider?.clear()
+        CoroutineScope(Dispatchers.IO).launch {
+            async { initMobileClient() }.await()
+        }
+    }
 }
diff --git a/app/src/main/java/com/aws/amazonlocation/ui/main/data_provider/DataProviderFragment.kt b/app/src/main/java/com/aws/amazonlocation/ui/main/data_provider/DataProviderFragment.kt
@@ -13,8 +13,10 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.aws.amazonlocation.BuildConfig
 import com.aws.amazonlocation.R
+import com.aws.amazonlocation.data.enum.AuthEnum
 import com.aws.amazonlocation.databinding.FragmentDataProviderBinding
 import com.aws.amazonlocation.ui.base.BaseFragment
+import com.aws.amazonlocation.utils.KEY_CLOUD_FORMATION_STATUS
 import com.aws.amazonlocation.utils.KEY_GRAB_DONT_ASK
 import com.aws.amazonlocation.utils.KEY_MAP_NAME
 import com.aws.amazonlocation.utils.KEY_MAP_STYLE_NAME
@@ -173,7 +175,7 @@ class DataProviderFragment : BaseFragment() {
             ),
             mPreferenceManager.getValue(KEY_NEAREST_REGION, "")
         )
-        val isRestartNeeded =
+        var isRestartNeeded =
             if (defaultIdentityPoolId == BuildConfig.DEFAULT_IDENTITY_POOL_ID_AP) {
                 false
             } else {
@@ -183,6 +185,10 @@ class DataProviderFragment : BaseFragment() {
                     !isGrab
                 }
             }
+        val mAuthStatus = mPreferenceManager.getValue(KEY_CLOUD_FORMATION_STATUS, "")
+        if (mAuthStatus == AuthEnum.SIGNED_IN.name || mAuthStatus == AuthEnum.AWS_CONNECTED.name) {
+            isRestartNeeded = false
+        }
         if (isGrab) {
             val shouldShowGrabDialog = !mPreferenceManager.getValue(KEY_GRAB_DONT_ASK, false)
             if (shouldShowGrabDialog) {

diff --git a/app/src/main/java/com/aws/amazonlocation/ui/main/explore/ExploreFragment.kt b/app/src/main/java/com/aws/amazonlocation/ui/main/explore/ExploreFragment.kt
@@ -5989,7 +5989,7 @@ class ExploreFragment :
                 ),
                 mPreferenceManager.getValue(KEY_NEAREST_REGION, ""),
             )
-        val isRestartNeeded =
+        var isRestartNeeded =
             if (defaultIdentityPoolId == BuildConfig.DEFAULT_IDENTITY_POOL_ID_AP) {
                 false
             } else {
@@ -5999,6 +5999,10 @@ class ExploreFragment :
                     selectedProvider != getString(R.string.grab)
                 }
             }
+        val mAuthStatus = mPreferenceManager.getValue(KEY_CLOUD_FORMATION_STATUS, "")
+        if (mAuthStatus == AuthEnum.SIGNED_IN.name || mAuthStatus == AuthEnum.AWS_CONNECTED.name) {
+            isRestartNeeded = false
+        }
         if (selectedProvider == getString(R.string.grab) && mapName != getString(R.string.grab)) {
             val shouldShowGrabDialog = !mPreferenceManager.getValue(KEY_GRAB_DONT_ASK, false)
             if (shouldShowGrabDialog) {

diff --git a/app/src/main/java/com/aws/amazonlocation/ui/main/map_style/MapStyleBottomSheetFragment.kt b/app/src/main/java/com/aws/amazonlocation/ui/main/map_style/MapStyleBottomSheetFragment.kt
@@ -435,7 +435,7 @@ class MapStyleBottomSheetFragment(
             cardOpenData.setOnClickListener {
                 val mapName = mPreferenceManager.getValue(KEY_MAP_NAME, getString(R.string.map_esri))
                 if (mapName != getString(R.string.open_data)) {
-                    mapInterface.mapStyleClick(3, 0)
+                    mapInterface.mapStyleClick(if (!isGrabMapEnable(mPreferenceManager)) 2 else 3, 0)
                 }
             }
             cardGrabMap.setOnClickListener {

diff --git a/app/src/main/java/com/aws/amazonlocation/ui/main/map_style/MapStyleFragment.kt b/app/src/main/java/com/aws/amazonlocation/ui/main/map_style/MapStyleFragment.kt
@@ -19,11 +19,13 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.aws.amazonlocation.BuildConfig
 import com.aws.amazonlocation.R
+import com.aws.amazonlocation.data.enum.AuthEnum
 import com.aws.amazonlocation.databinding.FragmentMapStyleBinding
 import com.aws.amazonlocation.ui.base.BaseFragment
 import com.aws.amazonlocation.ui.main.MainActivity
 import com.aws.amazonlocation.ui.main.explore.SortingAdapter
 import com.aws.amazonlocation.utils.DELAY_300
+import com.aws.amazonlocation.utils.KEY_CLOUD_FORMATION_STATUS
 import com.aws.amazonlocation.utils.KEY_GRAB_DONT_ASK
 import com.aws.amazonlocation.utils.KEY_MAP_NAME
 import com.aws.amazonlocation.utils.KEY_MAP_STYLE_NAME
@@ -238,7 +240,7 @@ class MapStyleFragment : BaseFragment() {
             ),
             mPreferenceManager.getValue(KEY_NEAREST_REGION, "")
         )
-        val isRestartNeeded =
+        var isRestartNeeded =
             if (defaultIdentityPoolId == BuildConfig.DEFAULT_IDENTITY_POOL_ID_AP) {
                 false
             } else {
@@ -248,6 +250,10 @@ class MapStyleFragment : BaseFragment() {
                     selectedProvider != getString(R.string.grab)
                 }
             }
+        val mAuthStatus = mPreferenceManager.getValue(KEY_CLOUD_FORMATION_STATUS, "")
+        if (mAuthStatus == AuthEnum.SIGNED_IN.name || mAuthStatus == AuthEnum.AWS_CONNECTED.name) {
+            isRestartNeeded = false
+        }
         if (selectedProvider == getString(R.string.grab) && mapName != getString(R.string.grab)) {
             val shouldShowGrabDialog = !mPreferenceManager.getValue(KEY_GRAB_DONT_ASK, false)
             if (shouldShowGrabDialog) {

diff --git a/app/src/main/java/com/aws/amazonlocation/ui/main/setting/AWSCloudInformationFragment.kt b/app/src/main/java/com/aws/amazonlocation/ui/main/setting/AWSCloudInformationFragment.kt
@@ -11,6 +11,7 @@ import android.widget.AdapterView
 import androidx.core.widget.doOnTextChanged
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
+import com.aws.amazonlocation.BuildConfig
 import com.aws.amazonlocation.R
 import com.aws.amazonlocation.data.enum.AuthEnum
 import com.aws.amazonlocation.data.enum.TabEnum
@@ -25,9 +26,11 @@ import com.aws.amazonlocation.utils.IS_LOCATION_TRACKING_ENABLE
 import com.aws.amazonlocation.utils.KEY_CLOUD_FORMATION_STATUS
 import com.aws.amazonlocation.utils.KEY_MAP_NAME
 import com.aws.amazonlocation.utils.KEY_MAP_STYLE_NAME
+import com.aws.amazonlocation.utils.KEY_NEAREST_REGION
 import com.aws.amazonlocation.utils.KEY_POOL_ID
 import com.aws.amazonlocation.utils.KEY_RE_START_APP
 import com.aws.amazonlocation.utils.KEY_RE_START_APP_WITH_AWS_DISCONNECT
+import com.aws.amazonlocation.utils.KEY_SELECTED_REGION
 import com.aws.amazonlocation.utils.KEY_TAB_ENUM
 import com.aws.amazonlocation.utils.KEY_URL
 import com.aws.amazonlocation.utils.KEY_USER_DOMAIN
@@ -45,6 +48,7 @@ import com.aws.amazonlocation.utils.disconnectFromAWSDialog
 import com.aws.amazonlocation.utils.hide
 import com.aws.amazonlocation.utils.hideViews
 import com.aws.amazonlocation.utils.isGrabMapSelected
+import com.aws.amazonlocation.utils.regionDisplayName
 import com.aws.amazonlocation.utils.regionMapList
 import com.aws.amazonlocation.utils.show
 import com.aws.amazonlocation.utils.showViews
@@ -139,6 +143,7 @@ class AWSCloudInformationFragment :
         if (isDisconnectFromAWSRequired) {
             mPreferenceManager.setDefaultConfig()
         }
+        checkMapRefreshClient()
         init()
         showError(getString(R.string.sign_out_successfully))
     }
@@ -278,6 +283,7 @@ class AWSCloudInformationFragment :
                     mPreferenceManager.setValue(KEY_RE_START_APP_WITH_AWS_DISCONNECT, true)
                     mPreferenceManager.setDefaultConfig()
                 }
+                checkMapRefreshClient()
                 (activity as MainActivity).refreshSettings()
                 init()
                 dialog.dismiss()
@@ -288,6 +294,28 @@ class AWSCloudInformationFragment :
             }
         }
 
+    private fun checkMapRefreshClient() {
+        val mapName = mPreferenceManager.getValue(KEY_MAP_NAME, getString(R.string.map_esri))
+        val defaultIdentityPoolId: String =
+            Units.getDefaultIdentityPoolId(
+                mPreferenceManager.getValue(
+                    KEY_SELECTED_REGION,
+                    regionDisplayName[0],
+                ),
+                mPreferenceManager.getValue(KEY_NEAREST_REGION, ""),
+            )
+        if (defaultIdentityPoolId != BuildConfig.DEFAULT_IDENTITY_POOL_ID_AP) {
+            if (mapName == getString(R.string.grab)) {
+                mPreferenceManager.setValue(
+                    KEY_MAP_STYLE_NAME,
+                    resources.getString(R.string.map_light),
+                )
+                mPreferenceManager.setValue(KEY_MAP_NAME, resources.getString(R.string.esri))
+            }
+        }
+        (activity as MainActivity).initClient()
+    }
+
     private fun validateAWSAccountData() {
         CoroutineScope(Dispatchers.IO).launch {
             if (!validateIdentityPoolId(mIdentityPoolId, regionData)) {
@@ -370,6 +398,7 @@ class AWSCloudInformationFragment :
                 mPreferenceManager.setValue(KEY_MAP_NAME, resources.getString(R.string.esri))
             }
         }
+        (activity as MainActivity).initClient()
         if ((activity as MainActivity).isTablet){
             (activity as MainActivity).refreshSettings()
         }

diff --git a/app/src/main/java/com/aws/amazonlocation/ui/main/setting/SettingFragment.kt b/app/src/main/java/com/aws/amazonlocation/ui/main/setting/SettingFragment.kt
@@ -9,6 +9,7 @@ import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
+import com.aws.amazonlocation.BuildConfig
 import com.aws.amazonlocation.R
 import com.aws.amazonlocation.data.enum.AuthEnum
 import com.aws.amazonlocation.databinding.FragmentSettingBinding
@@ -25,6 +26,7 @@ import com.aws.amazonlocation.utils.DisconnectAWSInterface
 import com.aws.amazonlocation.utils.KEY_CLOUD_FORMATION_STATUS
 import com.aws.amazonlocation.utils.KEY_MAP_NAME
 import com.aws.amazonlocation.utils.KEY_MAP_STYLE_NAME
+import com.aws.amazonlocation.utils.KEY_NEAREST_REGION
 import com.aws.amazonlocation.utils.KEY_SELECTED_REGION
 import com.aws.amazonlocation.utils.KEY_UNIT_SYSTEM
 import com.aws.amazonlocation.utils.LANGUAGE_CODE_ARABIC
@@ -42,6 +44,7 @@ import com.aws.amazonlocation.utils.LANGUAGE_CODE_JAPANESE
 import com.aws.amazonlocation.utils.LANGUAGE_CODE_KOREAN
 import com.aws.amazonlocation.utils.LANGUAGE_CODE_SPANISH
 import com.aws.amazonlocation.utils.SignOutInterface
+import com.aws.amazonlocation.utils.Units
 import com.aws.amazonlocation.utils.disconnectFromAWSDialog
 import com.aws.amazonlocation.utils.getLanguageCode
 import com.aws.amazonlocation.utils.hide
@@ -360,6 +363,25 @@ class SettingFragment : BaseFragment(), SignOutInterface {
                                         }
                                     }
                                 }
+                                val mapName = mPreferenceManager.getValue(KEY_MAP_NAME, getString(R.string.map_esri))
+                                val defaultIdentityPoolId: String =
+                                    Units.getDefaultIdentityPoolId(
+                                        mPreferenceManager.getValue(
+                                            KEY_SELECTED_REGION,
+                                            regionDisplayName[0],
+                                        ),
+                                        mPreferenceManager.getValue(KEY_NEAREST_REGION, ""),
+                                    )
+                                if (defaultIdentityPoolId != BuildConfig.DEFAULT_IDENTITY_POOL_ID_AP) {
+                                    if (mapName == getString(R.string.grab)) {
+                                        mPreferenceManager.setValue(
+                                            KEY_MAP_STYLE_NAME,
+                                            resources.getString(R.string.map_light),
+                                        )
+                                        mPreferenceManager.setValue(KEY_MAP_NAME, resources.getString(R.string.esri))
+                                    }
+                                }
+                                (activity as MainActivity).initClient()
                                 init()
                                 dialog.dismiss()
                             }

diff --git a/app/src/main/java/com/aws/amazonlocation/ui/main/signin/CloudFormationBottomSheetFragment.kt b/app/src/main/java/com/aws/amazonlocation/ui/main/signin/CloudFormationBottomSheetFragment.kt
@@ -394,6 +394,7 @@ class CloudFormationBottomSheetFragment(
             )
         }
         dismiss()
+        (activity as MainActivity).initClient()
         (activity as MainActivity).showSignInRequiredSheet()
     }
 

diff --git a/app/src/main/java/com/aws/amazonlocation/utils/AWSLocationHelper.kt b/app/src/main/java/com/aws/amazonlocation/utils/AWSLocationHelper.kt
@@ -92,14 +92,20 @@ class AWSLocationHelper(
         if (mAuthStatus == AuthEnum.SIGNED_IN.name) {
             initializeAuthLocationCredentialsProvider(authHelper, baseActivity)
         } else {
-            val defaultIdentityPoolId: String =
+            var defaultIdentityPoolId: String =
                 getDefaultIdentityPoolId(
                     mPreferenceManager.getValue(
                         KEY_SELECTED_REGION,
                         regionDisplayName[0],
                     ),
                     mPreferenceManager.getValue(KEY_NEAREST_REGION, ""),
                 )
+            if (mAuthStatus == AuthEnum.AWS_CONNECTED.name) {
+                defaultIdentityPoolId = mPreferenceManager.getValue(
+                    KEY_POOL_ID,
+                    "",
+                ).toString()
+            }
             val defaultRegion = defaultIdentityPoolId.split(":")[0]
             region = defaultRegion
             locationCredentialsProvider =

diff --git a/app/src/main/java/com/aws/amazonlocation/utils/MapHelper.kt b/app/src/main/java/com/aws/amazonlocation/utils/MapHelper.kt
@@ -173,7 +173,7 @@ class MapHelper(
     private fun setRegion() {
         region = ""
         val mAuthStatus = mPreferenceManager?.getValue(KEY_CLOUD_FORMATION_STATUS, "")
-        if (mAuthStatus == AuthEnum.SIGNED_IN.name) {
+        if (mAuthStatus == AuthEnum.SIGNED_IN.name || mAuthStatus == AuthEnum.AWS_CONNECTED.name) {
             region = mPreferenceManager?.getValue(KEY_USER_REGION, "")
         }
         if (region.isNullOrEmpty()) {

diff --git a/app/src/main/res/layout-sw600dp/bottom_sheet_map_style.xml b/app/src/main/res/layout-sw600dp/bottom_sheet_map_style.xml
@@ -289,7 +289,7 @@
                     android:id="@+id/group_filter_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:constraint_referenced_ids="card_esri,card_here,card_grab_map,card_open_data" />
+                    app:constraint_referenced_ids="card_esri,card_here,card_open_data" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 

diff --git a/app/src/main/res/layout-sw720dp/bottom_sheet_map_style.xml b/app/src/main/res/layout-sw720dp/bottom_sheet_map_style.xml
@@ -289,7 +289,7 @@
                     android:id="@+id/group_filter_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:constraint_referenced_ids="card_esri,card_here,card_grab_map,card_open_data" />
+                    app:constraint_referenced_ids="card_esri,card_here,card_open_data" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
-Original file line number
+Diff line change
@@ Expand Up / @@ -394,6 +394,7 @@ class CloudFormationBottomSheetFragment( @@
                 )
             }
             dismiss()
+            (activity as MainActivity).initClient()
             (activity as MainActivity).showSignInRequiredSheet()
         }
@@ Expand Down @@