MR 11 - Adapt Settings fragment, some fixes (8ea7132e) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/MainActivityViewModel.kt

+4 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,10 @@ class MainActivityViewModel @Inject constructor(
		return dataStoreModule.getUserType()
		}

		fun getUserEmail(): String {
		return dataStoreModule.getEmail()
		}

		private fun setFirstTokenFetchTime() {
		if (firstAuthDataFetchTime == 0L) {
		firstAuthDataFetchTime = SystemClock.uptimeMillis()

app/src/main/java/foundation/e/apps/login/LoginViewModel.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ class LoginViewModel @Inject constructor(
		fun logout() {
		viewModelScope.launch {
		loginSourceRepository.logout()
		authObjects.postValue(listOf())
		}
		}
		}

app/src/main/java/foundation/e/apps/settings/SettingsFragment.kt

+11 −11

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.os.Looper
		import android.view.View
		import android.widget.Toast
		import androidx.fragment.app.viewModels
		import androidx.lifecycle.ViewModelProvider
		import androidx.navigation.findNavController
		import androidx.navigation.fragment.findNavController
		import androidx.preference.CheckBoxPreference
		@@ -41,6 +42,7 @@ import foundation.e.apps.MainActivity
		import foundation.e.apps.MainActivityViewModel
		import foundation.e.apps.R
		import foundation.e.apps.databinding.CustomPreferenceBinding
		import foundation.e.apps.login.LoginViewModel
		import foundation.e.apps.setup.signin.SignInViewModel
		import foundation.e.apps.updates.manager.UpdatesWorkManager
		import foundation.e.apps.utils.enums.User
		@@ -53,12 +55,15 @@ class SettingsFragment : PreferenceFragmentCompat() {

		private var _binding: CustomPreferenceBinding? = null
		private val binding get() = _binding!!
		private val viewModel: SignInViewModel by viewModels()
		private val mainActivityViewModel: MainActivityViewModel by viewModels()
		private var showAllApplications: CheckBoxPreference? = null
		private var showFOSSApplications: CheckBoxPreference? = null
		private var showPWAApplications: CheckBoxPreference? = null

		val loginViewModel: LoginViewModel by lazy {
		ViewModelProvider(requireActivity())[LoginViewModel::class.java]
		}

		@Inject
		lateinit var gson: Gson

		@@ -120,17 +125,16 @@ class SettingsFragment : PreferenceFragmentCompat() {

		super.onViewCreated(view, savedInstanceState)

		mainActivityViewModel.authDataJson.observe(viewLifecycleOwner) {
		val authData = gson.fromJson(it, AuthData::class.java)
		viewModel.userType.observe(viewLifecycleOwner) { user ->
		mainActivityViewModel.gPlayAuthData.let { authData ->
		mainActivityViewModel.getUser().name.let { user ->
		when (user) {
		User.ANONYMOUS.name -> {
		binding.accountType.text = view.context.getString(R.string.user_anonymous)
		}
		User.GOOGLE.name -> {
		if (authData != null) {
		if (authData.aasToken.isNotBlank()) {
		binding.accountType.text = authData.userProfile?.name
		binding.email.text = authData.userProfile?.email
		binding.email.text = mainActivityViewModel.getUserEmail()
		binding.avatar.load(authData.userProfile?.artwork?.url)
		}
		}
		@@ -143,11 +147,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
		}

		binding.logout.setOnClickListener {
		viewModel.saveUserType(User.UNAVAILABLE)
		Toast.makeText(requireContext(), "Signing out...", Toast.LENGTH_LONG).show()
		Handler(Looper.getMainLooper()).postDelayed({
		backToMainActivity()
		}, 1500)
		loginViewModel.logout()
		}
		}

app/src/main/java/foundation/e/apps/utils/modules/DataStoreModule.kt

+4 −2

Original line number	Diff line number	Diff line
		@@ -133,8 +133,10 @@ class DataStoreModule @Inject constructor(
		}
		}

		suspend fun getEmail(): String {
		return emailData.first()
		fun getEmail(): String {
		return runBlocking {
		emailData.first()
		}
		}

		suspend fun getAASToken(): String {