Merge branch 'main' into 505-homepage_flickering (5dabf764) · Commits · e / os / App Lounge

app/build.gradle

+3 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,9 @@ dependencies {
		implementation "androidx.viewpager2:viewpager2:1.0.0"
		implementation "androidx.recyclerview:recyclerview:1.2.1"

		//logger
		implementation 'com.jakewharton.timber:timber:5.0.1'

		// Retrofit
		def retrofit_version = "2.9.0"
		implementation "com.squareup.retrofit2:retrofit:$retrofit_version"

+6 −0

Original line number	Diff line number	Diff line
		@@ -30,9 +30,12 @@ import foundation.e.apps.utils.modules.DataStoreModule
		import kotlinx.coroutines.DelicateCoroutinesApi
		import kotlinx.coroutines.MainScope
		import kotlinx.coroutines.launch
		import timber.log.Timber
		import timber.log.Timber.Forest.plant
		import java.util.concurrent.Executors
		import javax.inject.Inject


		@HiltAndroidApp
		@DelicateCoroutinesApi
		class AppLoungeApplication : Application(), Configuration.Provider {
		@@ -60,6 +63,9 @@ class AppLoungeApplication : Application(), Configuration.Provider {
		dataStoreModule.saveTOCStatus(false, "")
		}
		}
		if (BuildConfig.DEBUG) {
		plant(Timber.DebugTree())
		}
		}

		override fun getWorkManagerConfiguration() =

+3 −3

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import foundation.e.apps.utils.enums.Status
		import foundation.e.apps.utils.modules.CommonUtilsModule
		import foundation.e.apps.utils.parentFragment.TimeoutFragment
		import kotlinx.coroutines.launch
		import timber.log.Timber
		import java.io.File
		import java.util.UUID

		@@ -107,7 +108,6 @@ class MainActivity : AppCompatActivity() {
		}

		viewModel.authValidity.observe(this) {

		viewModel.handleAuthValidity(it) {
		Log.d(TAG, "Timeout validating auth data!")
		val lastFragment = navHostFragment.childFragmentManager.fragments[0]
		@@ -218,7 +218,7 @@ class MainActivity : AppCompatActivity() {
		}
		viewModel.updateAwaiting(it)
		InstallWorkManager.enqueueWork(it)
		Log.d(TAG, "===> onCreate: AWAITING ${it.name}")
		Timber.d( "===> onCreate: AWAITING ${it.name}")
		}
		}

		@@ -273,7 +273,7 @@ class MainActivity : AppCompatActivity() {
		statsManager.getFreeBytes(StorageManager.UUID_DEFAULT)
		}
		} catch (e: Exception) {
		Log.e(TAG, "calculateAvailableDiskSpace: ${e.stackTraceToString()}")
		Timber.e( "calculateAvailableDiskSpace: ${e.stackTraceToString()}")
		getAvailableInternalMemorySize()
		}
		} else {

+3 −2

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.launch
		import kotlinx.coroutines.withContext
		import ru.beryukhov.reactivenetwork.ReactiveNetwork
		import timber.log.Timber
		import java.io.ByteArrayOutputStream
		import javax.inject.Inject

		@@ -188,10 +189,10 @@ class MainActivityViewModel @Inject constructor(
		if (regenerateFunction != null) {
		dataStoreModule.userType.collect { user ->
		if (!user.isBlank() && User.valueOf(user) == User.ANONYMOUS) {
		Log.d(TAG, "Regenerating auth data for Anonymous user")
		Timber.d( "Regenerating auth data for Anonymous user")
		regenerateFunction(user)
		} else {
		Log.d(TAG, "Ask Google user to log in again")
		Timber.d( "Ask Google user to log in again")
		dataStoreModule.clearUserType()
		}
		}

+1 −4

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ import foundation.e.apps.api.exodus.models.AppPrivacyInfo
		import foundation.e.apps.api.exodus.repositories.IAppPrivacyInfoRepository
		import foundation.e.apps.api.fused.data.FusedApp
		import foundation.e.apps.utils.modules.CommonUtilsModule.LIST_OF_NULL
		import timber.log.Timber
		import javax.inject.Inject
		import kotlin.math.ceil
		import kotlin.math.round
		@@ -88,10 +89,6 @@ class PrivacyInfoViewModel @Inject constructor(
		val calculatePermissionsScore = calculatePermissionsScore(
		countAndroidPermissions(fusedApp)
		)
		Log.d(
		"PrivacyInfoViewModel",
		"calculatePrivacyScore: ${fusedApp.name}: privacyScore: $calculateTrackersScore permissionScore: $calculatePermissionsScore noOfPermission: ${fusedApp.perms.size}"
		)
		return calculateTrackersScore + calculatePermissionsScore
		}