App Lounge: fixed lint issues (e33b06cf) · Commits · e / os / App Lounge

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

+34 −33

Original line number	Diff line number	Diff line
		@@ -224,7 +224,7 @@ class MainActivityViewModel @Inject constructor(
		return
		}

		if (isUserNOTLoggedIn(user, json)) {
		if (!isUserLoggedIn(user, json)) {
		generateAuthDataBasedOnUserType(user)
		} else if (isEligibleToValidateJson(json)) {
		validateAuthData()
		@@ -232,8 +232,8 @@ class MainActivityViewModel @Inject constructor(
		}
		}

		private fun isUserNOTLoggedIn(user: String, json: String) =
		!user.isNullOrEmpty() && !user.contentEquals(User.UNAVAILABLE.name) && json.isEmpty()
		private fun isUserLoggedIn(user: String, json: String) =
		user.isNotEmpty() && !user.contentEquals(User.UNAVAILABLE.name) && json.isNotEmpty()

		private fun isEligibleToValidateJson(authDataJson: String?) =
		!authDataJson.isNullOrEmpty() && !userType.value.isNullOrEmpty() && !userType.value.contentEquals(
		@@ -245,7 +245,11 @@ class MainActivityViewModel @Inject constructor(
		return
		}
		isTokenValidationCompletedOnce = true
		if (!isValid) {
		if (isValid) {
		Log.d(TAG, "Authentication data is valid!")
		generateAuthData()
		return
		}
		Log.d(TAG, ">>> Authentication data validation failed!")
		destroyCredentials { user ->
		if (isTimeEligibleForTokenRefresh()) {
		@@ -254,14 +258,12 @@ class MainActivityViewModel @Inject constructor(
		handleTimeoOut()
		}
		}
		} else {
		Log.d(TAG, "Authentication data is valid!")
		generateAuthData()
		}
		}

		private fun generateAuthDataBasedOnUserType(user: String) {
		if (user.isNotBlank() && tocStatus.value == true && !isGoogleLoginRunning) {
		if (user.isEmpty() \|\| tocStatus.value == false \|\| isGoogleLoginRunning) {
		return
		}
		when (User.valueOf(user)) {
		User.ANONYMOUS -> {
		if (authDataJson.value.isNullOrEmpty() && !authRequestRunning) {
		@@ -277,14 +279,13 @@ class MainActivityViewModel @Inject constructor(
		if (authData.value == null && !authRequestRunning) {
		Log.d(TAG, ">>> Fetching new authentication data")
		setFirstTokenFetchTime()
		fetchAuthData()
		}
		doFetchAuthData()
		}
		}
		}
		}

		private suspend fun fetchAuthData(email: String, oauthToken: String) {
		private suspend fun doFetchAuthData(email: String, oauthToken: String) {
		var responseMap: Map<String, String>
		withContext(Dispatchers.IO) {
		val response = aC2DMTask.getAC2DMResponse(email, oauthToken)
		@@ -298,13 +299,13 @@ class MainActivityViewModel @Inject constructor(
		}
		}

		private fun fetchAuthData() {
		private fun doFetchAuthData() {
		viewModelScope.launch {
		isGoogleLoginRunning = true
		val email = dataStoreModule.getEmail()
		val oauthToken = dataStoreModule.getAASToken()
		if (email.isNotEmpty() && oauthToken.isNotEmpty()) {
		fetchAuthData(email, oauthToken)
		doFetchAuthData(email, oauthToken)
		}
		isGoogleLoginRunning = false
		}

app/src/main/java/foundation/e/apps/api/fused/FusedAPIImpl.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -983,7 +983,6 @@ class FusedAPIImpl @Inject constructor(
		it.first.map { app -> app.transformToFusedApp() },
		it.second
		)

		}
		}

app/src/main/java/foundation/e/apps/search/SearchFragment.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,6 @@ import foundation.e.apps.applicationlist.model.ApplicationListRVAdapter
		import foundation.e.apps.databinding.FragmentSearchBinding
		import foundation.e.apps.manager.download.data.DownloadProgress
		import foundation.e.apps.manager.pkg.PkgManagerModule
		import foundation.e.apps.utils.enums.ResultStatus
		import foundation.e.apps.utils.enums.Status
		import foundation.e.apps.utils.enums.User
		import foundation.e.apps.utils.modules.PWAManagerModule

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ class SettingsFragment : PreferenceFragmentCompat() {

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