MR 12 - Some bug fixes (98fecdcb) · Commits · e / os / App Lounge

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -117,6 +117,9 @@ class MainActivity : AppCompatActivity() {
		when {
		it == null -> return@observe
		it.isEmpty() -> {
		// No auth type defined means user has not logged in yet
		// Pop back stack to prevent showing TOSFragment on pressing back button.
		navController.popBackStack()
		navController.navigate(R.id.signInFragment)
		}
		else -> {}

+2 −2

Original line number	Diff line number	Diff line
		@@ -64,14 +64,14 @@ import foundation.e.apps.utils.enums.isInitialized
		import foundation.e.apps.utils.exceptions.GPlayValidationException
		import foundation.e.apps.utils.modules.CommonUtilsModule.LIST_OF_NULL
		import foundation.e.apps.utils.modules.PWAManagerModule
		import foundation.e.apps.utils.parentFragment.TimeoutFragment2
		import foundation.e.apps.utils.parentFragment.TimeoutFragment
		import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.launch
		import timber.log.Timber
		import javax.inject.Inject

		@AndroidEntryPoint
		class ApplicationFragment : TimeoutFragment2(R.layout.fragment_application) {
		class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) {

		private val args: ApplicationFragmentArgs by navArgs()
		private val TAG = ApplicationFragment::class.java.simpleName

+2 −2

Original line number	Diff line number	Diff line
		@@ -47,13 +47,13 @@ import foundation.e.apps.manager.pkg.PkgManagerModule
		import foundation.e.apps.utils.enums.Status
		import foundation.e.apps.utils.exceptions.GPlayValidationException
		import foundation.e.apps.utils.modules.PWAManagerModule
		import foundation.e.apps.utils.parentFragment.TimeoutFragment2
		import foundation.e.apps.utils.parentFragment.TimeoutFragment
		import kotlinx.coroutines.launch
		import javax.inject.Inject

		@AndroidEntryPoint
		class ApplicationListFragment :
		TimeoutFragment2(R.layout.fragment_application_list),
		TimeoutFragment(R.layout.fragment_application_list),
		FusedAPIInterface {

		private val args: ApplicationListFragmentArgs by navArgs()

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,10 +32,10 @@ import foundation.e.apps.categories.model.CategoriesRVAdapter
		import foundation.e.apps.databinding.FragmentAppsBinding
		import foundation.e.apps.login.AuthObject
		import foundation.e.apps.utils.exceptions.GPlayValidationException
		import foundation.e.apps.utils.parentFragment.TimeoutFragment2
		import foundation.e.apps.utils.parentFragment.TimeoutFragment

		@AndroidEntryPoint
		class AppsFragment : TimeoutFragment2(R.layout.fragment_apps) {
		class AppsFragment : TimeoutFragment(R.layout.fragment_apps) {
		private var _binding: FragmentAppsBinding? = null
		private val binding get() = _binding!!

+2 −25

Original line number	Diff line number	Diff line
		@@ -20,17 +20,15 @@ package foundation.e.apps.categories

		import android.os.Bundle
		import android.view.View
		import com.aurora.gplayapi.data.models.AuthData
		import androidx.fragment.app.Fragment
		import com.google.android.material.tabs.TabLayoutMediator
		import dagger.hilt.android.AndroidEntryPoint
		import foundation.e.apps.R
		import foundation.e.apps.categories.model.CategoriesVPAdapter
		import foundation.e.apps.databinding.FragmentCategoriesBinding
		import foundation.e.apps.utils.parentFragment.TimeoutFragment
		import timber.log.Timber

		@AndroidEntryPoint
		class CategoriesFragment : TimeoutFragment(R.layout.fragment_categories) {
		class CategoriesFragment : Fragment(R.layout.fragment_categories) {
		private var _binding: FragmentCategoriesBinding? = null
		private val binding get() = _binding!!

		@@ -55,25 +53,4 @@ class CategoriesFragment : TimeoutFragment(R.layout.fragment_categories) {
		super.onDestroyView()
		_binding = null
		}

		override fun onTimeout() {
		val position = binding.viewPager.currentItem

		val fragment = childFragmentManager.fragments.find {
		when (position) {
		0 -> it is AppsFragment
		1 -> it is GamesFragment
		else -> false
		}
		}

		fragment?.let {
		if (it is TimeoutFragment) {
		Timber.d("Showing timeout on Categories fragment: " + it::class.java.name)
		it.onTimeout()
		}
		}
		}

		override fun refreshData(authData: AuthData) {}
		}