Revert "refactor: update ModalFragment to use newInstance factory method for clientId handling"

This reverts commit a559b55.

Author: grablack

library/src/androidTest/java/com/paypal/messages/ModalExternalLinkTest.kt

@@ -37,7 +37,7 @@ class ModalExternalLinkTest {
 				val webView = WebView(recordingContext)
 
 				// Initialize the modal WebView configuration
-				val fragment = ModalFragment.newInstance("test-client-id")
+				val fragment = ModalFragment(clientId = "test-client-id")
 				fragment.setupWebView(webView)
 
 				// Load a minimal page that triggers a target=_blank navigation

library/src/androidTest/java/com/paypal/messages/ModalFragmentTest.kt

@@ -1,159 +1,13 @@
-package com.paypal.messages
+package com.paypal.messages.totest
 
-import android.os.Bundle
-import androidx.fragment.app.testing.launchFragmentInContainer
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotNull
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class ModalFragmentTest {
-
-	@Test
-	fun newInstance_setsClientIdInArguments() {
-		val testClientId = "test-client-id-123"
-		val fragment = ModalFragment.newInstance(testClientId)
-
-		assertNotNull("Fragment should not be null", fragment)
-		assertNotNull("Arguments should not be null", fragment.arguments)
-		assertEquals(
-			"ClientId should be stored in arguments",
-			testClientId,
-			fragment.arguments?.getString("clientId"),
-		)
-	}
-
-	@Test
-	fun fragmentRestoration_preservesClientId() {
-		val testClientId = "test-client-id-restoration"
-		
-		// Create fragment using factory method
-		val originalFragment = ModalFragment.newInstance(testClientId)
-		
-		// Get the arguments that would be saved (Android automatically saves/restores arguments)
-		val savedArguments = originalFragment.arguments
-		
-		// Create a new fragment instance (simulating Android's recreation when "Don't keep activities" is enabled)
-		// This uses the no-arg constructor, which is required for proper state restoration
-		val recreatedFragment = ModalFragment()
-		
-		// Restore the arguments (Android does this automatically during recreation)
-		recreatedFragment.arguments = savedArguments
-		
-		// Verify clientId can be accessed (this would fail with the old constructor approach)
-		// We can't directly access private clientId, but we can verify arguments are set
-		assertNotNull("Recreated fragment arguments should not be null", recreatedFragment.arguments)
-		assertEquals(
-			"ClientId should be preserved in recreated fragment",
-			testClientId,
-			recreatedFragment.arguments?.getString("clientId"),
-		)
-	}
-
-	@Test
-	fun fragmentRecreation_withActivityScenario() {
-		val testClientId = "test-client-id-scenario"
-		
-		// Launch fragment in a container using FragmentScenario
-		val scenario = launchFragmentInContainer<ModalFragment>(
-			Bundle().apply {
-				putString("clientId", testClientId)
-			},
-		)
-		
-		// Verify fragment is created
-		scenario.onFragment { fragment ->
-			assertNotNull("Fragment should be created", fragment)
-			assertNotNull("Fragment arguments should be set", fragment.arguments)
-			assertEquals(
-				"ClientId should be accessible",
-				testClientId,
-				fragment.arguments?.getString("clientId"),
-			)
-		}
-		
-		// Simulate activity recreation (like "Don't keep activities")
-		scenario.recreate()
-		
-		// Verify fragment is recreated with same arguments
-		scenario.onFragment { recreatedFragment ->
-			assertNotNull("Recreated fragment should not be null", recreatedFragment)
-			assertNotNull("Recreated fragment arguments should not be null", recreatedFragment.arguments)
-			assertEquals(
-				"ClientId should be preserved after recreation",
-				testClientId,
-				recreatedFragment.arguments?.getString("clientId"),
-			)
-		}
-	}
-
-	@Test
-	fun fragmentWithoutArguments_throwsException() {
-		// Create fragment without using newInstance (simulating old way or error case)
-		val fragment = ModalFragment()
-		fragment.arguments = null // No arguments set
-		
-		// Accessing clientId property should throw IllegalStateException
-		// We test this indirectly by verifying the fragment can't work without arguments
-		// Since clientId is private, we test via reflection or by ensuring arguments are required
-		assertNotNull("Fragment should be created", fragment)
-		// The actual exception would be thrown when clientId is accessed internally
-		// This test documents the expected behavior
-	}
-
-	@Test
-	fun newInstance_differentClientIds() {
-		val clientId1 = "client-id-1"
-		val clientId2 = "client-id-2"
-		
-		val fragment1 = ModalFragment.newInstance(clientId1)
-		val fragment2 = ModalFragment.newInstance(clientId2)
-		
-		assertEquals(
-			"First fragment should have first clientId",
-			clientId1,
-			fragment1.arguments?.getString("clientId"),
-		)
-		assertEquals(
-			"Second fragment should have second clientId",
-			clientId2,
-			fragment2.arguments?.getString("clientId"),
-		)
-	}
-
 	@Test
-	fun fragmentStateRestoration_simulatesDontKeepActivities() {
-		val testClientId = "test-client-dont-keep-activities"
-		
-		// Step 1: Create fragment using factory method (normal flow)
-		val fragment = ModalFragment.newInstance(testClientId)
-		
-		// Step 2: Simulate what happens when "Don't keep activities" is enabled:
-		// - Activity is destroyed
-		// - Fragment arguments are automatically saved by Android
-		// - Fragment instance is destroyed
-		val savedArguments = Bundle().apply {
-			putAll(fragment.arguments ?: Bundle())
-		}
-		
-		// Step 3: Simulate Android recreating the fragment (uses no-arg constructor)
-		// This is the key fix: the fragment must have a no-arg constructor
-		val recreatedFragment = ModalFragment()
-		
-		// Step 4: Android restores the arguments Bundle automatically
-		recreatedFragment.arguments = savedArguments
-		
-		// Step 5: Verify the fragment can function properly
-		// The key test: can we access clientId without constructor?
-		assertEquals(
-			"Recreated fragment should have same clientId",
-			testClientId,
-			recreatedFragment.arguments?.getString("clientId"),
-		)
-		
-		// This test verifies the fix: fragment can be recreated using no-arg constructor
-		// and clientId is accessible via arguments Bundle
+	fun testSomething() {
+		//
 	}
 }

library/src/androidTest/java/com/paypal/messages/PayPalMessageViewTest.kt

@@ -113,7 +113,7 @@ class PayPalMessageViewTest {
 // 	fun dismissAfterFragmentDetached_shouldThrow() {
 // 		val scenario: ActivityScenario<TestActivity> = ActivityScenario.launch(TestActivity::class.java)
 // 		scenario.onActivity { activity: TestActivity ->
-// 			val fragment = ModalFragment.newInstance("test_client_id")
+// 			val fragment = ModalFragment("test_client_id")
 // 			fragment.show(activity.supportFragmentManager, "test")
 //
 // 			// Remove the fragment to simulate detachment

library/src/main/java/com/paypal/messages/ModalFragment.kt

@@ -50,35 +50,13 @@ import java.util.UUID
 import kotlin.system.measureTimeMillis
 import com.paypal.messages.config.PayPalMessageOfferType as OfferType
 
-internal class ModalFragment : BottomSheetDialogFragment() {
-	companion object {
-		private const val ARG_CLIENT_ID = "clientId"
-
-		/**
-		 * Factory method to create a new instance of ModalFragment with clientId.
-		 * This pattern is required for proper fragment state restoration when
-		 * "Don't keep activities" is enabled.
-		 */
-		fun newInstance(clientId: String): ModalFragment {
-			return ModalFragment().apply {
-				arguments = Bundle().apply {
-					putString(ARG_CLIENT_ID, clientId)
-				}
-			}
-		}
-	}
-
+internal class ModalFragment(
+	private val clientId: String,
+) : BottomSheetDialogFragment() {
 	private val TAG = "PayPalMessageModal"
 	private val offsetTop = 50.dp
 	private val gson = GsonBuilder().setPrettyPrinting().create()
 
-	/**
-	 * Gets the clientId from arguments Bundle.
-	 * This ensures proper state restoration when Android recreates the fragment.
-	 */
-	private val clientId: String
-		get() = arguments?.getString(ARG_CLIENT_ID) ?: throw IllegalStateException("clientId must be set via newInstance()")
-
 	private var modalUrl: String? = null
 
 	// MODAL CONFIG VALUES

library/src/main/java/com/paypal/messages/PayPalComposableModal.kt

@@ -59,9 +59,7 @@ fun PayPalComposableModal(
 	var errorMessage by remember { mutableStateOf("") }
 
 	// Create the ModalFragment instance for WebView setup
-	// Use clientId as key to ensure fragment is recreated if clientId changes
-	// This also ensures proper recreation when "Don't keep activities" is enabled
-	val modalFragment = remember(clientId) { ModalFragment.newInstance(clientId) }
+	val modalFragment = remember { ModalFragment(clientId) }
 	val offerEnum = offerType?.let {
 		try {
 			PayPalMessageOfferType.valueOf(it)

library/src/main/java/com/paypal/messages/PayPalModalActivity.kt

@@ -368,7 +368,7 @@ class PayPalModalActivity : ComponentActivity() {
 											}
 
 											// Create and setup the modal fragment
-											val modalFragment = ModalFragment.newInstance(clientId)
+											val modalFragment = ModalFragment(clientId)
 											val offerEnum = offerType?.let {
 												try {
 													com.paypal.messages.config.PayPalMessageOfferType.valueOf(it)

library/src/main/java/com/paypal/messages/data/PayPalMessageDataProvider.kt

@@ -311,7 +311,7 @@ class PayPalMessageDataProvider {
 			// For AppCompatActivity contexts, use ModalFragment
 			appCompatContext != null -> {
 				val modal = modalInstances[instanceId] ?: run {
-					val newModal = ModalFragment.newInstance(config.data.clientID)
+					val newModal = ModalFragment(config.data.clientID)
 
 					// Build modal config
 					val modalConfig = ModalConfig(