fixed merge conflict

Author: mzorz

.buildkite/pipeline.yml

@@ -16,7 +16,7 @@ steps:
   - wait
 
   - label: ":hammer_and_pick: Build and Test"
-    command: ./gradlew --stacktrace testReleaseTest
+    command: ./gradlew --stacktrace testDebugUnitTest
     plugins: [$CI_TOOLKIT_PLUGIN]
     notify:
       - github_commit_status:
@@ -36,7 +36,7 @@ steps:
           context: Danger - PR Check
 
   - label: ":microscope: Lint"
-    command: ./gradlew --stacktrace lintRelease
+    command: ./gradlew --stacktrace lintDebug
     plugins: [$CI_TOOLKIT_PLUGIN]
     notify:
       - github_commit_status:

.java-version

@@ -1 +1 @@
-17.0
+21.0

PasscodeLock/build.gradle

@@ -26,11 +26,6 @@ android {
             shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-        releaseTest {
-            initWith release
-            minifyEnabled false
-            shrinkResources false
-        }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11

PasscodeLock/consumer-rules.pro

@@ -21,13 +21,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
 
-        // New build type for CI testing without minification to avoid ClassNotFoundException
-        releaseTest {
-            initWith release
-            minifyEnabled false
-            shrinkResources false
-        }
-
         // Dedicated build type for screenshots so that we can add the special
         // permissions only to it, keeping debug and release closer together to
         // make bug hunting easier.
@@ -49,8 +42,6 @@ android {
 
         minSdkVersion 23
         targetSdkVersion 35
-
-        testInstrumentationRunner 'com.automattic.simplenote.SimplenoteAppRunner'
     }
 
 
@@ -85,7 +76,7 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -169,7 +160,7 @@ repositories {
     }
     maven { url "https://maven.google.com" }
     maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
-    jcenter()
+    mavenCentral()
     maven {
         url 'https://jitpack.io'
         content {

Simplenote/build.gradle

@@ -34,17 +34,3 @@
 
 # AndroidAsync lib compiles these classes
 -dontwarn org.bouncycastle.**
-
-# PasscodeLock classes - needed for tests that trigger analytics which instantiate AppLock
--keep class org.wordpress.passcodelock.** { *; }
--dontwarn org.wordpress.passcodelock.**
-
-# Keep specific classes that are failing in tests
--keep class org.wordpress.passcodelock.AbstractAppLock { *; }
--keep class org.wordpress.passcodelock.DefaultAppLock { *; }
--keep class org.wordpress.passcodelock.AppLockManager { *; }
-
-# Keep the SimplenoteAppLock and related analytics classes
--keep class com.automattic.simplenote.SimplenoteAppLock { *; }
--keep class com.automattic.simplenote.analytics.** { *; }
--keep class com.automattic.simplenote.Simplenote { *; }

Simplenote/proguard-rules.pro

@@ -29,7 +29,8 @@ class DeepLinkActivity : AppCompatActivity() {
             VERIFIED_WEB_SCHEME -> {
                 // Check if this is a password reset URL
                 if (uri.path?.contains("/account/") == true && uri.path?.contains("/reset") == true) {
-                    handlePasswordReset(uri)
+                    // launch the app if they tapped on a password reset link on app.simplenote.com
+                    handlePasswordReset()
                 } else {
                     // New MagicLink
                     startMagicLinkConfirmation(uri)
@@ -93,19 +94,10 @@ class DeepLinkActivity : AppCompatActivity() {
         }
     }
 
-    private fun handlePasswordReset(uri: Uri) {
-        val redirectParam = uri.getQueryParameter("redirect")
-        if (redirectParam == "simplenote://launch") {
-            // Handle the redirect to launch the app
-            val intent = IntentUtils.maybeAliasedIntent(applicationContext)
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
-            startActivity(intent)
-        } else {
-            // Default behavior for reset URLs without redirect
-            val intent = IntentUtils.maybeAliasedIntent(applicationContext)
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
-            startActivity(intent)
-        }
+    private fun handlePasswordReset() {
+        val intent = IntentUtils.maybeAliasedIntent(applicationContext)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
+        startActivity(intent)
     }
 
     private fun queryParamContainsData(path: String?, otherString: String) : Boolean = path?.contains(otherString, true) == true

Simplenote/src/main/java/com/automattic/simplenote/DeepLinkActivity.kt

@@ -76,7 +76,7 @@ public boolean enoughToFilter() {
 		// solves a crash after updating dependencies in which this method
 	    // gets called in super() instantiation before the mTokenizer variable
 	    // is instantiated
-		if (mTokenizer == null) {
+	    if (mTokenizer == null) {
 			return false;
 		}
 

Simplenote/src/main/java/com/automattic/simplenote/widgets/SimplenoteEditText.java

@@ -1,7 +1,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 apply plugin: 'com.android.application'
@@ -16,11 +16,6 @@ android {
             shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-        releaseTest {
-            initWith release
-            minifyEnabled false
-            shrinkResources false
-        }
     }
 
     defaultConfig {
@@ -40,7 +35,7 @@ dependencies {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
     maven {
         url "https://maven.google.com"
     }

Wear/build.gradle

@@ -12,7 +12,7 @@ buildscript {
             }
         }
         google()
-        jcenter()
+        mavenCentral()
         maven { url 'https://maven.google.com' }
     }
     dependencies {