fix todos

microsoft · Dec 7, 2023 · bcc8385 · bcc8385
1 parent 9d34f3e
commit bcc8385
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/apps/sasquatch/src/main/java/com/microsoft/appcenter/sasquatch/activities/MainActivity.java b/apps/sasquatch/src/main/java/com/microsoft/appcenter/sasquatch/activities/MainActivity.java
@@ -132,12 +132,11 @@ static void startAppCenter(Application application, String startTypeString) {
             AppCenter.setCountryCode(countryCode);
         }
 
-// TODO: uncomment this code after release sdk to maven
-//        /* Set data residency region. */
-//        String dataResidencyRegion = MainActivity.sSharedPreferences.getString(application.getString(R.string.data_residency_region_key), null);
-//        if (dataResidencyRegion != null) {
-//            AppCenter.setDataResidencyRegion(dataResidencyRegion);
-//        }
+        /* Set data residency region. */
+        String dataResidencyRegion = MainActivity.sSharedPreferences.getString(application.getString(R.string.data_residency_region_key), null);
+        if (dataResidencyRegion != null) {
+            AppCenter.setDataResidencyRegion(dataResidencyRegion);
+        }
 
         /* Set the track explicitly only if we set it in settings, to test the initial public by default at first launch. */
         int savedTrack = sSharedPreferences.getInt(application.getString(R.string.appcenter_distribute_track_state_key), 0);

diff --git a/...asquatch/src/main/java/com/microsoft/appcenter/sasquatch/activities/SettingsActivity.java b/...asquatch/src/main/java/com/microsoft/appcenter/sasquatch/activities/SettingsActivity.java
@@ -157,6 +157,7 @@ public void onClick(DialogInterface dialog, int which) {
                                             .putString(getActivity().getString(R.string.data_residency_region_key), input.getText().toString())
                                             .apply();
                                     preference.setSummary(input.getText());
+                                    AppCenter.setDataResidencyRegion(input.getText().toString());
                                     Toast.makeText(getActivity(), getActivity().getString(R.string.data_residency_region_save_message), Toast.LENGTH_SHORT).show();
                                 }
                             })

diff --git a/apps/sasquatch/src/main/res/values/settings.xml b/apps/sasquatch/src/main/res/values/settings.xml
@@ -18,7 +18,7 @@
 
     <string name="data_residency_region_key" tools:ignore="MissingTranslation">data_residency_region</string>
     <string name="data_residency_region_title" tools:ignore="MissingTranslation">Data residency region</string>
-    <string name="data_residency_region_save_message" tools:ignore="MissingTranslation">Data residency region value will be applied after the application restart.</string>
+    <string name="data_residency_region_save_message" tools:ignore="MissingTranslation">Data residency region value applied.</string>
 
     <string name="storage_file_size_key" tools:ignore="MissingTranslation">storage_file_size_key</string>
     <string name="storage_file_size_title" tools:ignore="MissingTranslation">Storage File Size</string>