refactor: Address feedback changes

Fixes: LEARNER-9461
openedx-unsupported · Aug 7, 2023 · 1621295 · 1621295
1 parent b42f564
commit 1621295
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 30 deletions.
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/social/SocialLoginDelegate.java b/OpenEdXMobile/src/main/java/org/edx/mobile/social/SocialLoginDelegate.java
@@ -131,29 +131,17 @@ public void onActivityStopped() {
 
     private void socialLogin(SocialAuthSource socialAuthSource) {
         switch (socialAuthSource) {
-            case FACEBOOK:
-                facebook.login();
-                break;
-            case GOOGLE:
-                google.login();
-                break;
-            case MICROSOFT:
-                microsoft.login();
-                break;
+            case FACEBOOK -> facebook.login();
+            case GOOGLE -> google.login();
+            case MICROSOFT -> microsoft.login();
         }
     }
 
     private void socialLogout(SocialAuthSource socialAuthSource) {
         switch (socialAuthSource) {
-            case FACEBOOK:
-                facebook.logout();
-                break;
-            case GOOGLE:
-                google.logout();
-                break;
-            case MICROSOFT:
-                microsoft.logout();
-                break;
+            case FACEBOOK -> facebook.logout();
+            case GOOGLE -> google.logout();
+            case MICROSOFT -> microsoft.logout();
         }
     }
 

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/task/RegisterTask.java b/OpenEdXMobile/src/main/java/org/edx/mobile/task/RegisterTask.java
@@ -29,16 +29,12 @@ public RegisterTask(Context context, Bundle parameters, String accessToken, Soci
     @Override
     protected AuthResponse doInBackground(Void... voids) {
         try {
-            switch (socialAuthSource) {
-                case GOOGLE:
-                    return loginAPI.registerUsingGoogle(parameters, accessToken);
-                case FACEBOOK:
-                    return loginAPI.registerUsingFacebook(parameters, accessToken);
-                case MICROSOFT:
-                    return loginAPI.registerUsingMicrosoft(parameters, accessToken);
-            }
-            // normal email address login
-            return loginAPI.registerUsingEmail(parameters);
+            return switch (socialAuthSource) {
+                case GOOGLE -> loginAPI.registerUsingGoogle(parameters, accessToken);
+                case FACEBOOK -> loginAPI.registerUsingFacebook(parameters, accessToken);
+                case MICROSOFT -> loginAPI.registerUsingMicrosoft(parameters, accessToken);
+                default -> loginAPI.registerUsingEmail(parameters);
+            };
         } catch (Exception e) {
             handleException(e);
             return null;

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/util/ConfigUtil.kt b/OpenEdXMobile/src/main/java/org/edx/mobile/util/ConfigUtil.kt
@@ -109,6 +109,14 @@ class ConfigUtil {
             return config.getAgreementUrl(urlType)
         }
 
+        /**
+         * Determines whether a specific social feature is enabled based on the provided
+         * social authentication source and configuration.
+         *
+         * @param type The social authentication source for which to check the feature's enablement.
+         * @param config The global configuration containing individual social network configurations.
+         * @return `true` if the specified social feature is enabled; otherwise, `false`.
+         */
         @JvmStatic
         fun isSocialFeatureEnabled(
             type: SocialAuthSource,

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/DiscoveryLaunchActivity.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/DiscoveryLaunchActivity.java
@@ -19,6 +19,7 @@
 public class DiscoveryLaunchActivity extends PresenterActivity<DiscoveryLaunchPresenter, DiscoveryLaunchPresenter.ViewInterface> {
 
     private static final String QUERY_PARAM = "query_param";
+    private static final String FOCUSED_VIEW = "focused_view";
 
     private ActivityDiscoveryLaunchBinding binding;
 
@@ -86,13 +87,17 @@ public void navigateToMainDashboard() {
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putString(QUERY_PARAM, binding.svSearchCourses.getQuery().toString());
+        outState.putBoolean(FOCUSED_VIEW, binding.svSearchCourses.hasFocus());
     }
 
     @Override
     protected void onRestoreInstanceState(Bundle savedInstanceState) {
         super.onRestoreInstanceState(savedInstanceState);
         String queryString = savedInstanceState.getString(QUERY_PARAM, "");
         binding.svSearchCourses.setQuery(queryString, false);
+        if (savedInstanceState.getBoolean(FOCUSED_VIEW, false)) {
+            binding.svSearchCourses.postDelayed(() -> binding.svSearchCourses.requestFocus(), 100);
+        }
     }
 
     @Override

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/RegisterActivity.kt b/OpenEdXMobile/src/main/java/org/edx/mobile/view/RegisterActivity.kt
@@ -294,11 +294,11 @@ class RegisterActivity : BaseFragmentActivity(), MobileLoginCallback {
 
         // Send analytics event for Create Account button click
         val appVersion = "${getString(R.string.android)} ${BuildConfig.VERSION_NAME}"
-        val backSourceType = SocialAuthSource.fromString(provider)
+        val socialAuthSource = SocialAuthSource.fromString(provider)
         environment.analyticsRegistry.trackCreateAccountClicked(appVersion, provider)
 
         @SuppressLint("StaticFieldLeak")
-        val task = object : RegisterTask(this, parameters, accessToken, backSourceType) {
+        val task = object : RegisterTask(this, parameters, accessToken, socialAuthSource) {
             @Deprecated("Deprecated in Java")
             override fun onPostExecute(auth: AuthResponse?) {
                 super.onPostExecute(auth)