mirror of
https://github.com/outbackdingo/firezone.git
synced 2026-01-27 10:18:54 +00:00
chore(android): Removed debug sign-in implementation (#2193)
- Removed debug sign-in functionality and token local property.
This commit is contained in:
@@ -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")
|
||||
|
||||
@@ -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()
|
||||
}
|
||||
}
|
||||
@@ -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(
|
||||
|
||||
@@ -45,15 +45,6 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/llContainer" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/btDebugUser"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/sign_in_debug_user"
|
||||
app:layout_constraintBottom_toTopOf="@+id/btSignIn"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/btSignIn"
|
||||
android:layout_width="0dp"
|
||||
|
||||
Reference in New Issue
Block a user