diff --git a/app/build.gradle b/app/build.gradle index d6d2a4ab9..60d6d57d9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -165,6 +165,8 @@ android { testOptions { // Plain JVM tests: a stray android.util.Log call returns a default instead of throwing. unitTests.returnDefaultValues = true + // Robolectric tests start activities whose text is now all string resources. + unitTests.includeAndroidResources = true } compileOptions { diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index b494930f0..7efcc642e 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -287,8 +287,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { super.onCreate(savedInstanceState) if (com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.isRemoving()) { runtimeRemovalBlocked = true - // Best effort: the activity finishes either way, even where its resources cannot be read. - runCatching { android.widget.Toast.makeText(this, R.string.session_wait_removal, android.widget.Toast.LENGTH_SHORT).show() } + android.widget.Toast.makeText(this, R.string.session_wait_removal, android.widget.Toast.LENGTH_SHORT).show() finish() return }