change "blacklisted" to "blocked" (ef50a7ad) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/data/gitlab/SystemAppsUpdatesRepository.kt

+6 −6

Original line number	Diff line number	Diff line
		@@ -62,16 +62,16 @@ class SystemAppsUpdatesRepository @Inject constructor(
		return systemAppProjectList.map { it.packageName }
		}

		private fun isSystemAppBlacklisted(
		private fun isSystemAppBlocked(
		systemAppInfo: SystemAppInfo,
		sdkLevel: Int,
		device: String,
		): Boolean {
		return systemAppInfo.run {
		sdkLevel < minSdk \|\|
		blacklistedAndroid?.contains(sdkLevel) == true \|\|
		blacklistedDevices?.contains(device) == true \|\|
		blacklistedDevices?.contains("${device}@${sdkLevel}") == true
		blockedAndroid?.contains(sdkLevel) == true \|\|
		blockedDevices?.contains(device) == true \|\|
		blockedDevices?.contains("${device}@${sdkLevel}") == true
		}
		}

		@@ -91,8 +91,8 @@ class SystemAppsUpdatesRepository @Inject constructor(
		return if (systemAppInfo == null) {
		Timber.e("Null app info for: $packageName, response: ${response.errorBody()?.string()}")
		null
		} else if (isSystemAppBlacklisted(systemAppInfo, sdkLevel, device)) {
		Timber.e("Blacklisted system app: $packageName, details: $systemAppInfo")
		} else if (isSystemAppBlocked(systemAppInfo, sdkLevel, device)) {
		Timber.e("Blocked system app: $packageName, details: $systemAppInfo")
		null
		} else {
		systemAppInfo.toApplication()

+2 −2

Original line number	Diff line number	Diff line
		@@ -35,8 +35,8 @@ data class SystemAppInfo(
		@Json(name = "size") val size: Long?,
		@Json(name = "author_name") val authorName: String?,
		val priority: Boolean?,
		@Json(name = "blacklisted_android") val blacklistedAndroid: List<Int>?,
		@Json(name = "blacklisted_devices") val blacklistedDevices: List<String>?,
		@Json(name = "blocked_android") val blockedAndroid: List<Int>?,
		@Json(name = "blocked_devices") val blockedDevices: List<String>?,
		)

		private const val RANDOM_SIZE = 1L