diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index d6227dc09..8ec60321b 100644 --- a/kotlin/android/app/build.gradle.kts +++ b/kotlin/android/app/build.gradle.kts @@ -59,7 +59,6 @@ android { val localProperties = Properties() localProperties.load(FileInputStream(rootProject.file("local.properties"))) - buildConfigField("String", "TOKEN", "\"${localProperties.getProperty("token")}\"") buildConfigField("String", "AUTH_HOST", "\"app.firez.one\"") buildConfigField("String", "AUTH_SCHEME", "\"https\"") buildConfigField("Integer", "AUTH_PORT", "443") @@ -74,7 +73,6 @@ android { // Release Config getByName("release") { proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") - buildConfigField("String", "TOKEN", "null") buildConfigField("String", "AUTH_HOST", "\"app.firezone.dev\"") buildConfigField("String", "AUTH_SCHEME", "\"https\"") buildConfigField("Integer", "AUTH_PORT", "443") diff --git a/kotlin/android/app/src/main/java/dev/firezone/android/core/debug/DevSuite.kt b/kotlin/android/app/src/main/java/dev/firezone/android/core/debug/DevSuite.kt deleted file mode 100644 index eb9028f86..000000000 --- a/kotlin/android/app/src/main/java/dev/firezone/android/core/debug/DevSuite.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* Licensed under Apache 2.0 (C) 2023 Firezone, Inc. */ -package dev.firezone.android.core.debug - -import android.content.Intent -import androidx.fragment.app.FragmentActivity -import dev.firezone.android.BuildConfig -import dev.firezone.android.core.data.PreferenceRepository -import dev.firezone.android.core.presentation.MainActivity -import kotlinx.coroutines.flow.collect -import javax.inject.Inject - -internal class DevSuite @Inject constructor( - private val repository: PreferenceRepository, -) { - - suspend fun signInWithDebugUser(activity: FragmentActivity) { - repository.saveAccountId("firezone").collect() - repository.saveToken(BuildConfig.TOKEN).collect() - - val intent = Intent(activity, MainActivity::class.java) - activity.startActivity(intent) - activity.finish() - } -} diff --git a/kotlin/android/app/src/main/java/dev/firezone/android/features/signin/ui/SignInFragment.kt b/kotlin/android/app/src/main/java/dev/firezone/android/features/signin/ui/SignInFragment.kt index fc944d771..01e3ec7ad 100644 --- a/kotlin/android/app/src/main/java/dev/firezone/android/features/signin/ui/SignInFragment.kt +++ b/kotlin/android/app/src/main/java/dev/firezone/android/features/signin/ui/SignInFragment.kt @@ -3,44 +3,30 @@ package dev.firezone.android.features.signin.ui import android.content.Intent import android.os.Bundle -import android.util.Log import android.view.View import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels -import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import dagger.hilt.android.AndroidEntryPoint import dev.firezone.android.R -import dev.firezone.android.core.debug.DevSuite import dev.firezone.android.databinding.FragmentSignInBinding import dev.firezone.android.features.auth.ui.AuthActivity import dev.firezone.android.features.splash.ui.SplashFragmentDirections -import kotlinx.coroutines.launch -import javax.inject.Inject @AndroidEntryPoint internal class SignInFragment : Fragment(R.layout.fragment_sign_in) { private lateinit var binding: FragmentSignInBinding private val viewModel: SignInViewModel by viewModels() - @Inject - lateinit var devSuite: DevSuite - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) binding = FragmentSignInBinding.bind(view) - Log.d("SignInFragment", "Showing sign in...") setupButtonListener() } private fun setupButtonListener() { with(binding) { - btDebugUser.setOnClickListener { - lifecycleScope.launch { - devSuite.signInWithDebugUser(requireActivity()) - } - } btSignIn.setOnClickListener { startActivity( Intent( diff --git a/kotlin/android/app/src/main/res/layout/fragment_sign_in.xml b/kotlin/android/app/src/main/res/layout/fragment_sign_in.xml index 06cfade0e..ebf096b12 100644 --- a/kotlin/android/app/src/main/res/layout/fragment_sign_in.xml +++ b/kotlin/android/app/src/main/res/layout/fragment_sign_in.xml @@ -45,15 +45,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/llContainer" /> - -