Merge branch 'main' into 1346-connect-anonymous-api-with-ui (8a3e50a7) · Commits · e / os / App Lounge

app/build.gradle

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ plugins {

		def versionMajor = 2
		def versionMinor = 6
		def versionPatch = 3
		def versionPatch = 4

		def getGitHash = { ->
		def stdOut = new ByteArrayOutputStream()

app/src/main/java/foundation/e/apps/data/fused/FusedApiImpl.kt

+0 −31

Original line number	Diff line number	Diff line
		@@ -889,37 +889,6 @@ class FusedApiImpl @Inject constructor(
		return Triple(result.getResultStatus(), fusedCategoryList, APP_TYPE_OPEN)
		}

		/**
		* Run a block of code with timeout. Returns status.
		*
		* @param block Main block to execute within [timeoutDurationInMillis] limit.
		* @param timeoutBlock Optional code to execute in case of timeout.
		* @param exceptionBlock Optional code to execute in case of an exception other than timeout.
		*
		* @return Instance of [ResultStatus] based on whether [block] was executed within timeout limit.
		*/
		private suspend fun runCodeWithTimeout(
		block: suspend () -> Unit,
		timeoutBlock: (() -> Unit)? = null,
		exceptionBlock: ((e: Exception) -> Unit)? = null
		): ResultStatus {
		return try {
		withTimeout(timeoutDurationInMillis) {
		block()
		}
		ResultStatus.OK
		} catch (e: TimeoutCancellationException) {
		timeoutBlock?.invoke()
		ResultStatus.TIMEOUT
		} catch (e: Exception) {
		e.printStackTrace()
		exceptionBlock?.invoke(e)
		ResultStatus.UNKNOWN.apply {
		message = e.stackTraceToString()
		}
		}
		}

		private fun updateCategoryDrawable(
		category: FusedCategory
		) {

app/src/main/java/foundation/e/apps/data/gplay/utils/TimeoutEvaluation.kt

+0 −102

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019-2023 MURENA SAS
		*
		* This program is free software: you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation, either version 3 of the License, or
		* (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program. If not, see <https://www.gnu.org/licenses/>.
		*/

		package foundation.e.apps.data.gplay.utils

		import android.os.CountDownTimer
		import androidx.lifecycle.LiveData
		import androidx.lifecycle.liveData
		import foundation.e.apps.data.Constants
		import foundation.e.apps.data.ResultSupreme
		import kotlinx.coroutines.CancellationException
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.cancel
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.launch
		import kotlinx.coroutines.withContext

		/**
		* Observing a LiveData/Flow for timeout is not easy.
		* We use a [CountDownTimer] to keep track of intervals between two emissions of data.
		* Also we had to collect items from Flow and emit it to a LiveData to avoid missing data emissions.
		*
		* @param block Code block producing the Flow
		* @param moreItemsToLoad Code block evaluating if more items will be loaded in the Flow.
		* Check if the item passed is the last item or not. If it is the last item, return false.
		* @param timeoutBlock Mandatory code block to execute for timeout.
		* Pass empty data from this block or any other data.
		* @param exceptionBlock Optional code block to execute for any other error.
		*
		* @return LiveData containing items from the Flow from [block], each item
		* wrapped in [ResultSupreme].
		*/
		suspend fun <T> runFlowWithTimeout(
		block: suspend () -> Flow<T>,
		moreItemsToLoad: suspend (item: T) -> Boolean,
		timeoutBlock: () -> T,
		exceptionBlock: ((e: Exception) -> T?)? = null
		): LiveData<ResultSupreme<T>> {
		return liveData {
		withContext(Dispatchers.Main) {
		val timer =
		Timer(this) {
		emit(ResultSupreme.Timeout(timeoutBlock()))
		cancel()
		}

		try {
		withContext(Dispatchers.IO) {
		timer.start()
		block().collect { item ->
		timer.cancel()
		emit(ResultSupreme.Success(item))
		if (!moreItemsToLoad(item)) {
		cancel()
		}
		timer.start()
		}
		}
		} catch (e: Exception) {
		if (e is CancellationException) {
		return@withContext
		}
		runCatching {
		emit(
		ResultSupreme.Error<T>(e.stackTraceToString()).apply {
		exceptionBlock?.invoke(e)?.let { setData(it) }
		}
		)
		}
		}
		}
		}
		}

		private class Timer(
		private val scope: CoroutineScope,
		private val onTimeout: suspend () -> Unit
		) : CountDownTimer(Constants.timeoutDurationInMillis, 1000) {

		override fun onTick(millisUntilFinished: Long) {}

		override fun onFinish() {
		scope.launch {
		onTimeout()
		}
		}
		}

app/src/main/res/values-sv/strings.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -117,4 +117,10 @@
		<string name="weekly">Varje vecka</string>
		<string name="monthly">Varje månad</string>
		<string name="anonymous_login_failed">Anonym inloggning misslyckades.</string>
		<string name="preference_update_wifi_only_title" weblate_ctx="settings">Endast på nätverk med obegränsad data</string>
		<string name="rating_description">Betyg av 5. Beräknad utifrån användares betyg av appen.</string>
		<string name="preference_update_wifi_only_description" weblate_ctx="settings">Uppdatera endast appar automatiskt på nätverk utan databegränsning som t.ex. Wi-Fi</string>
		<string name="duplicate_app_from_sources">Vissa proprietära appar kan också ha en version med öppen källkod. När detta händer visar App Lounge endast den version med öppen källkod för att undvika dubbletter.</string>
		<string name="additional_file_for">Ytterligare filer för %s</string>
		<string name="privacy_description">Integritetspoängen är automatiskt beräknad utifrån behörigheter och spårare som detekterats i applikationer. Det ger en fingervisning micro-spårar sina användare.<br /><br />Algoritmens källkod för beräkningar kan hittas <a href=<xliff:g id="source_code">%1$s</xliff:g>>här</a>.<br /><br />Spårardetektering utförs med <a href=<xliff:g id="exodus">%2$s</xliff:g>>Exodus Privacy tools</a>.<br /><br />Poäng av 10.<br /><br />Läs mer om hur Integritetspoäng beräknas, dess begränsningar och hur du kan skydda dig själv från microspårning <a href=<xliff:g id="e_doc">%3$s</xliff:g>>på denna sidan</a>.</string>
		</resources>
		No newline at end of file