have a util class

Author: fadidurah

common/src/main/java/com/microsoft/identity/common/components/AndroidPlatformComponentsFactory.java

@@ -24,9 +24,6 @@
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.os.Build;
 
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
@@ -39,6 +36,7 @@
 import com.microsoft.identity.common.internal.providers.oauth2.AndroidTaskStateGenerator;
 import com.microsoft.identity.common.internal.ui.AndroidAuthorizationStrategyFactory;
 import com.microsoft.identity.common.internal.ui.browser.AndroidBrowserSelector;
+import com.microsoft.identity.common.internal.util.WorkProfileUtil;
 import com.microsoft.identity.common.java.WarningType;
 import com.microsoft.identity.common.java.interfaces.IPlatformComponents;
 import com.microsoft.identity.common.java.interfaces.PlatformComponents;
@@ -47,7 +45,6 @@
 import com.microsoft.identity.common.logging.Logger;
 
 import java.io.File;
-import java.util.List;
 
 import lombok.NonNull;
 
@@ -73,7 +70,8 @@ public static synchronized void initializeGlobalStates(@NonNull final Context co
             Device.setDeviceMetadata(new AndroidDeviceMetadata());
 
             // Denotes whether or not request is from personal profile but device has a Work Profile Available
-            Device.setIsInPersonalProfileButClouddpcWorkProfileAvailable(checkIfIsInPersonalProfileButClouddpcWorkProfileAvailable(context));
+            Device.setIsInPersonalProfileButClouddpcWorkProfileAvailable(
+                    WorkProfileUtil.checkIfIsInPersonalProfileButClouddpcWorkProfileAvailable(context));
             Logger.setAndroidLogger();
 
             final File cacheDir = context.getCacheDir();
@@ -149,36 +147,4 @@ public static void fillBuilderWithBasicImplementations(
                     .stateGenerator(new AndroidTaskStateGenerator(activity.getTaskId()));
         }
     }
-
-    /**
-     * Helper method to check if we are in personal profile but a work profile managed by clouddpc
-     * is available. Google Docs for intent used:
-     * https://developers.google.com/android/management/work-profile-detection#detect_if_the_device_has_a_work_profile
-     * @param context context needed to check for intent
-     * @return true if called in personal profile and a work profile managed by clouddpc exists, false otherwise
-     */
-    public static boolean checkIfIsInPersonalProfileButClouddpcWorkProfileAvailable(@NonNull final Context context) {
-        try {
-            Intent intent = new Intent("com.google.android.apps.work.clouddpc.ACTION_DETECT_WORK_PROFILE");
-            List<ResolveInfo> activities = context.getPackageManager().queryIntentActivities(intent, 0);
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                return activities.stream()
-                        .anyMatch(
-                                (ResolveInfo resolveInfo) -> resolveInfo.isCrossProfileIntentForwarderActivity());
-            } else {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    return activities.stream()
-                            .anyMatch(
-                                    (ResolveInfo resolveInfo) -> resolveInfo.activityInfo.name.equals("com.android.internal.app.ForwardIntentToManagedProfile"));
-                }
-            }
-
-            return false;
-        } catch (Exception e) {
-            // If we run into exception for any reason, we'll just return false
-            Logger.warn(TAG, "Received an exception while trying to check if clouddpc work profile is available: " + e.getMessage());
-            return false;
-        }
-    }
 }

common/src/main/java/com/microsoft/identity/common/internal/util/WorkProfileUtil.java

@@ -0,0 +1,48 @@
+package com.microsoft.identity.common.internal.util;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.os.Build;
+
+import com.microsoft.identity.common.logging.Logger;
+
+import java.util.List;
+
+import lombok.NonNull;
+
+public class WorkProfileUtil {
+    private static final String TAG = WorkProfileUtil.class.getSimpleName();
+
+    /**
+     * Helper method to check if we are in personal profile but a work profile managed by clouddpc
+     * is available.
+     * <a href="https://developers.google.com/android/management/work-profile-detection#detect_if_the_device_has_a_work_profile">Google Docs for intent used</a>
+     * @param context context needed to check for intent
+     * @return true if called in personal profile and a work profile managed by clouddpc exists, false otherwise
+     */
+    public static boolean checkIfIsInPersonalProfileButClouddpcWorkProfileAvailable(@NonNull final Context context) {
+        try {
+            Intent intent = new Intent("com.google.android.apps.work.clouddpc.ACTION_DETECT_WORK_PROFILE");
+            List<ResolveInfo> activities = context.getPackageManager().queryIntentActivities(intent, 0);
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                return activities.stream()
+                        .anyMatch(
+                                (ResolveInfo resolveInfo) -> resolveInfo.isCrossProfileIntentForwarderActivity());
+            } else {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    return activities.stream()
+                            .anyMatch(
+                                    (ResolveInfo resolveInfo) -> resolveInfo.activityInfo.name.equals("com.android.internal.app.ForwardIntentToManagedProfile"));
+                }
+            }
+
+            return false;
+        } catch (Exception e) {
+            // If we run into exception for any reason, we'll just return false
+            Logger.warn(TAG, "Received an exception while trying to check if clouddpc work profile is available: " + e.getMessage());
+            return false;
+        }
+    }
+}

common4j/src/main/com/microsoft/identity/common/java/controllers/BaseController.java

@@ -330,7 +330,6 @@ protected final AuthorizationRequest.Builder initializeAuthorizationRequestBuild
                     parameters.getApplicationVersion()
             );
             completeRequestHeaders.put(PKEYAUTH_HEADER, PKEYAUTH_VERSION);
-            completeRequestHeaders.put("TOmatoToe", "Ketchup");
 
             // Add additional fields to the AuthorizationRequest.Builder to support interactive
             setBuilderProperties(builder, parameters, interactiveTokenCommandParameters, completeRequestHeaders);

common4j/src/main/com/microsoft/identity/common/java/providers/oauth2/AuthorizationRequest.java

@@ -92,10 +92,6 @@ public abstract class AuthorizationRequest<T extends AuthorizationRequest<T>> im
     @SerializedName("brk_client_id")
     private final String mBrkClientId;
 
-    @Expose()
-    @SerializedName("temp-param")
-    private final String mTempParam = "Temporary";
-
     /**
      * Redirect URL of the hub app.
      */