diff options
3 files changed, 8 insertions, 39 deletions
diff --git a/java/src/com/android/intentresolver/v2/ActivityLogic.kt b/java/src/com/android/intentresolver/v2/ActivityLogic.kt index 95f2bed4..c81bed09 100644 --- a/java/src/com/android/intentresolver/v2/ActivityLogic.kt +++ b/java/src/com/android/intentresolver/v2/ActivityLogic.kt @@ -1,16 +1,14 @@ package com.android.intentresolver.v2 -import android.app.Activity import android.app.admin.DevicePolicyManager import android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_PERSONAL import android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_WORK -import android.content.Context import android.content.Intent -import android.net.Uri import android.os.UserHandle import android.os.UserManager import android.util.Log import androidx.activity.ComponentActivity +import androidx.core.content.getSystemService import com.android.intentresolver.AnnotatedUserHandles import com.android.intentresolver.R import com.android.intentresolver.WorkProfileAvailabilityManager @@ -77,13 +75,6 @@ interface CommonActivityLogic { /** Returns display message indicating intent forwarding or null if not intent forwarding. */ fun forwardMessageFor(intent: Intent): String? - - // TODO: For some reason the IDE complains about getting Activity fields from a - // ComponentActivity. These are a band-aid until the bug is fixed and should be removed when - // possible. - val ComponentActivity.context: Context - val ComponentActivity.intent: Intent - val ComponentActivity.referrer: Uri? } /** @@ -109,13 +100,9 @@ class CommonActivityLogicImpl( } } - override val userManager: UserManager by lazy { - activity.context.getSystemService(Context.USER_SERVICE) as UserManager - } + override val userManager: UserManager by lazy { activity.getSystemService()!! } - override val devicePolicyManager: DevicePolicyManager by lazy { - activity.context.getSystemService(DevicePolicyManager::class.java)!! - } + override val devicePolicyManager: DevicePolicyManager by lazy { activity.getSystemService()!! } override val annotatedUserHandles: AnnotatedUserHandles? by lazy { try { @@ -136,13 +123,13 @@ class CommonActivityLogicImpl( private val forwardToPersonalMessage: String? by lazy { devicePolicyManager.resources.getString(FORWARD_INTENT_TO_PERSONAL) { - activity.context.getString(R.string.forward_intent_to_owner) + activity.getString(R.string.forward_intent_to_owner) } } private val forwardToWorkMessage: String? by lazy { devicePolicyManager.resources.getString(FORWARD_INTENT_TO_WORK) { - activity.context.getString(R.string.forward_intent_to_work) + activity.getString(R.string.forward_intent_to_work) } } @@ -166,14 +153,4 @@ class CommonActivityLogicImpl( companion object { private const val ANDROID_APP_URI_SCHEME = "android-app" } - - // TODO: For some reason the IDE complains about getting Activity fields from a - // ComponentActivity. These are a band-aid until the bug is fixed and should be removed when - // possible. - override val ComponentActivity.context: Context - get() = (this as Activity) - override val ComponentActivity.intent: Intent - get() = (this as Activity).intent - override val ComponentActivity.referrer: Uri? - get() = (this as Activity).referrer } diff --git a/java/src/com/android/intentresolver/v2/ResolverActivityLogic.kt b/java/src/com/android/intentresolver/v2/ResolverActivityLogic.kt index 8cca5b85..0e2b25ec 100644 --- a/java/src/com/android/intentresolver/v2/ResolverActivityLogic.kt +++ b/java/src/com/android/intentresolver/v2/ResolverActivityLogic.kt @@ -41,9 +41,8 @@ open class ResolverActivityLogic( } override val resolvingHome: Boolean by lazy { - Intent.ACTION_MAIN == targetIntent.action && - targetIntent.categories?.size == 1 && - targetIntent.categories.contains(Intent.CATEGORY_HOME) + targetIntent.action == Intent.ACTION_MAIN && + targetIntent.categories.singleOrNull() == Intent.CATEGORY_HOME } override val title: CharSequence? = null @@ -56,7 +55,7 @@ open class ResolverActivityLogic( override val targetDataLoader: TargetDataLoader by lazy { DefaultTargetDataLoader( - activity.context, + activity, activity.lifecycle, activity.intent.getBooleanExtra( ResolverActivity.EXTRA_IS_AUDIO_CAPTURE_DEVICE, diff --git a/java/tests/src/com/android/intentresolver/ResolverActivityTest.java b/java/tests/src/com/android/intentresolver/ResolverActivityTest.java index 1ce1b3b0..dde2f980 100644 --- a/java/tests/src/com/android/intentresolver/ResolverActivityTest.java +++ b/java/tests/src/com/android/intentresolver/ResolverActivityTest.java @@ -80,13 +80,6 @@ public class ResolverActivityTest { private static final UserHandle WORK_PROFILE_USER_HANDLE = UserHandle.of(10); private static final UserHandle CLONE_PROFILE_USER_HANDLE = UserHandle.of(11); - protected Intent getConcreteIntentForLaunch(Intent clientIntent) { - clientIntent.setClass( - androidx.test.platform.app.InstrumentationRegistry.getInstrumentation().getTargetContext(), - ResolverWrapperActivity.class); - return clientIntent; - } - @Rule public ActivityTestRule<ResolverWrapperActivity> mActivityRule = new ActivityTestRule<>(ResolverWrapperActivity.class, false, false); |