Skip to content

Debloat your Android TV, install apps, browse and transfer files on it, all from your phone. Just 3 MB, no tracking, no root, no PC.

Launchers from the list: the app names none, and an own list asks first

jesse-agent-232cb25fced995d
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8acf037..e12c873 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ until this file has a section for its version.
## Unreleased
- **Improved:** Launchers, app names and streaming services now come from Tellyscope's own repository. [#323](../../pull/323)
+- **Improved:** Installing a launcher from a list you added shows the list and signer, and asks you to confirm. [#322](../../pull/322)
## 0.15.0 — 2026-11-03
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 65f9ed0..9d60da5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ You don't have to trust ours. Fork tellyscope-devices, edit the lists in your fo
These lists live in this repository, in [`data/`](data/), and the app downloads them from `main`: change one here with a pull request, and it reaches people once it's on `main`, without an app release. Keep `data/index.json` in step: it gives each file's sha256, and the app uses only files that match. [`DataListsTest`](app/src/test/java/app/tellyscope/DataListsTest.kt) checks the lists and the index, and says which sha256 changed. tellyscope-devices still has older copies that earlier versions of the app download; they're frozen until they're retired, so don't edit them there. File formats are in that repo's README.
-- `data/launchers.json`: the third-party launchers Tellyscope knows. One with an `"about"` line is offered in **Install a home screen**, in the file's order. On Fire OS, which has no Play Store, only Projectivy is offered, while it's on the list: Tellyscope downloads it from its developer's GitHub releases and installs only an APK signed with the certificate pinned in [`LauncherDownload.kt`](app/src/main/java/app/tellyscope/data/LauncherDownload.kt). On Android TV the same download is offered as **Download directly**, under the Play Store and after a warning. Projectivy is the only launcher with a pinned release and signer, so it's the only one offered either way (`downloadable` in [`LauncherFlowUi.kt`](app/src/main/java/app/tellyscope/ui/LauncherFlowUi.kt)).
+- `data/launchers.json`: the third-party launchers Tellyscope knows. One with an `"about"` line is offered in **Install a home screen**, in the file's order. The app names no launcher itself: what it needs to install one from an APK comes from its entry (`signers`, `max_mb`, `releases`, `fire_os`; formats in that repo's README). On Fire OS, which has no Play Store, only the `fire_os` launcher is offered, while it's on the list with `signers`: Tellyscope downloads it from its `releases` page and installs only an APK signed with one of its `signers` ([`LauncherDownload.kt`](app/src/main/java/app/tellyscope/data/LauncherDownload.kt)). On Android TV the same download is offered as **Download directly**, under the Play Store and after a warning, for any launcher with both `signers` and `releases` (`downloadable` in [`LauncherFlowUi.kt`](app/src/main/java/app/tellyscope/ui/LauncherFlowUi.kt)). When the lists come from your own source rather than the default, every one of those installs first shows the list's address and the signer, and waits for a tick saying you trust them: Tellyscope can only check the APK matches the list.
- `data/labels.json`: names shown for common TV apps when the TV can't tell us.
- `data/streaming.json`: the streaming services the Remote can have a button for. Each names a logo, which stays in tellyscope-devices' `logos/` with its source and licence in `SOURCES.md`.
diff --git a/app/src/main/java/app/tellyscope/MainActivity.kt b/app/src/main/java/app/tellyscope/MainActivity.kt
index 2ee5964..df2eb83 100644
--- a/app/src/main/java/app/tellyscope/MainActivity.kt
+++ b/app/src/main/java/app/tellyscope/MainActivity.kt
@@ -217,7 +217,7 @@ fun TellyscopeApp(vm: TellyscopeViewModel) {
var rejoinSince by rememberSaveable { mutableStateOf(0L) }
val pickApp = rememberLauncherForActivityResult(InDownloads.Multiple()) { vm.pickedApp(it) }
- val pickProjectivy = rememberLauncherForActivityResult(InDownloads.One()) { uri -> uri?.let(vm::pickedProjectivy) }
+ val pickLauncherApk = rememberLauncherForActivityResult(InDownloads.One()) { uri -> uri?.let(vm::pickedLauncherApk) }
val pickFile = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri -> uri?.let(vm::push) }
val saveFile = rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("application/octet-stream"), vm::saveTo)
val saveScreenshot = rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("image/png"), vm::screenshotTo)
@@ -360,10 +360,11 @@ fun TellyscopeApp(vm: TellyscopeViewModel) {
makeHome = vm::makeHome,
open = vm::openLauncher,
later = vm::launcherLater,
- fireCheck = vm::checkProjectivy,
- fireInstall = vm::installProjectivy,
- fireDismiss = vm::dismissProjectivy,
- firePick = { pickProjectivy.launch(arrayOf(InDownloads.APK)) },
+ fireCheck = vm::checkLauncherApk,
+ fireTrust = vm::trustLauncherList,
+ fireInstall = vm::installLauncherApk,
+ fireDismiss = vm::dismissLauncherApk,
+ firePick = { pickLauncherApk.launch(arrayOf(InDownloads.APK)) },
),
snackbar = snackbar,
direct = vm.directDownload,
diff --git a/app/src/main/java/app/tellyscope/data/LauncherDownload.kt b/app/src/main/java/app/tellyscope/data/LauncherDownload.kt
index 31b2ada..b88fe05 100644
--- a/app/src/main/java/app/tellyscope/data/LauncherDownload.kt
+++ b/app/src/main/java/app/tellyscope/data/LauncherDownload.kt
@@ -19,29 +19,18 @@ import java.net.HttpURLConnection
import java.net.URL
import java.security.MessageDigest
-const val PROJECTIVY = "com.spocky.projengmenu"
-
-/** Where Projectivy's developer publishes its APKs. Not open source: the repo holds only releases and themes. */
-const val PROJECTIVY_RELEASES = "https://github.com/spocky/miproja1/releases"
-private const val PROJECTIVY_LATEST = "https://api.github.com/repos/spocky/miproja1/releases/latest"
-
-/**
- * SHA-256 of the certificate Projectivy's GitHub APKs are signed with (APK Signature Scheme v2),
- * the same on 4.70 and 4.72. A download signed with anything else is never sent to the TV.
- */
-val PROJECTIVY_SIGNERS = setOf("f6697bf4082ee97511e4de07863193884a015b7ab5860430321bda1042b0aadd")
-
-/** Projectivy is about 11 MB; anything far past that isn't it. */
-private const val MAX_APK_BYTES = 64L shl 20
-
-/** Projectivy's latest release: [page] is shown before anything downloads, [apk] is its one APK. */
+/** A launcher's latest release: [page] is shown before anything downloads, [apk] is its one APK. */
data class LauncherRelease(val version: String, val page: String, val apk: String, val size: Long)
+/** GitHub's API for [releases]' latest release: `https://github.com/<owner>/<repo>/releases` as the list gives it. */
+private fun latestApi(releases: String) =
+ "https://api.github.com/repos/" + releases.removePrefix("https://github.com/").removeSuffix("/releases") + "/releases/latest"
+
/**
- * The latest release from GitHub's API, or null unless it is a full release on Projectivy's own
+ * The latest release from GitHub's API, or null unless it is a full release on [launcher]'s own
* repo with exactly one APK, served from that release.
*/
-fun parseRelease(json: String): LauncherRelease? = runCatching {
+fun parseRelease(json: String, launcher: KnownLauncher): LauncherRelease? = runCatching {
val r = JSONObject(json)
val tag = r.getString("tag_name")
val assets = r.getJSONArray("assets")
@@ -49,21 +38,23 @@ fun parseRelease(json: String): LauncherRelease? = runCatching {
val url = apk?.getString("browser_download_url")
val size = apk?.getLong("size") ?: 0L
LauncherRelease(tag, r.getString("html_url"), url.orEmpty(), size).takeIf {
- !r.optBoolean("draft") && !r.optBoolean("prerelease") && it.valid()
+ !r.optBoolean("draft") && !r.optBoolean("prerelease") && it.valid(launcher)
}
}.getOrNull()
-/** On Projectivy's own repo, its one APK served from that release, and about the right size. */
-private fun LauncherRelease.valid() =
- page == "$PROJECTIVY_RELEASES/tag/$version" && apk.startsWith("$PROJECTIVY_RELEASES/download/$version/") && size in 1..MAX_APK_BYTES
+/** On [launcher]'s own repo, its one APK served from that release, and about the right size. */
+private fun LauncherRelease.valid(launcher: KnownLauncher): Boolean {
+ val releases = launcher.releases ?: return false
+ return page == "$releases/tag/$version" && apk.startsWith("$releases/download/$version/") && size in 1..launcher.maxBytes
+}
-/** The tag github.com's `releases/latest` redirects to, from its Location; null for anywhere else. */
-fun latestTag(location: String?): String? =
- location?.removePrefix("$PROJECTIVY_RELEASES/tag/")?.takeIf { it != location && it.isNotEmpty() && '/' !in it && '?' !in it }
+/** The tag github.com's `releases/latest` on [releases] redirects to, from its Location; null for anywhere else. */
+fun latestTag(location: String?, releases: String): String? =
+ location?.removePrefix("$releases/tag/")?.takeIf { it != location && it.isNotEmpty() && '/' !in it && '?' !in it }
/** The release page's one APK, from its asset list's links: the full URL, or null unless there is exactly one. */
-fun pageApk(html: String, tag: String): String? {
- val path = PROJECTIVY_RELEASES.removePrefix("https://github.com") + "/download/$tag/"
+fun pageApk(html: String, tag: String, releases: String): String? {
+ val path = releases.removePrefix("https://github.com") + "/download/$tag/"
return Regex("href=\"(${Regex.escape(path)}[^\"/?#]+\\.apk)\"").findAll(html).map { it.groupValues[1] }.distinct()
.singleOrNull()?.let { "https://github.com$it" }
}
@@ -74,23 +65,22 @@ fun pageApk(html: String, tag: String): String? {
*/
class RateLimited(val until: Long?) : IOException("rate-limited")
-/** Projectivy, signed only by its developer: [signers] are the SHA-256s of the APK's certificates. */
-fun isProjectivy(packageName: String, signers: Set<String>) =
- packageName == PROJECTIVY && signers.isNotEmpty() && PROJECTIVY_SIGNERS.containsAll(signers)
-
-/** The download isn't Projectivy, or isn't signed by its developer. */
-class NotProjectivy : IOException("not Projectivy")
+/** The APK isn't the launcher it should be ([KnownLauncher.accepts]): another package, or not signed by its developer. */
+class WrongApk : IOException("not the launcher")
-/** Fire OS's way to Projectivy: there's no Play Store, so Tellyscope fetches it from its developer. Faked in tests. */
+/**
+ * Fire OS's way to its launcher: there's no Play Store, so Tellyscope fetches it from its developer's
+ * [KnownLauncher.releases]. Faked in tests.
+ */
interface LauncherDownload {
- /** Throws on no network or a release that doesn't parse. */
- suspend fun latest(): LauncherRelease
+ /** Throws on no network, no [KnownLauncher.releases], or a release that doesn't parse. */
+ suspend fun latest(launcher: KnownLauncher): LauncherRelease
- /** Downloads [release]'s APK and checks it. Throws [NotProjectivy], or IOException on a failed download. */
- suspend fun fetch(release: LauncherRelease, onProgress: (Progress) -> Unit): PickedApp
+ /** Downloads [release]'s APK and checks it. Throws [WrongApk], or IOException on a failed download. */
+ suspend fun fetch(launcher: KnownLauncher, release: LauncherRelease, onProgress: (Progress) -> Unit): PickedApp
- /** A file the user downloaded and picked, checked the same way. Throws [NotProjectivy], or IOException when it can't be read. */
- suspend fun open(uri: Uri): PickedApp
+ /** A file the user downloaded and picked, checked the same way. Throws [WrongApk], or IOException when it can't be read. */
+ suspend fun open(uri: Uri, launcher: KnownLauncher): PickedApp
}
class AndroidLauncherDownload(context: Context) : LauncherDownload {
@@ -101,17 +91,18 @@ class AndroidLauncherDownload(context: Context) : LauncherDownload {
* From GitHub's API, or, when that is rate-limited, from the release page it links to, which isn't.
* Throws [RateLimited] only when the page didn't answer either.
*/
- override suspend fun latest(): LauncherRelease = withContext(Dispatchers.IO) {
+ override suspend fun latest(launcher: KnownLauncher): LauncherRelease = withContext(Dispatchers.IO) {
+ val releases = launcher.releases ?: throw IOException("no releases page for ${launcher.pkg}")
val limited = try {
- return@withContext parseRelease(api()) ?: throw IOException("no Projectivy release")
+ return@withContext parseRelease(api(releases), launcher) ?: throw IOException("no release of ${launcher.pkg}")
} catch (e: RateLimited) {
e
}
- runCatching { fromPage() }.getOrNull() ?: throw limited
+ runCatching { fromPage(launcher, releases) }.getOrNull() ?: throw limited
}
- private fun api(): String {
- val c = URL(PROJECTIVY_LATEST).openConnection() as HttpURLConnection
+ private fun api(releases: String): String {
+ val c = URL(latestApi(releases)).openConnection() as HttpURLConnection
c.connectTimeout = 10_000
c.readTimeout = 10_000
try {
@@ -127,17 +118,17 @@ class AndroidLauncherDownload(context: Context) : LauncherDownload {
}
/** `releases/latest` redirects to the tag, whose asset list names the APK; its size comes from the download's own length. */
- private suspend fun fromPage(): LauncherRelease? {
- val c = URL("$PROJECTIVY_RELEASES/latest").openConnection() as HttpURLConnection
+ private suspend fun fromPage(launcher: KnownLauncher, releases: String): LauncherRelease? {
+ val c = URL("$releases/latest").openConnection() as HttpURLConnection
c.instanceFollowRedirects = false
c.connectTimeout = 10_000
c.readTimeout = 10_000
val tag = try {
- latestTag(c.takeIf { it.responseCode in 301..302 }?.getHeaderField("Location"))
+ latestTag(c.takeIf { it.responseCode in 301..302 }?.getHeaderField("Location"), releases)
} finally {
c.disconnect()
} ?: return null
- val apk = pageApk(download("$PROJECTIVY_RELEASES/expanded_assets/$tag").decodeToString(), tag) ?: return null
+ val apk = pageApk(download("$releases/expanded_assets/$tag").decodeToString(), tag, releases) ?: return null
val head = URL(apk).openConnection() as HttpURLConnection
head.requestMethod = "HEAD"
head.connectTimeout = 10_000
@@ -147,13 +138,13 @@ class AndroidLauncherDownload(context: Context) : LauncherDownload {
} finally {
head.disconnect()
}
- return LauncherRelease(tag, "$PROJECTIVY_RELEASES/tag/$tag", apk, size).takeIf { it.valid() }
+ return LauncherRelease(tag, "$releases/tag/$tag", apk, size).takeIf { it.valid(launcher) }
}
- override suspend fun fetch(release: LauncherRelease, onProgress: (Progress) -> Unit): PickedApp = withContext(Dispatchers.IO) {
+ override suspend fun fetch(launcher: KnownLauncher, release: LauncherRelease, onProgress: (Progress) -> Unit): PickedApp = withContext(Dispatchers.IO) {
dir.deleteRecursively()
dir.mkdirs()
- val file = File(dir, "projectivy.apk")
+ val file = File(dir, "launcher.apk")
val c = URL(release.apk).openConnection() as HttpURLConnection
c.connectTimeout = 10_000
c.readTimeout = 30_000
@@ -177,13 +168,13 @@ class AndroidLauncherDownload(context: Context) : LauncherDownload {
} finally {
c.disconnect()
}
- read(file)
+ read(file, launcher)
}
- override suspend fun open(uri: Uri): PickedApp = withContext(Dispatchers.IO) {
+ override suspend fun open(uri: Uri, launcher: KnownLauncher): PickedApp = withContext(Dispatchers.IO) {
dir.deleteRecursively()
dir.mkdirs()
- val file = File(dir, "projectivy.apk")
+ val file = File(dir, "launcher.apk")
val input = ctx.contentResolver.openInputStream(uri) ?: throw IOException("can't read $uri")
input.use { s ->
file.outputStream().use { out ->
@@ -193,17 +184,17 @@ class AndroidLauncherDownload(context: Context) : LauncherDownload {
ensureActive()
val n = s.read(buf).takeIf { it >= 0 } ?: break
done += n
- // Far past Projectivy's size: some other file, never read whole.
- if (done > MAX_APK_BYTES) throw NotProjectivy()
+ // Far past the launcher's size: some other file, never read whole.
+ if (done > launcher.maxBytes) throw WrongApk()
out.write(buf, 0, n)
}
}
}
- read(file)
+ read(file, launcher)
}
/** The package manager checks the APK's signature while it reads the certificates. */
- private fun read(file: File): PickedApp {
+ private fun read(file: File, launcher: KnownLauncher): PickedApp {
val pm = ctx.packageManager
val pkg = if (Build.VERSION.SDK_INT >= 28) {
@Suppress("DEPRECATION") // the flags overload is API 33+
@@ -211,7 +202,7 @@ class AndroidLauncherDownload(context: Context) : LauncherDownload {
} else {
@Suppress("DEPRECATION")
pm.getPackageArchiveInfo(file.path, PackageManager.GET_SIGNATURES)
- } ?: throw NotProjectivy()
+ } ?: throw WrongApk()
val certs = if (Build.VERSION.SDK_INT >= 28) {
// A rotated key lists its past certificates first; the current one signs.
pkg.signingInfo?.let { if (it.hasMultipleSigners()) it.apkContentsSigners.toList() else it.signingCertificateHistory.takeLast(1) }
@@ -220,11 +211,11 @@ class AndroidLauncherDownload(context: Context) : LauncherDownload {
pkg.signatures?.toList()
}
val signers = certs.orEmpty().map { sha256(it.toByteArray()) }.toSet()
- if (!isProjectivy(pkg.packageName, signers)) throw NotProjectivy()
+ if (!launcher.accepts(pkg.packageName, signers)) throw WrongApk()
return PickedApp(
files = listOf(file),
info = ApkInfo(pkg.packageName, PackageInfoCompat.getLongVersionCode(pkg), pkg.versionName),
- label = "Projectivy Launcher",
+ label = launcher.name,
)
}
}
diff --git a/app/src/main/java/app/tellyscope/data/Launchers.kt b/app/src/main/java/app/tellyscope/data/Launchers.kt
index e724ed6..cf9b5b9 100644
--- a/app/src/main/java/app/tellyscope/data/Launchers.kt
+++ b/app/src/main/java/app/tellyscope/data/Launchers.kt
@@ -25,15 +25,34 @@ val ACCESSIBILITY_LAUNCHERS = mapOf(
* A third-party launcher Tellyscope knows, from `launchers.json`. [accessibility] is whether it is
* one of [ACCESSIBILITY_LAUNCHERS], never what the list says. [about] is the line Install a home
* screen shows; a launcher without one isn't offered there.
+ *
+ * Installing it from an APK rather than the Play Store: [signers] are the SHA-256s of the only
+ * certificates it may be signed with (empty: never from an APK), [maxBytes] is past any real copy of
+ * it, and [releases] is its developer's GitHub releases page, the only place the GitHub build
+ * downloads it from. [fireOs]: the launcher Fire OS installs, having no Play Store.
*/
data class KnownLauncher(
val pkg: String,
val name: String,
val about: String? = null,
+ val signers: Set<String> = emptySet(),
+ val maxBytes: Long = DEFAULT_MAX_MB shl 20,
+ val releases: String? = null,
+ val fireOs: Boolean = false,
) {
val accessibility get() = pkg in ACCESSIBILITY_LAUNCHERS
+
+ /** It, signed only by its developer: [signers] are the SHA-256s of an APK's certificates. */
+ fun accepts(packageName: String, signers: Set<String>) =
+ packageName == pkg && signers.isNotEmpty() && this.signers.isNotEmpty() && this.signers.containsAll(signers)
}
+private const val DEFAULT_MAX_MB = 64L
+private const val MAX_MB = 256L
+private val SIGNER = Regex("[0-9a-f]{64}")
+// "." and ".." are not repo names; they would walk the URL out of the repo.
+private val RELEASES = Regex("https://github\\.com/[A-Za-z0-9-]+/(?!\\.\\.?/)[A-Za-z0-9._-]+/releases")
+
/** Empty unless it is schema 1; entries that can't be read or aren't package names are dropped. */
fun parseLaunchers(text: String): List<KnownLauncher> = try {
val o = jsonObject(text)
@@ -42,6 +61,12 @@ fun parseLaunchers(text: String): List<KnownLauncher> = try {
pkg = l.getString("package"),
name = plainText(l.getString("name"), NAME_MAX),
about = l.optStringOrNull("about")?.let { plainText(it, NOTE_MAX) }?.ifEmpty { null },
+ // A signer that isn't a SHA-256 drops them all: a half-read list must not pass a different APK.
+ signers = l.optJSONArray("signers")?.let { a -> (0 until a.length()).map { a.optString(it) } }
+ ?.takeIf { s -> s.all(SIGNER::matches) }?.toSet().orEmpty(),
+ maxBytes = l.optLong("max_mb", DEFAULT_MAX_MB).coerceIn(1, MAX_MB) shl 20,
+ releases = l.optStringOrNull("releases")?.takeIf(RELEASES::matches),
+ fireOs = l.optBoolean("fire_os"),
).takeIf { PACKAGE.matches(it.pkg) && it.name.isNotEmpty() }
}
} catch (_: org.json.JSONException) {
@@ -97,6 +122,8 @@ data class Shared(
val labels: Map<String, String> = emptyMap(),
val streaming: List<StreamingService> = emptyList(),
val protected: Map<String, ProtectedReason> = emptyMap(),
+ /** The user's own list these came from ([DeviceLists.base]), or null for the default source. */
+ val list: String? = null,
)
/**
@@ -114,6 +141,8 @@ object SharedLists {
val launchers get() = _state.value.launchers
val labels get() = _state.value.labels
val streaming get() = _state.value.streaming
+ /** The user's own list the launchers came from, or null for the default: installing from it asks first. */
+ val list get() = _state.value.list
@Volatile private var data: DeviceLists? = null
@Volatile private var source: DeviceLists? = null
@@ -123,6 +152,7 @@ object SharedLists {
this.data = data
source = lists
if (fresh) reset(_state.value.copy(protected = emptyMap()))
+ _state.update { it.copy(list = lists.custom()?.let { lists.base }) }
apply(data::cachedShared, lists::cachedShared)
refresh()
}
@@ -144,7 +174,7 @@ object SharedLists {
val streaming = data("streaming")?.let(::parseStreaming)
val protected = source("protected")?.let(::parseProtected)
_state.update { now ->
- Shared(
+ now.copy(
launchers = launchers?.ifEmpty { null } ?: now.launchers,
labels = labels?.ifEmpty { null } ?: now.labels,
streaming = streaming?.ifEmpty { null } ?: now.streaming,
diff --git a/app/src/main/java/app/tellyscope/ui/Copy.kt b/app/src/main/java/app/tellyscope/ui/Copy.kt
index 80c6767..ff3d146 100644
--- a/app/src/main/java/app/tellyscope/ui/Copy.kt
+++ b/app/src/main/java/app/tellyscope/ui/Copy.kt
@@ -98,7 +98,7 @@ object Copy {
val MAKE_HOME = UiText(R.string.copy_make_home)
val GET_LAUNCHER = UiText(R.string.copy_get_launcher)
val GET_LAUNCHER_TEXT = UiText(R.string.copy_get_launcher_text)
- val GET_PROJECTIVY_TEXT = UiText(R.string.copy_get_projectivy_text)
+ fun getFireLauncherText(name: String) = UiText(R.string.copy_get_fire_launcher_text, name)
/** The Apps tab's launcher rows: switching lives in the card, this opens it. */
val HOME_SETTINGS = UiText(R.string.copy_home_settings)
@@ -244,8 +244,8 @@ object Copy {
/** The Store closed without an install: back on the picker, still chosen. */
fun wasntInstalled(name: String) = UiText(R.string.copy_wasnt_installed, name)
- /** Install Projectivy on Fire OS: Tellyscope downloads it from its developer's GitHub and installs it over adb. */
- val INSTALL_PROJECTIVY = UiText(R.string.copy_install_projectivy)
+ /** Install a launcher on Fire OS: Tellyscope downloads it from its developer's GitHub and installs it over adb. */
+ fun installLauncher(name: String) = UiText(R.string.copy_install_launcher, name)
val FIRE_INSTALL_TEXT = UiText(R.string.copy_fire_install_text)
fun downloadsFrom(name: String) = UiText(R.string.copy_downloads_from, name)
@@ -253,7 +253,7 @@ object Copy {
fun release(version: String, size: Long) = UiText(R.string.copy_release, version, bytes(size))
val WHERE_FROM = UiText(R.string.copy_where_from)
- val SIGNED_CHECK = UiText(R.string.copy_signed_check)
+ fun signedCheck(name: String) = UiText(R.string.copy_signed_check, name)
val DOWNLOAD_AND_INSTALL = UiText(R.string.copy_download_and_install)
/** Download directly on a TV with the Play Store: what Tellyscope checks, what it doesn't, and the safer way. */
@@ -264,17 +264,17 @@ object Copy {
val DOWNLOAD_ANYWAY = UiText(R.string.copy_download_anyway)
val STORE_INSTEAD = UiText(R.string.copy_store_instead)
- /** Install Projectivy's steps, one panel: download (or the picked file), the check, the install. */
+ /** The launcher install's steps, one panel: download (or the picked file), the check, the install. */
fun installing(name: String) = UiText(R.string.copy_installing, name)
val STEP_DOWNLOAD = UiText(R.string.copy_step_download)
val STEP_DOWNLOADED = UiText(R.string.copy_step_downloaded)
fun downloading(percent: Int, done: Long, total: Long) = UiText(R.string.copy_downloading, percent, bytes(done), bytes(total))
val STEP_PICKED = UiText(R.string.copy_step_picked)
- val STEP_CHECK = UiText(R.string.copy_step_check)
- val STEP_CHECKING = UiText(R.string.copy_step_checking)
- val STEP_CHECKED = UiText(R.string.copy_step_checked)
+ fun stepCheck(name: String) = UiText(R.string.copy_step_check, name)
+ fun stepChecking(name: String) = UiText(R.string.copy_step_checking, name)
+ fun stepChecked(name: String) = UiText(R.string.copy_step_checked, name)
val STEP_CHECKED_TEXT = UiText(R.string.copy_step_checked_text)
- val STEP_FAILED = UiText(R.string.copy_step_failed)
+ fun stepFailed(name: String) = UiText(R.string.copy_step_failed, name)
val STEP_FAILED_TEXT = UiText(R.string.copy_step_failed_text)
fun installOn(tv: String) = UiText(R.string.copy_install_on, tv)
@@ -286,26 +286,34 @@ object Copy {
val STOP = UiText(R.string.copy_stop)
val KEEP_DOWNLOADING = UiText(R.string.copy_keep_downloading)
- val NOT_PROJECTIVY = UiText(R.string.copy_not_projectivy)
- val NOT_PROJECTIVY_TEXT = UiText(R.string.copy_not_projectivy_text)
- val NOT_PROJECTIVY_FILE = UiText(R.string.copy_not_projectivy_file)
- val NOT_PROJECTIVY_FILE_TEXT = UiText(R.string.copy_not_projectivy_file_text)
+ fun wrongApk(name: String) = UiText(R.string.copy_wrong_apk, name)
+ fun wrongApkText(name: String) = UiText(R.string.copy_wrong_apk_text, name)
+ fun wrongApkFile(name: String) = UiText(R.string.copy_wrong_apk_file, name)
+ fun wrongApkFileText(name: String) = UiText(R.string.copy_wrong_apk_file_text, name)
val CANT_READ_FILE = UiText(R.string.copy_cant_read_file)
fun cantInstall(name: String) = UiText(R.string.copy_cant_install, name)
/** Couldn't download: GitHub's limit for the network ([until] is a clock time), or no way to reach it. */
- val NO_DOWNLOAD = UiText(R.string.copy_no_download)
+ fun noDownload(name: String) = UiText(R.string.copy_no_download, name)
val NO_DOWNLOAD_OFFLINE = UiText(R.string.copy_no_download_offline)
fun noDownloadLimited(until: String?) =
if (until != null) UiText(R.string.copy_no_download_limited_until, until) else UiText(R.string.copy_no_download_limited)
val OR_YOURSELF = UiText(R.string.copy_or_yourself)
val YOURSELF_PAGE = UiText(R.string.copy_yourself_page)
- fun yourselfPick(file: String?) = if (file != null) UiText(R.string.copy_yourself_pick_file, file) else UiText(R.string.copy_yourself_pick)
+ fun yourselfPick(file: String?, name: String) =
+ if (file != null) UiText(R.string.copy_yourself_pick_file, file, name) else UiText(R.string.copy_yourself_pick, name)
val LATEST_RELEASE = UiText(R.string.copy_latest_release)
val PICK_DOWNLOADED = UiText(R.string.copy_pick_downloaded)
val PICK_ANOTHER = UiText(R.string.copy_pick_another)
val TRY_DOWNLOAD_AGAIN = UiText(R.string.copy_try_download_again)
+ /** A launcher from a list the user added: shown, and ticked, before anything installs. */
+ val OWN_LIST_TITLE = UiText(R.string.copy_own_list_title)
+ val OWN_LIST_TEXT = UiText(R.string.copy_own_list_text)
+ val OWN_LIST_LIST = UiText(R.string.copy_own_list_list)
+ val OWN_LIST_SIGNER = UiText(R.string.copy_own_list_signer)
+ val OWN_LIST_TRUST = UiText(R.string.copy_own_list_trust)
+
val NOT_INSTALLED_TEXT = UiText(R.string.copy_not_installed_text)
/** The Tweaks row that reopens it after Not now on the card. */
diff --git a/app/src/main/java/app/tellyscope/ui/HomeScreenCard.kt b/app/src/main/java/app/tellyscope/ui/HomeScreenCard.kt
index c31387a..81bc8ea 100644
--- a/app/src/main/java/app/tellyscope/ui/HomeScreenCard.kt
+++ b/app/src/main/java/app/tellyscope/ui/HomeScreenCard.kt
@@ -65,7 +65,7 @@ internal fun homeMove(app: AppInfo, current: AppInfo?): Action? = when {
/**
* The Home screen card at the top of Tweaks: every launcher on the TV, which one Home opens, and
* the one place to change it. Make Home asks first; only the TV's own launcher is ever turned off.
- * [fire]: Fire OS ([fireInstall]), where Get another launcher installs Projectivy without a Play Store.
+ * [fire]: Fire OS ([fireInstall]), where Get another launcher installs the list's Fire OS one ([fireLauncher]) without a Play Store.
*/
@Composable
fun HomeScreenBlock(ui: DeviceUi, actions: DeviceActions, fire: Boolean = false) {
@@ -92,7 +92,8 @@ fun HomeScreenBlock(ui: DeviceUi, actions: DeviceActions, fire: Boolean = false)
if (launchers.none { !it.system } && (hasPlayStore(ui.apps) || fire)) {
Column(Modifier.fillMaxWidth().padding(top = 16.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
Text(Copy.GET_LAUNCHER.resolve(), style = MaterialTheme.typography.bodyLarge)
- Text((if (fire) Copy.GET_PROJECTIVY_TEXT else Copy.GET_LAUNCHER_TEXT).resolve(), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant)
+ val fireName = fireLauncher()?.name?.takeIf { fire }
+ Text((fireName?.let(Copy::getFireLauncherText) ?: Copy.GET_LAUNCHER_TEXT).resolve(), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant)
FilledTonalButton(onClick = actions.installLauncher, enabled = !locked) { Text(Copy.GET_LAUNCHER.resolve()) }
}
}
diff --git a/app/src/main/java/app/tellyscope/ui/LauncherFlowUi.kt b/app/src/main/java/app/tellyscope/ui/LauncherFlowUi.kt
index 16a7bbb..12e8812 100644
--- a/app/src/main/java/app/tellyscope/ui/LauncherFlowUi.kt
+++ b/app/src/main/java/app/tellyscope/ui/LauncherFlowUi.kt
@@ -7,6 +7,8 @@ package app.tellyscope.ui
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background
import androidx.compose.foundation.border
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsFocusedAsState
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -24,6 +26,7 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.selection.selectable
import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.foundation.selection.toggleable
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
@@ -35,6 +38,7 @@ import androidx.compose.material.icons.outlined.Home
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Checkbox
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Icon
@@ -53,8 +57,10 @@ import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.ripple
import androidx.compose.material3.toShape
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
@@ -63,6 +69,8 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.PathFillType
import androidx.compose.ui.graphics.SolidColor
@@ -74,6 +82,7 @@ import androidx.compose.ui.semantics.Role
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
@@ -83,11 +92,10 @@ import app.tellyscope.data.Action
import app.tellyscope.data.AppInfo
import app.tellyscope.data.Device
import app.tellyscope.data.LauncherRelease
-import app.tellyscope.data.PROJECTIVY
-import app.tellyscope.data.PROJECTIVY_RELEASES
import app.tellyscope.data.UiText
import app.tellyscope.data.asUiText
import app.tellyscope.data.isFireOs
+import app.tellyscope.data.sourceName
import app.tellyscope.data.resolve
import app.tellyscope.ui.theme.SmallNumber
@@ -105,11 +113,11 @@ internal fun hasPlayStore(apps: List<AppInfo>) = apps.any { it.packageName == PL
internal fun hasAddedLauncher(apps: List<AppInfo>) = apps.any { it.listedLauncher || (it.removable && (it.home || it.answersHome)) }
/**
- * Fire OS has no Play Store, so Install a home screen offers only Projectivy there, which Tellyscope downloads
- * from its developer and installs itself. Only while the launcher list ([recommended]) has Projectivy; without it, nothing is offered.
+ * Fire OS has no Play Store, so Install a home screen offers only the list's Fire OS launcher there ([fireLauncher]),
+ * which Tellyscope downloads from its developer and installs itself. Without one on the list, nothing is offered.
*/
internal fun fireInstall(device: Device, apps: List<AppInfo>, recommended: List<Recommended> = RECOMMENDED) =
- isFireOs(device, apps) && recommended.any { it.pkg == PROJECTIVY }
+ isFireOs(device, apps) && fireLauncher(recommended) != null
/** [fire]: [fireInstall] holds, so the Play Store isn't needed. */
internal fun offerChoose(apps: List<AppInfo>, fire: Boolean = false) = (hasPlayStore(apps) || fire) && !hasAddedLauncher(apps)
@@ -117,8 +125,9 @@ internal fun offerChoose(apps: List<AppInfo>, fire: Boolean = false) = (hasPlayS
internal fun offerLauncher(apps: List<AppInfo>, hidden: Boolean, fire: Boolean = false) =
!hidden && offerChoose(apps, fire) && apps.none { it.homeInstead != null || it.homeBack != null }
-/** Download directly is offered on [pkg] beside the Store: only launchers whose download and signer are pinned. */
-internal fun downloadable(pkg: String) = pkg == PROJECTIVY
+/** Download directly is offered on [pkg] beside the Store: only launchers whose list entry names its signers and releases. */
+internal fun downloadable(pkg: String) =
+ RECOMMENDED.firstOrNull { it.pkg == pkg }?.launcher?.let { it.signers.isNotEmpty() && it.releases != null } == true
/** [pkg] on the TV and on, so the picker offers Make Home or Open on it rather than the Store. */
internal fun installedLauncher(apps: List<AppInfo>, pkg: String) = apps.firstOrNull { it.packageName == pkg && it.enabled }
@@ -140,8 +149,10 @@ data class LauncherActions(
/** Open in the picker: shows that launcher on the TV. */
val open: (String) -> Unit = {},
val later: () -> Unit = {},
- /** Fire OS: Install Projectivy, which reads the latest release for the confirm dialog. Try again does the same. */
- val fireCheck: () -> Unit = {},
+ /** Fire OS: Install the launcher, which reads its latest release for the confirm dialog. Try again does the same. */
+ val fireCheck: (String) -> Unit = {},
+ /** The tick on a launcher from the user's own list. */
+ val fireTrust: (Boolean) -> Unit = {},
/** Fire OS: Download and install on the confirm step. */
val fireInstall: () -> Unit = {},
/** Fire OS: X, Stop or OK on a step. */
@@ -150,7 +161,7 @@ data class LauncherActions(
val firePick: () -> Unit = {},
)
-/** The Apps tab's card: a launcher without ads, from the Play Store ([fire]: Projectivy, installed by Tellyscope). Not now puts it away on this TV. */
+/** The Apps tab's card: a launcher without ads, from the Play Store ([fire]: the list's Fire OS one, installed by Tellyscope). Not now puts it away on this TV. */
@Composable
fun LauncherCard(current: String?, onNotNow: () -> Unit, onChoose: () -> Unit, fire: Boolean = false) {
HomeNoteCard(
@@ -164,7 +175,7 @@ fun LauncherCard(current: String?, onNotNow: () -> Unit, onChoose: () -> Unit, f
* Play Store, then the switch, which ends in the same yes for the accessibility service as Set as
* default. A launcher already on the TV skips the Store: the picker offers Make Home or Open on it.
* A TV that didn't open the Store says so; a Store closed without installing goes back to the picker.
- * On Fire OS ([LauncherFlow.fireOs]) the picker is Projectivy alone, which Tellyscope downloads and installs.
+ * On Fire OS ([LauncherFlow.fireOs]) the picker is the list's Fire OS launcher alone, which Tellyscope downloads and installs.
* [direct]: a launcher that is [downloadable] also offers Download directly, under the Store and after a warning.
*/
@OptIn(ExperimentalMaterial3Api::class)
@@ -215,7 +226,7 @@ fun LauncherScreen(
title = {
Text(
when {
- flow.fireOs -> Copy.INSTALL_PROJECTIVY
+ flow.fireOs -> Copy.installLauncher(label)
flow.step == LauncherFlow.Step.Pick -> Copy.CHOOSE_HOME
else -> Copy.INSTALL_HOME
}.resolve(),
@@ -235,7 +246,7 @@ fun LauncherScreen(
) {
when (flow.step) {
LauncherFlow.Step.Pick -> if (fire != null) {
- FireButtons(fire, actions, Modifier.weight(1f))
+ FireButtons(fire, flow.pkg, actions, Modifier.weight(1f))
} else {
val have = installedLauncher(apps, chosen)
when {
@@ -250,7 +261,7 @@ fun LauncherScreen(
}
IconButtonText(OpenInNew, Copy.GET_FROM_STORE.resolve(), Modifier.fillMaxWidth()) { actions.install(chosen) }
if (both) {
- OutlinedButton(onClick = actions.fireCheck, enabled = flow.fire == null, modifier = Modifier.fillMaxWidth()) { Text(Copy.DOWNLOAD_DIRECTLY.resolve()) }
+ OutlinedButton(onClick = { actions.fireCheck(chosen) }, enabled = flow.fire == null, modifier = Modifier.fillMaxWidth()) { Text(Copy.DOWNLOAD_DIRECTLY.resolve()) }
}
}
// Home now, or a TV that can't take it as Home: only Open.
@@ -290,7 +301,7 @@ fun LauncherScreen(
}
val c = MaterialTheme.colorScheme
when (flow.step) {
- LauncherFlow.Step.Pick -> if (fire != null) FireBody(fire, device, actions.firePick) else Picker(chosen, apps, direct) { chosen = it }
+ LauncherFlow.Step.Pick -> if (fire != null) FireBody(fire, flow.pkg, device, actions) else Picker(chosen, apps, direct) { chosen = it }
LauncherFlow.Step.Waiting -> {
Hero(LauncherIcons.Download, c.secondaryContainer, c.onSecondaryContainer)
Headed(Copy.INSTALL_IT.resolve(), bold(Copy.installItText(label).resolve(), label, stringResource(R.string.launcher_install_word)))
@@ -381,12 +392,12 @@ private fun Picker(chosen: String, apps: List<AppInfo>, direct: Boolean, onChoos
}
}
-/** Fire OS's picker: Projectivy alone, about it as the picker says it, and nothing to do on the TV. */
+/** Fire OS's picker: [l] alone, about it as the picker says it, and nothing to do on the TV. */
@Composable
-private fun FirePick() {
+private fun FirePick(l: Recommended?) {
val c = MaterialTheme.colorScheme
Text(Copy.FIRE_INSTALL_TEXT.resolve(), style = MaterialTheme.typography.bodyLarge, color = c.onSurfaceVariant)
- val l = RECOMMENDED.firstOrNull { it.pkg == PROJECTIVY } ?: return
+ l ?: return
Surface(shape = MaterialTheme.shapes.large, color = c.surfaceContainer, modifier = Modifier.fillMaxWidth()) {
Column(Modifier.padding(16.dp)) {
Text(l.name, style = MaterialTheme.typography.bodyLarge)
@@ -406,65 +417,60 @@ private fun FirePick() {
* went wrong. Couldn't download offers the release page and Pick the downloaded file, checked the same way.
* After Download directly ([FireInstall.store]) the confirm is a warning, and it and a wrong signature offer
* the Play Store instead.
+ * From the user's own list ([FireInstall.list]) each step that can install it opens on [OwnListCard].
*/
@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
-private fun FireBody(f: FireInstall, device: Device, onPick: () -> Unit) {
+private fun FireBody(f: FireInstall, pkg: String, device: Device, actions: LauncherActions) {
val c = MaterialTheme.colorScheme
val uri = LocalUriHandler.current
- val label = launcherName(PROJECTIVY)
+ val l = RECOMMENDED.firstOrNull { it.pkg == pkg }
+ val label = launcherName(pkg)
+ val releases = l?.launcher?.releases
val release = f.release
- val openPage = { uri.openUri(release?.page ?: "$PROJECTIVY_RELEASES/latest") }
+ val openPage = { (release?.page ?: releases?.let { "$it/latest" })?.let(uri::openUri) ?: Unit }
+ val source = releases?.removePrefix("https://")?.removeSuffix("/releases")
+ val own = f.list?.takeIf { f.step in OWN_LIST_STEPS }
+ if (own != null) OwnListCard(own, l?.launcher?.signers.orEmpty())
when (f.step) {
null, FireInstall.Step.Checking, FireInstall.Step.Confirm -> if (f.store) {
WarningBadge()
Text(Copy.downloadDirectly(label).resolve(), style = MaterialTheme.typography.headlineMedium)
Text(Copy.downloadsFrom(label).resolve(), style = MaterialTheme.typography.bodyMedium, color = c.onSurfaceVariant)
- release?.let { SourceRow(it, openPage) }
+ release?.let { SourceRow(source, it, openPage) }
Text(Copy.DIRECT_CHECK.resolve(), style = MaterialTheme.typography.bodyMedium, color = c.onSurfaceVariant)
Text(Copy.STORE_SAFER.resolve(), style = MaterialTheme.typography.bodyMedium, color = c.onSurfaceVariant)
} else {
- FirePick()
+ FirePick(l)
if (release != null) {
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
Text(Copy.WHERE_FROM.resolve(), style = MaterialTheme.typography.labelLarge, color = c.primary)
- SourceRow(release, openPage)
+ SourceRow(source, release, openPage)
}
- Text(Copy.SIGNED_CHECK.resolve(), style = MaterialTheme.typography.bodySmall, color = c.onSurfaceVariant)
+ Text(Copy.signedCheck(label).resolve(), style = MaterialTheme.typography.bodySmall, color = c.onSurfaceVariant)
}
}
FireInstall.Step.Downloading, FireInstall.Step.Reading, FireInstall.Step.Installing -> {
Text(Copy.installing(label).resolve(), style = MaterialTheme.typography.labelLarge, color = c.primary)
- FireSteps(f, device)
+ FireSteps(f, label, device)
Text(Copy.INSTALL_KEEP_OPEN.resolve(), style = MaterialTheme.typography.bodySmall, color = c.onSurfaceVariant)
}
- FireInstall.Step.NotProjectivy -> {
+ FireInstall.Step.WrongApk -> {
Hero(LauncherIcons.ErrorOutline, c.errorContainer, c.onErrorContainer)
Headed(
- (if (f.picked) Copy.NOT_PROJECTIVY_FILE else Copy.NOT_PROJECTIVY).resolve(),
- AnnotatedString((if (f.picked) Copy.NOT_PROJECTIVY_FILE_TEXT else Copy.NOT_PROJECTIVY_TEXT).resolve()),
+ (if (f.picked) Copy.wrongApkFile(label) else Copy.wrongApk(label)).resolve(),
+ AnnotatedString((if (f.picked) Copy.wrongApkFileText(label) else Copy.wrongApkText(label)).resolve()),
)
- FireSteps(f, device)
+ FireSteps(f, label, device)
if (f.store) Text(Copy.STORE_INSTEAD.resolve(), style = MaterialTheme.typography.bodyMedium, color = c.onSurfaceVariant)
}
FireInstall.Step.NoDownload -> {
Hero(LauncherIcons.ErrorOutline, c.errorContainer, c.onErrorContainer)
val text = if (f.until != null) Copy.noDownloadLimited(clockTime(f.until)) else Copy.NO_DOWNLOAD_OFFLINE
- Headed(Copy.NO_DOWNLOAD.resolve(), AnnotatedString(text.resolve()))
+ Headed(Copy.noDownload(label).resolve(), AnnotatedString(text.resolve()))
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
Text(Copy.OR_YOURSELF.resolve(), style = MaterialTheme.typography.labelLarge, color = c.primary)
- Surface(shape = MaterialTheme.shapes.large, color = c.surfaceContainer, modifier = Modifier.fillMaxWidth()) {
- Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
- Numbered(1) {
- Text(Copy.YOURSELF_PAGE.resolve(), style = MaterialTheme.typography.bodyMedium)
- SourceRow(release, openPage)
- }
- Numbered(2) {
- Text(Copy.yourselfPick(release?.apk?.substringAfterLast('/')).resolve(), style = MaterialTheme.typography.bodyMedium)
- FilledTonalButton(onClick = onPick, modifier = Modifier.fillMaxWidth()) { Text(Copy.PICK_DOWNLOADED.resolve()) }
- }
- }
- }
+ Yourself(f, label, source, openPage, actions)
}
}
FireInstall.Step.Refused -> {
@@ -474,32 +480,60 @@ private fun FireBody(f: FireInstall, device: Device, onPick: () -> Unit) {
}
}
-/** The bottom of each Fire OS step: full width, so the confirm reads the same as Download directly's. */
+/**
+ * Download it in the browser, then pick it: after Couldn't download. From the user's own list,
+ * picking waits for the tick ([TrustRow]).
+ */
+@Composable
+private fun Yourself(f: FireInstall, label: String, source: String?, openPage: () -> Unit, actions: LauncherActions) {
+ val release = f.release
+ Surface(shape = MaterialTheme.shapes.large, color = MaterialTheme.colorScheme.surfaceContainer, modifier = Modifier.fillMaxWidth()) {
+ Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
+ Numbered(1) {
+ Text(Copy.YOURSELF_PAGE.resolve(), style = MaterialTheme.typography.bodyMedium)
+ SourceRow(source, release, openPage)
+ }
+ Numbered(2) {
+ Text(Copy.yourselfPick(release?.apk?.substringAfterLast('/'), label).resolve(), style = MaterialTheme.typography.bodyMedium)
+ if (f.list != null) TrustRow(f.trusted, actions.fireTrust)
+ FilledTonalButton(onClick = actions.firePick, enabled = !f.gated, modifier = Modifier.fillMaxWidth()) { Text(Copy.PICK_DOWNLOADED.resolve()) }
+ }
+ }
+ }
+}
+
+/**
+ * The bottom of each Fire OS step, for [pkg]: full width, so the confirm reads the same as Download directly's.
+ * From the user's own list, the download waits for the tick ([TrustRow]).
+ */
@Composable
-private fun FireButtons(f: FireInstall, actions: LauncherActions, modifier: Modifier) {
- val store = { actions.install(PROJECTIVY) }
+private fun FireButtons(f: FireInstall, pkg: String, actions: LauncherActions, modifier: Modifier) {
+ val store = { actions.install(pkg) }
+ val check = { actions.fireCheck(pkg) }
Column(modifier, verticalArrangement = Arrangement.spacedBy(8.dp)) {
val wide = Modifier.fillMaxWidth()
when (f.step) {
- null, FireInstall.Step.Checking -> IconButtonText(LauncherIcons.Download, Copy.INSTALL_PROJECTIVY.resolve(), wide, enabled = f.step == null, onClick = actions.fireCheck)
+ null, FireInstall.Step.Checking -> IconButtonText(LauncherIcons.Download, Copy.installLauncher(launcherName(pkg)).resolve(), wide, enabled = f.step == null, onClick = check)
// The safe way first and filled; the download only as the outlined second.
FireInstall.Step.Confirm -> if (f.store) {
IconButtonText(OpenInNew, Copy.GET_FROM_STORE.resolve(), wide, onClick = store)
- OutlinedButton(onClick = actions.fireInstall, modifier = wide) { Text(Copy.DOWNLOAD_ANYWAY.resolve()) }
+ if (f.list != null) TrustRow(f.trusted, actions.fireTrust)
+ OutlinedButton(onClick = actions.fireInstall, enabled = !f.gated, modifier = wide) { Text(Copy.DOWNLOAD_ANYWAY.resolve()) }
} else {
- IconButtonText(LauncherIcons.Download, Copy.DOWNLOAD_AND_INSTALL.resolve(), wide, onClick = actions.fireInstall)
+ if (f.list != null) TrustRow(f.trusted, actions.fireTrust)
+ IconButtonText(LauncherIcons.Download, Copy.DOWNLOAD_AND_INSTALL.resolve(), wide, enabled = !f.gated, onClick = actions.fireInstall)
}
FireInstall.Step.Downloading, FireInstall.Step.Reading, FireInstall.Step.Installing -> Unit
- FireInstall.Step.NotProjectivy -> when {
+ FireInstall.Step.WrongApk -> when {
f.picked -> Row(wide, horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End)) {
TextButton(onClick = actions.firePick) { Text(Copy.PICK_ANOTHER.resolve()) }
- Button(onClick = actions.fireCheck) { Text(Copy.TRY_DOWNLOAD_AGAIN.resolve()) }
+ Button(onClick = check) { Text(Copy.TRY_DOWNLOAD_AGAIN.resolve()) }
}
f.store -> IconButtonText(OpenInNew, Copy.GET_FROM_STORE.resolve(), wide, onClick = store)
- else -> Button(onClick = actions.fireCheck, modifier = wide) { Text(Copy.TRY_AGAIN.resolve()) }
+ else -> Button(onClick = check, modifier = wide) { Text(Copy.TRY_AGAIN.resolve()) }
}
FireInstall.Step.NoDownload -> Row(wide, horizontalArrangement = Arrangement.End) {
- Button(onClick = actions.fireCheck) { Text(Copy.TRY_AGAIN.resolve()) }
+ Button(onClick = check) { Text(Copy.TRY_AGAIN.resolve()) }
}
FireInstall.Step.Refused -> Row(wide, horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End)) {
if (f.picked) TextButton(onClick = actions.firePick) { Text(Copy.PICK_ANOTHER.resolve()) }
@@ -526,10 +560,10 @@ private enum class StepMark { Todo, Active, Done, Failed }
/** Download (or the picked file), the check, the install: each to do, under way, done, or failed. */
@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
-private fun FireSteps(f: FireInstall, device: Device) {
+private fun FireSteps(f: FireInstall, label: String, device: Device) {
val c = MaterialTheme.colorScheme
val release = f.release
- val failed = f.step == FireInstall.Step.NotProjectivy
+ val failed = f.step == FireInstall.Step.WrongApk
val checked = f.step == FireInstall.Step.Installing
Surface(shape = MaterialTheme.shapes.large, color = c.surfaceContainer, modifier = Modifier.fillMaxWidth()) {
Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
@@ -547,10 +581,10 @@ private fun FireSteps(f: FireInstall, device: Device) {
else -> StepLine(1, StepMark.Done, Copy.STEP_DOWNLOADED, release?.let { Copy.release(it.version, it.size) })
}
when {
- failed -> StepLine(2, StepMark.Failed, Copy.STEP_FAILED, Copy.STEP_FAILED_TEXT)
- checked -> StepLine(2, StepMark.Done, Copy.STEP_CHECKED, Copy.STEP_CHECKED_TEXT)
- f.step == FireInstall.Step.Reading -> StepLine(2, StepMark.Active, Copy.STEP_CHECKING)
- else -> StepLine(2, StepMark.Todo, Copy.STEP_CHECK)
+ failed -> StepLine(2, StepMark.Failed, Copy.stepFailed(label), Copy.STEP_FAILED_TEXT)
+ checked -> StepLine(2, StepMark.Done, Copy.stepChecked(label), Copy.STEP_CHECKED_TEXT)
+ f.step == FireInstall.Step.Reading -> StepLine(2, StepMark.Active, Copy.stepChecking(label))
+ else -> StepLine(2, StepMark.Todo, Copy.stepCheck(label))
}
if (!failed) {
if (checked) {
@@ -611,15 +645,12 @@ private fun StopDialog(onKeep: () -> Unit, onStop: () -> Unit) {
private fun clockTime(millis: Long): String =
java.text.DateFormat.getTimeInstance(java.text.DateFormat.SHORT).format(java.util.Date(millis))
-/** Projectivy's repo, as the source row names it. */
-private val PROJECTIVY_SOURCE = PROJECTIVY_RELEASES.removePrefix("https://").removeSuffix("/releases")
-
/**
- * Where the download comes from, as one tappable row: the repo, then the release and its size; it opens the
- * release page. With no [release] read, it says the latest one and opens that.
+ * Where the download comes from, as one tappable row: the repo ([source], like github.com/owner/repo), then the
+ * release and its size; it opens the release page. With no [release] read, it says the latest one and opens that.
*/
@Composable
-private fun SourceRow(release: LauncherRelease?, onOpen: () -> Unit) {
+private fun SourceRow(source: String?, release: LauncherRelease?, onOpen: () -> Unit) {
val c = MaterialTheme.colorScheme
Surface(
onClick = onOpen,
@@ -631,7 +662,7 @@ private fun SourceRow(release: LauncherRelease?, onOpen: () -> Unit) {
Icon(LauncherIcons.Code, null, Modifier.size(20.dp), tint = c.onSurfaceVariant)
Spacer(Modifier.width(12.dp))
Column(Modifier.weight(1f)) {
- Text(PROJECTIVY_SOURCE, style = MaterialTheme.typography.bodyMedium, color = c.primary, maxLines = 1, overflow = TextOverflow.Ellipsis)
+ Text(source.orEmpty(), style = MaterialTheme.typography.bodyMedium, color = c.primary, maxLines = 1, overflow = TextOverflow.Ellipsis)
Text((release?.let { Copy.release(it.version, it.size) } ?: Copy.LATEST_RELEASE).resolve(), style = MaterialTheme.typography.bodySmall, color = c.onSurfaceVariant)
}
Spacer(Modifier.width(8.dp))
@@ -650,6 +681,69 @@ private fun WarningBadge() {
}
}
+/** The steps that can still download or pick the APK, which [OwnListCard] opens. */
+private val OWN_LIST_STEPS = setOf(null, FireInstall.Step.Checking, FireInstall.Step.Confirm, FireInstall.Step.NoDownload)
+
+/**
+ * A launcher from the user's own list ([FireInstall.list]): the list's address and the signer it names, since all
+ * Tellyscope can check is that the APK matches them. In the error colours, above everything else on the step.
+ */
+@Composable
+private fun OwnListCard(list: String, signers: Set<String>) {
+ val c = MaterialTheme.colorScheme
+ Surface(shape = MaterialTheme.shapes.large, color = c.errorContainer, contentColor = c.onErrorContainer, modifier = Modifier.fillMaxWidth()) {
+ Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Icon(Icons.Default.Warning, null, Modifier.size(20.dp))
+ Spacer(Modifier.width(8.dp))
+ Text(Copy.OWN_LIST_TITLE.resolve(), style = MaterialTheme.typography.titleSmall)
+ }
+ Text(Copy.OWN_LIST_TEXT.resolve(), style = MaterialTheme.typography.bodyMedium)
+ Column {
+ Text(Copy.OWN_LIST_LIST.resolve(), style = MaterialTheme.typography.labelMedium)
+ Text(sourceName(list), style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Medium)
+ }
+ Column {
+ Text(Copy.OWN_LIST_SIGNER.resolve(), style = MaterialTheme.typography.labelMedium)
+ signers.forEach { Text(groupedHex(it), style = MaterialTheme.typography.bodySmall, fontFamily = FontFamily.Monospace) }
+ }
+ }
+ }
+}
+
+/** A SHA-256 as [OwnListCard] shows it: groups of eight, four to a line. */
+internal fun groupedHex(sha: String) = sha.chunked(8).chunked(4).joinToString("\n") { it.joinToString(" ") }
+
+/**
+ * I trust this list and its signer: the extra step before a launcher from the user's own list downloads or is
+ * picked. Keyboard and D-pad focus start here rather than on the button, which needs a press of its own.
+ */
+@Composable
+private fun TrustRow(trusted: Boolean, onTrust: (Boolean) -> Unit) {
+ val c = MaterialTheme.colorScheme
+ val focus = remember { FocusRequester() }
+ val interaction = remember { MutableInteractionSource() }
+ val focused by interaction.collectIsFocusedAsState()
+ LaunchedEffect(Unit) { runCatching { focus.requestFocus() } }
+ Surface(
+ shape = MaterialTheme.shapes.large,
+ border = if (focused) BorderStroke(3.dp, c.onSurface) else BorderStroke(1.dp, c.outline),
+ modifier = Modifier.fillMaxWidth(),
+ ) {
+ Row(
+ Modifier
+ .focusRequester(focus)
+ .toggleable(trusted, interaction, indication = ripple(), role = Role.Checkbox, onValueChange = onTrust)
+ .padding(horizontal = 8.dp, vertical = 4.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ Checkbox(trusted, onCheckedChange = null, Modifier.padding(8.dp))
+ Spacer(Modifier.width(4.dp))
+ Text(Copy.OWN_LIST_TRUST.resolve(), style = MaterialTheme.typography.bodyLarge)
+ }
+ }
+}
+
/** Row [i] of a segmented list ending at [last]: the ends rounded, the joins tight. */
private fun segment(i: Int, last: Int): RoundedCornerShape {
val top = if (i == 0) 16.dp else 4.dp
diff --git a/app/src/main/java/app/tellyscope/ui/Recommended.kt b/app/src/main/java/app/tellyscope/ui/Recommended.kt
index 4fbb3e0..cc98797 100644
--- a/app/src/main/java/app/tellyscope/ui/Recommended.kt
+++ b/app/src/main/java/app/tellyscope/ui/Recommended.kt
@@ -3,16 +3,28 @@
package app.tellyscope.ui
import app.tellyscope.data.AppNames
+import app.tellyscope.data.KnownLauncher
import app.tellyscope.data.SharedLists
/**
* A launcher Install a home screen offers, from `launchers.json`: its name and a line
* on what it's like.
*/
-data class Recommended(val pkg: String, val name: String, val about: String, val accessibility: Boolean)
+data class Recommended(
+ val pkg: String,
+ val name: String,
+ val about: String,
+ val accessibility: Boolean,
+ /** Its whole entry, with what installing it from an APK takes. */
+ val launcher: KnownLauncher = KnownLauncher(pkg, name, about),
+)
/** In the picker's order: the launchers on `launchers.json` that have an `about` line, in file order. */
val RECOMMENDED: List<Recommended> get() =
- SharedLists.launchers.mapNotNull { l -> l.about?.let { Recommended(l.pkg, l.name, it, l.accessibility) } }
+ SharedLists.launchers.mapNotNull { l -> l.about?.let { Recommended(l.pkg, l.name, it, l.accessibility, l) } }
fun launcherName(pkg: String) = RECOMMENDED.firstOrNull { it.pkg == pkg }?.name ?: AppNames.fallback(pkg)
+
+/** The launcher Fire OS installs, having no Play Store: the list's `fire_os` one, if it says how to check the APK. */
+fun fireLauncher(recommended: List<Recommended> = RECOMMENDED) =
+ recommended.firstOrNull { it.launcher.fireOs && it.launcher.signers.isNotEmpty() }
diff --git a/app/src/main/java/app/tellyscope/ui/TellyscopeViewModel.kt b/app/src/main/java/app/tellyscope/ui/TellyscopeViewModel.kt
index 4856ca5..7bf3fcf 100644
--- a/app/src/main/java/app/tellyscope/ui/TellyscopeViewModel.kt
+++ b/app/src/main/java/app/tellyscope/ui/TellyscopeViewModel.kt
@@ -34,12 +34,11 @@ import app.tellyscope.data.Dock
import app.tellyscope.data.Docked
import app.tellyscope.data.HistoryEntry
import app.tellyscope.data.KeyHaptics
+import app.tellyscope.data.KnownLauncher
import app.tellyscope.data.LauncherDownload
import app.tellyscope.data.LauncherRelease
import app.tellyscope.data.NetworkInfo
import app.tellyscope.data.NotAnApp
-import app.tellyscope.data.NotProjectivy
-import app.tellyscope.data.PROJECTIVY
import app.tellyscope.data.PhoneStorage
import app.tellyscope.data.PickedApp
import app.tellyscope.data.RateLimited
@@ -53,6 +52,7 @@ import app.tellyscope.data.ScanEvent
import app.tellyscope.data.ScanHit
import app.tellyscope.data.ScanKind
import app.tellyscope.data.ScanProgress
+import app.tellyscope.data.SharedLists
import app.tellyscope.data.Snapshot
import app.tellyscope.data.StoreState
import app.tellyscope.data.Suggestions
@@ -64,6 +64,7 @@ import app.tellyscope.data.FoldBook
import app.tellyscope.data.SeenBook
import app.tellyscope.data.UpdateCheck
import app.tellyscope.data.UiText
+import app.tellyscope.data.WrongApk
import app.tellyscope.data.why
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.CompletableDeferred
@@ -191,12 +192,12 @@ data class ResetUi(
data class LauncherFlow(val step: Step = Step.Pick, val pkg: String = RECOMMENDED.first().pkg, val fire: FireInstall? = null) {
enum class Step { Pick, Waiting, NoStore, Left, Installed }
- /** Fire OS: Projectivy alone, with no Play Store; not Download directly beside the Store ([FireInstall.store]). */
+ /** Fire OS: its launcher alone ([fireLauncher]), with no Play Store; not Download directly beside the Store ([FireInstall.store]). */
val fireOs get() = fire != null && !fire.store
}
/**
- * Install Projectivy on Fire OS ([fireInstall]), on [LauncherFlow.Step.Pick] in place of the picker: there's no
+ * Install a launcher's APK on Fire OS ([fireInstall]), on [LauncherFlow.Step.Pick] in place of the picker: there's no
* Play Store, so Tellyscope reads the latest release ([Step.Checking]), asks ([Step.Confirm]), downloads and
* checks it ([Step.Downloading]), installs it over adb ([Step.Installing]), then moves to [LauncherFlow.Step.Installed].
* A null [step] is the picker with nothing started. [error] is the TV's refusal, for [Step.Refused].
@@ -215,8 +216,17 @@ data class FireInstall(
val until: Long? = null,
/** The APK's size once it's downloaded or picked, for the steps' first line. */
val size: Long? = null,
+ /**
+ * The user's own list the launcher comes from ([SharedLists.list]), null for the default source. Then nothing
+ * downloads or installs until the user ticks that they trust it and its signer ([trusted]).
+ */
+ val list: String? = null,
+ val trusted: Boolean = false,
) {
- enum class Step { Checking, Confirm, Downloading, Reading, Installing, NotProjectivy, NoDownload, Refused }
+ enum class Step { Checking, Confirm, Downloading, Reading, Installing, WrongApk, NoDownload, Refused }
+
+ /** From the user's own list and not yet trusted: Download and install and Pick the downloaded file wait. */
+ val gated get() = list != null && !trusted
}
/**
@@ -417,8 +427,10 @@ class TellyscopeViewModel(
private val historySeen: SeenBook? = null,
/** This build and phone, for reports. */
private val appFacts: AppFacts = AppFacts("unknown", "unknown phone"),
- /** Projectivy from its developer's GitHub, for Fire OS. */
+ /** A launcher's APK from its developer's GitHub, for Fire OS. */
private val launcherDownload: LauncherDownload? = null,
+ /** The user's own list the launchers came from, or null for the default source. */
+ private val ownList: () -> String? = { SharedLists.list },
) : ViewModel() {
private val _state = MutableStateFlow(UiState(now = clock()))
@@ -944,8 +956,9 @@ class TellyscopeViewModel(
/** Opens Install a home screen on its picker; not before the launcher list has been downloaded once. */
fun openLauncherFlow() {
val id = _state.value.selectedId ?: return
- if (_state.value.selected?.let { fireInstall(it, _state.value.device.apps) } == true) {
- updateDevice(id) { it.copy(launcher = LauncherFlow(pkg = PROJECTIVY, fire = FireInstall())) }
+ val fire = fireLauncher()?.takeIf { _state.value.selected?.let { d -> fireInstall(d, _state.value.device.apps) } == true }
+ if (fire != null) {
+ updateDevice(id) { it.copy(launcher = LauncherFlow(pkg = fire.pkg, fire = FireInstall(list = ownList()))) }
return
}
if (RECOMMENDED.isEmpty()) {
@@ -961,82 +974,113 @@ class TellyscopeViewModel(
/** Download directly is offered beside the Play Store: there's a way to download, as on Fire OS. */
val directDownload get() = launcherDownload != null
+ /** [pkg]'s entry on the launcher list, when it says how to check its APK: the only launchers installed from one. */
+ private fun apkLauncher(pkg: String?): KnownLauncher? =
+ RECOMMENDED.firstOrNull { it.pkg == pkg }?.launcher?.takeIf { it.signers.isNotEmpty() }
+
/**
- * Install Projectivy on Fire OS, or Download directly in the picker: reads the latest release, for the
+ * Install [pkg] on Fire OS, or Download directly in the picker: reads its latest release, for the
* confirm dialog to show where it comes from.
*/
- fun checkProjectivy() {
+ fun checkLauncherApk(pkg: String) {
val id = _state.value.selectedId ?: return
val download = launcherDownload ?: return
+ val launcher = apkLauncher(pkg) ?: return
val store = _state.value.device.launcher?.let { it.fire?.store ?: true } ?: return
+ val list = ownList()
launcherJob?.cancel()
- updateDevice(id) { d -> d.copy(launcher = d.launcher?.copy(pkg = PROJECTIVY, fire = FireInstall(FireInstall.Step.Checking, store = store))) }
+ updateDevice(id) { d -> d.copy(launcher = d.launcher?.copy(pkg = pkg, fire = FireInstall(FireInstall.Step.Checking, store = store, list = list))) }
launcherJob = viewModelScope.launch {
val release = try {
- download.latest()
+ download.latest(launcher)
} catch (e: CancellationException) {
throw e
} catch (e: RateLimited) {
- return@launch setFire(id) { FireInstall(FireInstall.Step.NoDownload, store = store, until = e.until) }
+ return@launch setFire(id) { FireInstall(FireInstall.Step.NoDownload, store = store, until = e.until, list = list) }
} catch (_: Exception) {
- return@launch setFire(id) { FireInstall(FireInstall.Step.NoDownload, store = store) }
+ return@launch setFire(id) { FireInstall(FireInstall.Step.NoDownload, store = store, list = list) }
}
- setFire(id) { FireInstall(FireInstall.Step.Confirm, release, store = store) }
+ setFire(id) { FireInstall(FireInstall.Step.Confirm, release, store = store, list = list) }
}
}
/**
- * Download and install: fetches the APK, which must be Projectivy signed by its developer, then installs it
+ * The source changed since the flow read it ([FireInstall.list]), so the signers no longer match what the user
+ * saw or ticked: back to Checking against the new one, and nothing installs.
+ */
+ private fun listChanged(id: String, flow: LauncherFlow): Boolean {
+ val fire = flow.fire ?: return false
+ val list = ownList()
+ if (list == fire.list) return false
+ checkLauncherApk(flow.pkg)
+ return true
+ }
+
+ /** The tick on a launcher from the user's own list ([FireInstall.list]): until it's on, nothing downloads or installs. */
+ fun trustLauncherList(on: Boolean) {
+ val id = _state.value.selectedId ?: return
+ setFire(id) { if (it.list != null) it.copy(trusted = on) else it }
+ }
+
+ /**
+ * Download and install: fetches the APK, which must be the launcher signed by its developer, then installs it
* over adb like any sideload. Nothing reaches the TV unless the check passes.
*/
- fun installProjectivy() {
+ fun installLauncherApk() {
val id = _state.value.selectedId ?: return
val download = launcherDownload ?: return
- val release = _state.value.device.launcher?.fire?.takeIf { it.step == FireInstall.Step.Confirm }?.release ?: return
+ val flow = _state.value.device.launcher ?: return
+ val launcher = apkLauncher(flow.pkg) ?: return
+ val release = flow.fire?.takeIf { it.step == FireInstall.Step.Confirm && !it.gated }?.release ?: return
+ if (listChanged(id, flow)) return
launcherJob?.cancel()
setFire(id) { it.copy(step = FireInstall.Step.Downloading, progress = null, picked = false, size = null, until = null) }
launcherJob = viewModelScope.launch {
val app = try {
- download.fetch(release) { p -> setFire(id) { it.copy(progress = p) } }
+ download.fetch(launcher, release) { p -> setFire(id) { it.copy(progress = p) } }
} catch (e: CancellationException) {
throw e
- } catch (_: NotProjectivy) {
- return@launch setFire(id) { it.copy(step = FireInstall.Step.NotProjectivy) }
+ } catch (_: WrongApk) {
+ return@launch setFire(id) { it.copy(step = FireInstall.Step.WrongApk) }
} catch (_: Exception) {
return@launch setFire(id) { it.copy(step = FireInstall.Step.NoDownload) }
}
- installFetched(id, app)
+ installFetched(id, launcher, app)
}
}
/**
* Pick the downloaded file, after Couldn't download: the file the user picked, checked like the download,
- * then installed the same way. Nothing reaches the TV unless it's Projectivy signed by its developer.
+ * then installed the same way. Nothing reaches the TV unless it's the launcher signed by its developer.
*/
- fun pickedProjectivy(uri: Uri) {
+ fun pickedLauncherApk(uri: Uri) {
val id = _state.value.selectedId ?: return
val download = launcherDownload ?: return
+ val flow = _state.value.device.launcher ?: return
+ val launcher = apkLauncher(flow.pkg) ?: return
// The picker answers on its own timing: only from a step that offers it, never over a running install.
- val step = _state.value.device.launcher?.fire?.step
- if (step != FireInstall.Step.NoDownload && step != FireInstall.Step.NotProjectivy && step != FireInstall.Step.Refused) return
+ val fire = flow.fire ?: return
+ val step = fire.step
+ if (step != FireInstall.Step.NoDownload && step != FireInstall.Step.WrongApk && step != FireInstall.Step.Refused) return
+ if (fire.gated || listChanged(id, flow)) return
launcherJob?.cancel()
setFire(id) { it.copy(step = FireInstall.Step.Reading, picked = true, progress = null, size = null) }
launcherJob = viewModelScope.launch {
val app = try {
- download.open(uri)
+ download.open(uri, launcher)
} catch (e: CancellationException) {
throw e
- } catch (_: NotProjectivy) {
- return@launch setFire(id) { it.copy(step = FireInstall.Step.NotProjectivy) }
+ } catch (_: WrongApk) {
+ return@launch setFire(id) { it.copy(step = FireInstall.Step.WrongApk) }
} catch (_: Exception) {
return@launch setFire(id) { it.copy(step = FireInstall.Step.Refused, error = Copy.CANT_READ_FILE) }
}
- installFetched(id, app)
+ installFetched(id, launcher, app)
}
}
- /** Projectivy, downloaded or picked and checked, onto the TV over adb like any sideload. */
- private suspend fun installFetched(id: String, app: PickedApp) {
+ /** The launcher, downloaded or picked and checked, onto the TV over adb like any sideload. */
+ private suspend fun installFetched(id: String, launcher: KnownLauncher, app: PickedApp) {
setFire(id) { it.copy(step = FireInstall.Step.Installing, progress = null, size = app.sizeBytes) }
val result = try {
source.install(id, app.files, app.info, allowDowngrade = false) { p -> setFire(id) { it.copy(progress = p) } }
@@ -1047,21 +1091,21 @@ class TellyscopeViewModel(
}
when (result) {
// The steps close with it: Installing would keep them up, and Close waits on that.
- InstallResult.Done -> launcherInstalled(id, PROJECTIVY) { step ->
- updateDevice(id) { it.copy(launcher = it.launcher?.let { l -> l.copy(step = step, fire = if (l.fire?.store == true) null else FireInstall()) }) }
+ InstallResult.Done -> launcherInstalled(id, launcher.pkg) { step ->
+ updateDevice(id) { it.copy(launcher = it.launcher?.let { l -> l.copy(step = step, fire = if (l.fire?.store == true) null else FireInstall(list = l.fire?.list)) }) }
}
is InstallResult.Refused -> setFire(id) {
- it.copy(step = FireInstall.Step.Refused, error = Copy.installRefused(result.reason, launcherName(PROJECTIVY)))
+ it.copy(step = FireInstall.Step.Refused, error = Copy.installRefused(result.reason, launcher.name))
}
}
}
/** X or Stop on a Fire OS step: back to the start, or to the picker after Download directly. Not while the install runs. */
- fun dismissProjectivy() {
+ fun dismissLauncherApk() {
val id = _state.value.selectedId ?: return
if (_state.value.device.launcher?.fire?.step == FireInstall.Step.Installing) return
launcherJob?.cancel()
- updateDevice(id) { d -> d.copy(launcher = d.launcher?.let { l -> l.copy(fire = if (l.fire?.store == true) null else FireInstall()) }) }
+ updateDevice(id) { d -> d.copy(launcher = d.launcher?.let { l -> l.copy(fire = if (l.fire?.store == true) null else FireInstall(list = l.fire?.list)) }) }
}
/** Not now on the Apps tab's card: it stays away on this TV, and Tweaks keeps the way in. */
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3261f68..267ba5f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -38,8 +38,8 @@
<string name="copy_keeps_home">Mantiene Inicio con su servicio de accesibilidad</string>
<string name="copy_make_home">Usar como inicio</string>
<string name="copy_get_launcher">Conseguir otro launcher</string>
- <string name="copy_get_launcher_text">Instala uno desde Play Store, como Projectivy o FLauncher. Puedes volver al anterior cuando quieras.</string>
- <string name="copy_get_projectivy_text">Instala Projectivy. Puedes volver al anterior cuando quieras.</string>
+ <string name="copy_get_launcher_text">Instala uno desde Play Store. Puedes volver al anterior cuando quieras.</string>
+ <string name="copy_get_fire_launcher_text">Instala %1$s. Puedes volver al anterior cuando quieras.</string>
<string name="copy_home_settings">Ajustes de la pantalla de inicio</string>
<string name="copy_make_home_title">¿Usar %1$s como pantalla de inicio?</string>
<string name="copy_explain_replace_opens">Inicio abre %1$s. Para que la TV no vuelva al anterior por su cuenta, Tellyscope desactiva %2$s, el launcher integrado de la TV.</string>
@@ -106,12 +106,12 @@
<string name="copy_not_installed">%1$s no está instalado</string>
<string name="copy_wasnt_installed">%1$s no se instaló</string>
<string name="copy_not_installed_text">Play Store se cerró en la TV antes de terminar la instalación. Si la tienda dijo que no está disponible para esta TV, elige otro launcher.</string>
- <string name="copy_install_projectivy">Instalar Projectivy</string>
+ <string name="copy_install_launcher">Instalar %1$s</string>
<string name="copy_fire_install_text">Una pantalla de inicio sin anuncios. Tellyscope la instala en la TV por ti; no tienes que hacer nada en la TV.</string>
<string name="copy_downloads_from">Tellyscope descarga %1$s de la página de versiones del propio desarrollador:</string>
<string name="copy_release">Versión %1$s · %2$s</string>
<string name="copy_where_from">De dónde viene</string>
- <string name="copy_signed_check">Tellyscope comprueba que esté firmado por el desarrollador de Projectivy antes de instalarlo en la TV. Tellyscope no está afiliada a Projectivy.</string>
+ <string name="copy_signed_check">Tellyscope comprueba que esté firmado por el desarrollador de %1$s antes de instalarlo en la TV. Tellyscope no está afiliada a %1$s.</string>
<string name="copy_download_and_install">Descargar e instalar</string>
<string name="copy_download_directly_title">¿Descargar %1$s directamente?</string>
<string name="copy_direct_check">Tellyscope comprueba que la app lleve la firma del desarrollador. No analiza la app en busca de código malicioso, y la app no se actualizará sola.</string>
@@ -123,11 +123,11 @@
<string name="copy_step_downloaded">Descargado</string>
<string name="copy_downloading">Descargando · %1$d%% · %2$s de %3$s</string>
<string name="copy_step_picked">Archivo elegido</string>
- <string name="copy_step_check">Comprobar que es Projectivy</string>
- <string name="copy_step_checking">Comprobando que es Projectivy…</string>
- <string name="copy_step_checked">Es Projectivy</string>
+ <string name="copy_step_check">Comprobar que es %1$s</string>
+ <string name="copy_step_checking">Comprobando que es %1$s…</string>
+ <string name="copy_step_checked">Es %1$s</string>
<string name="copy_step_checked_text">Firmado por su desarrollador</string>
- <string name="copy_step_failed">No es Projectivy</string>
+ <string name="copy_step_failed">No es %1$s</string>
<string name="copy_step_failed_text">El nombre del paquete o la firma no coinciden</string>
<string name="copy_install_on">Instalar en %1$s</string>
<string name="copy_stop_title">¿Detener la descarga?</string>
@@ -135,24 +135,29 @@
<string name="copy_stop">Detener</string>
<string name="copy_keep_downloading">Seguir descargando</string>
<string name="copy_installing_on">Instalando en %1$s…</string>
- <string name="copy_not_projectivy">Esa descarga no es Projectivy</string>
- <string name="copy_not_projectivy_text">El archivo de GitHub no coincidía con el nombre del paquete de Projectivy ni con la firma de su desarrollador, así que Tellyscope no instaló nada en la TV.</string>
- <string name="copy_not_projectivy_file">Ese archivo no es Projectivy</string>
- <string name="copy_not_projectivy_file_text">No coincidía con el nombre del paquete de Projectivy ni con la firma de su desarrollador, así que Tellyscope no instaló nada en la TV.</string>
+ <string name="copy_wrong_apk">Esa descarga no es %1$s</string>
+ <string name="copy_wrong_apk_text">El archivo de GitHub no coincidía con el nombre del paquete de %1$s ni con la firma de su desarrollador, así que Tellyscope no instaló nada en la TV.</string>
+ <string name="copy_wrong_apk_file">Ese archivo no es %1$s</string>
+ <string name="copy_wrong_apk_file_text">No coincidía con el nombre del paquete de %1$s ni con la firma de su desarrollador, así que Tellyscope no instaló nada en la TV.</string>
<string name="copy_cant_read_file">Tellyscope no pudo leer ese archivo. Vuelve a elegirlo o a descargarlo.</string>
<string name="copy_cant_install">No se pudo instalar %1$s</string>
- <string name="copy_no_download">No se pudo descargar Projectivy</string>
+ <string name="copy_no_download">No se pudo descargar %1$s</string>
<string name="copy_no_download_offline">El teléfono no puede conectar con GitHub. Revisa su conexión a internet y vuelve a intentarlo.</string>
<string name="copy_no_download_limited_until">GitHub está limitando las descargas desde tu red hasta las %1$s. Vuelve a intentarlo entonces o descárgalo tú mismo.</string>
<string name="copy_no_download_limited">GitHub está limitando las descargas desde tu red durante un rato. Vuelve a intentarlo más tarde o descárgalo tú mismo.</string>
<string name="copy_or_yourself">O descárgalo tú mismo</string>
<string name="copy_yourself_page">Descarga el archivo de la app (.apk) desde la página de versiones en tu navegador.</string>
- <string name="copy_yourself_pick_file">Vuelve aquí y elige %1$s. Tellyscope comprueba que sea Projectivy antes de instalarlo.</string>
- <string name="copy_yourself_pick">Vuelve aquí y elígelo. Tellyscope comprueba que sea Projectivy antes de instalarlo.</string>
+ <string name="copy_yourself_pick_file">Vuelve aquí y elige %1$s. Tellyscope comprueba que sea %2$s antes de instalarlo.</string>
+ <string name="copy_yourself_pick">Vuelve aquí y elígelo. Tellyscope comprueba que sea %1$s antes de instalarlo.</string>
<string name="copy_latest_release">Última versión</string>
<string name="copy_pick_downloaded">Elegir el archivo descargado</string>
<string name="copy_pick_another">Elegir otro archivo</string>
<string name="copy_try_download_again">Volver a descargar</string>
+ <string name="copy_own_list_title">De una lista que añadiste</string>
+ <string name="copy_own_list_text">Tellyscope no puede responder por esta app. Solo comprueba que el archivo coincide con esta lista, y quien gestiona la lista eligió la firma.</string>
+ <string name="copy_own_list_list">Lista</string>
+ <string name="copy_own_list_signer">Firma (SHA-256)</string>
+ <string name="copy_own_list_trust">Confío en esta lista y en su firma</string>
<string name="copy_service_off_text">El servicio de accesibilidad de %1$s está desactivado, así que la TV puede recuperar Inicio.</string>
<string name="copy_open_again">Volver a abrir</string>
<string name="copy_undo">Deshacer</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index c61e4f7..944b86d 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -38,8 +38,8 @@
<string name="copy_keeps_home">अपनी सुलभता सेवा से Home को बनाए रखता है</string>
<string name="copy_make_home">Home बनाएं</string>
<string name="copy_get_launcher">दूसरा लॉन्चर पाएं</string>
- <string name="copy_get_launcher_text">Play Store से कोई लॉन्चर इंस्टॉल करें, जैसे Projectivy या FLauncher. कभी भी वापस बदल सकते हैं।</string>
- <string name="copy_get_projectivy_text">Projectivy इंस्टॉल करें। कभी भी वापस बदल सकते हैं।</string>
+ <string name="copy_get_launcher_text">Play Store से कोई लॉन्चर इंस्टॉल करें. कभी भी वापस बदल सकते हैं।</string>
+ <string name="copy_get_fire_launcher_text">%1$s इंस्टॉल करें। कभी भी वापस बदल सकते हैं।</string>
<string name="copy_home_settings">होम स्क्रीन सेटिंग्स</string>
<string name="copy_make_home_title">%1$s को होम स्क्रीन बनाएं?</string>
<string name="copy_explain_replace_opens">Home दबाने पर %1$s खुलेगा। TV अपने-आप वापस न बदल जाए, इसके लिए Tellyscope TV का पहले से मौजूद लॉन्चर %2$s बंद कर देता है।</string>
@@ -106,12 +106,12 @@
<string name="copy_not_installed">%1$s इंस्टॉल नहीं है</string>
<string name="copy_wasnt_installed">%1$s इंस्टॉल नहीं हुआ</string>
<string name="copy_not_installed_text">इंस्टॉल होने से पहले ही TV पर Play Store बंद हो गया। अगर Store ने बताया कि यह इस TV के लिए उपलब्ध नहीं है, तो कोई दूसरा लॉन्चर चुनें।</string>
- <string name="copy_install_projectivy">Projectivy इंस्टॉल करें</string>
+ <string name="copy_install_launcher">%1$s इंस्टॉल करें</string>
<string name="copy_fire_install_text">बिना विज्ञापन वाली होम स्क्रीन। Tellyscope इसे आपके लिए TV पर इंस्टॉल कर देता है; TV पर आपको कुछ नहीं करना है।</string>
<string name="copy_downloads_from">Tellyscope %1$s को डेवलपर के अपने रिलीज़ पेज से डाउनलोड करता है:</string>
<string name="copy_release">रिलीज़ %1$s · %2$s</string>
<string name="copy_where_from">यह कहां से आता है</string>
- <string name="copy_signed_check">Tellyscope TV पर इंस्टॉल करने से पहले जांचता है कि यह Projectivy के डेवलपर से साइन किया हुआ है। Tellyscope का Projectivy से कोई संबंध नहीं है।</string>
+ <string name="copy_signed_check">Tellyscope TV पर इंस्टॉल करने से पहले जांचता है कि यह %1$s के डेवलपर से साइन किया हुआ है। Tellyscope का %1$s से कोई संबंध नहीं है।</string>
<string name="copy_download_and_install">डाउनलोड और इंस्टॉल करें</string>
<string name="copy_download_directly_title">%1$s को सीधे डाउनलोड करें?</string>
<string name="copy_direct_check">Tellyscope जांचता है कि ऐप पर डेवलपर का सिग्नेचर है। यह ऐप में हानिकारक कोड की जांच नहीं करता, और ऐप खुद अपडेट नहीं होगा।</string>
@@ -123,11 +123,11 @@
<string name="copy_step_downloaded">डाउनलोड हो गया</string>
<string name="copy_downloading">डाउनलोड हो रहा है · %1$d%% · %3$s में से %2$s</string>
<string name="copy_step_picked">फ़ाइल चुनी गई</string>
- <string name="copy_step_check">जांचें कि यह Projectivy है</string>
- <string name="copy_step_checking">जांच रहा है कि यह Projectivy है…</string>
- <string name="copy_step_checked">यह Projectivy है</string>
+ <string name="copy_step_check">जांचें कि यह %1$s है</string>
+ <string name="copy_step_checking">जांच रहा है कि यह %1$s है…</string>
+ <string name="copy_step_checked">यह %1$s है</string>
<string name="copy_step_checked_text">इसके डेवलपर से साइन किया हुआ</string>
- <string name="copy_step_failed">Projectivy नहीं है</string>
+ <string name="copy_step_failed">%1$s नहीं है</string>
<string name="copy_step_failed_text">पैकेज नाम या सिग्नेचर मेल नहीं खाया</string>
<string name="copy_install_on">%1$s पर इंस्टॉल करें</string>
<string name="copy_stop_title">डाउनलोड रोकें?</string>
@@ -135,24 +135,29 @@
<string name="copy_stop">रोकें</string>
<string name="copy_keep_downloading">डाउनलोड जारी रखें</string>
<string name="copy_installing_on">%1$s पर इंस्टॉल हो रहा है…</string>
- <string name="copy_not_projectivy">यह डाउनलोड Projectivy नहीं है</string>
- <string name="copy_not_projectivy_text">GitHub से मिली फ़ाइल Projectivy के पैकेज नाम या उसके डेवलपर के सिग्नेचर से मेल नहीं खाई, इसलिए Tellyscope ने TV पर कुछ भी इंस्टॉल नहीं किया।</string>
- <string name="copy_not_projectivy_file">यह फ़ाइल Projectivy नहीं है</string>
- <string name="copy_not_projectivy_file_text">यह Projectivy के पैकेज नाम या उसके डेवलपर के सिग्नेचर से मेल नहीं खाई, इसलिए Tellyscope ने TV पर कुछ भी इंस्टॉल नहीं किया।</string>
+ <string name="copy_wrong_apk">यह डाउनलोड %1$s नहीं है</string>
+ <string name="copy_wrong_apk_text">GitHub से मिली फ़ाइल %1$s के पैकेज नाम या उसके डेवलपर के सिग्नेचर से मेल नहीं खाई, इसलिए Tellyscope ने TV पर कुछ भी इंस्टॉल नहीं किया।</string>
+ <string name="copy_wrong_apk_file">यह फ़ाइल %1$s नहीं है</string>
+ <string name="copy_wrong_apk_file_text">यह %1$s के पैकेज नाम या उसके डेवलपर के सिग्नेचर से मेल नहीं खाई, इसलिए Tellyscope ने TV पर कुछ भी इंस्टॉल नहीं किया।</string>
<string name="copy_cant_read_file">Tellyscope वह फ़ाइल नहीं पढ़ सका। उसे फिर से चुनें, या फिर से डाउनलोड करें।</string>
<string name="copy_cant_install">%1$s इंस्टॉल नहीं हो सका</string>
- <string name="copy_no_download">Projectivy डाउनलोड नहीं हो सका</string>
+ <string name="copy_no_download">%1$s डाउनलोड नहीं हो सका</string>
<string name="copy_no_download_offline">फ़ोन GitHub तक नहीं पहुँच पा रहा। उसका इंटरनेट देखें, फिर से कोशिश करें।</string>
<string name="copy_no_download_limited_until">GitHub आपके नेटवर्क से डाउनलोड %1$s तक सीमित कर रहा है। तब फिर से कोशिश करें, या इसे खुद डाउनलोड करें।</string>
<string name="copy_no_download_limited">GitHub कुछ समय के लिए आपके नेटवर्क से डाउनलोड सीमित कर रहा है। तब फिर से कोशिश करें, या इसे खुद डाउनलोड करें।</string>
<string name="copy_or_yourself">या इसे खुद डाउनलोड करें</string>
<string name="copy_yourself_page">अपने ब्राउज़र में रिलीज़ पेज से ऐप फ़ाइल (.apk) डाउनलोड करें।</string>
- <string name="copy_yourself_pick_file">वापस आकर %1$s चुनें। Tellyscope इंस्टॉल करने से पहले जांचता है कि यह Projectivy है।</string>
- <string name="copy_yourself_pick">वापस आकर उसे चुनें। Tellyscope इंस्टॉल करने से पहले जांचता है कि यह Projectivy है।</string>
+ <string name="copy_yourself_pick_file">वापस आकर %1$s चुनें। Tellyscope इंस्टॉल करने से पहले जांचता है कि यह %2$s है।</string>
+ <string name="copy_yourself_pick">वापस आकर उसे चुनें। Tellyscope इंस्टॉल करने से पहले जांचता है कि यह %1$s है।</string>
<string name="copy_latest_release">नई रिलीज़</string>
<string name="copy_pick_downloaded">डाउनलोड की गई फ़ाइल चुनें</string>
<string name="copy_pick_another">दूसरी फ़ाइल चुनें</string>
<string name="copy_try_download_again">फिर से डाउनलोड करें</string>
+ <string name="copy_own_list_title">आपकी जोड़ी हुई सूची से</string>
+ <string name="copy_own_list_text">Tellyscope इस ऐप की गारंटी नहीं दे सकता। यह सिर्फ़ जांचता है कि फ़ाइल इस सूची से मेल खाती है, और सिग्नेचर उसी ने चुना है जो यह सूची चलाता है।</string>
+ <string name="copy_own_list_list">सूची</string>
+ <string name="copy_own_list_signer">सिग्नेचर (SHA-256)</string>
+ <string name="copy_own_list_trust">मुझे इस सूची और इसके सिग्नेचर पर भरोसा है</string>
<string name="copy_service_off_text">%1$s की सुलभता सेवा बंद है, इसलिए TV Home को वापस ले सकता है।</string>
<string name="copy_open_again">फिर से खोलें</string>
<string name="copy_undo">पहले जैसा करें</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 035eb0a..eae6d6d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -38,8 +38,8 @@
<string name="copy_keeps_home">ユーザー補助サービスでホームを維持します</string>
<string name="copy_make_home">ホームにする</string>
<string name="copy_get_launcher">別のランチャーを入手</string>
- <string name="copy_get_launcher_text">Projectivy や FLauncher などを Play ストアからインストールしてください。いつでも元に戻せます。</string>
- <string name="copy_get_projectivy_text">Projectivy をインストールしてください。いつでも元に戻せます。</string>
+ <string name="copy_get_launcher_text">Play ストアからインストールしてください。いつでも元に戻せます。</string>
+ <string name="copy_get_fire_launcher_text">%1$s をインストールしてください。いつでも元に戻せます。</string>
<string name="copy_home_settings">ホーム画面の設定</string>
<string name="copy_make_home_title">%1$s をホーム画面にしますか?</string>
<string name="copy_explain_replace_opens">ホームボタンで %1$s が開くようになります。テレビが勝手に元に戻らないよう、Tellyscope はテレビ内蔵のランチャー %2$s を無効にします。</string>
@@ -106,12 +106,12 @@
<string name="copy_not_installed">%1$s はインストールされていません</string>
<string name="copy_wasnt_installed">%1$s はインストールされませんでした</string>
<string name="copy_not_installed_text">インストールが終わる前に、テレビの Play ストアが閉じられました。このテレビでは利用できないと表示された場合は、別のランチャーを選んでください。</string>
- <string name="copy_install_projectivy">Projectivy をインストール</string>
+ <string name="copy_install_launcher">%1$s をインストール</string>
<string name="copy_fire_install_text">広告のないホーム画面です。Tellyscope がテレビにインストールするので、テレビ側での操作は不要です。</string>
<string name="copy_downloads_from">Tellyscope は %1$s を開発元の公式リリースページからダウンロードします:</string>
<string name="copy_release">リリース %1$s・%2$s</string>
<string name="copy_where_from">入手元</string>
- <string name="copy_signed_check">Tellyscope は、テレビにインストールする前に、Projectivy の開発元による署名があることを確認します。Tellyscope は Projectivy とは関係ありません。</string>
+ <string name="copy_signed_check">Tellyscope は、テレビにインストールする前に、%1$s の開発元による署名があることを確認します。Tellyscope は %1$s とは関係ありません。</string>
<string name="copy_download_and_install">ダウンロードしてインストール</string>
<string name="copy_download_directly_title">%1$s を直接ダウンロードしますか?</string>
<string name="copy_direct_check">Tellyscope はアプリに開発元の署名があることを確認しますが、悪意のあるコードのスキャンは行いません。また、アプリは自動で更新されません。</string>
@@ -123,11 +123,11 @@
<string name="copy_step_downloaded">ダウンロード完了</string>
<string name="copy_downloading">ダウンロード中・%1$d%%・%2$s / %3$s</string>
<string name="copy_step_picked">ファイルを選択済み</string>
- <string name="copy_step_check">Projectivy であることを確認</string>
- <string name="copy_step_checking">Projectivy であることを確認しています…</string>
- <string name="copy_step_checked">Projectivy です</string>
+ <string name="copy_step_check">%1$s であることを確認</string>
+ <string name="copy_step_checking">%1$s であることを確認しています…</string>
+ <string name="copy_step_checked">%1$s です</string>
<string name="copy_step_checked_text">開発元の署名あり</string>
- <string name="copy_step_failed">Projectivy ではありません</string>
+ <string name="copy_step_failed">%1$s ではありません</string>
<string name="copy_step_failed_text">パッケージ名または署名が一致しませんでした</string>
<string name="copy_install_on">%1$s にインストール</string>
<string name="copy_stop_title">ダウンロードを中止しますか?</string>
@@ -135,24 +135,29 @@
<string name="copy_stop">中止</string>
<string name="copy_keep_downloading">ダウンロードを続ける</string>
<string name="copy_installing_on">%1$s にインストールしています…</string>
- <string name="copy_not_projectivy">ダウンロードしたファイルは Projectivy ではありません</string>
- <string name="copy_not_projectivy_text">GitHub から取得したファイルが Projectivy のパッケージ名または開発元の署名と一致しなかったため、Tellyscope はテレビに何もインストールしませんでした。</string>
- <string name="copy_not_projectivy_file">そのファイルは Projectivy ではありません</string>
- <string name="copy_not_projectivy_file_text">Projectivy のパッケージ名または開発元の署名と一致しなかったため、Tellyscope はテレビに何もインストールしませんでした。</string>
+ <string name="copy_wrong_apk">ダウンロードしたファイルは %1$s ではありません</string>
+ <string name="copy_wrong_apk_text">GitHub から取得したファイルが %1$s のパッケージ名または開発元の署名と一致しなかったため、Tellyscope はテレビに何もインストールしませんでした。</string>
+ <string name="copy_wrong_apk_file">そのファイルは %1$s ではありません</string>
+ <string name="copy_wrong_apk_file_text">%1$s のパッケージ名または開発元の署名と一致しなかったため、Tellyscope はテレビに何もインストールしませんでした。</string>
<string name="copy_cant_read_file">Tellyscope でそのファイルを読み取れませんでした。もう一度選ぶか、ダウンロードし直してください。</string>
<string name="copy_cant_install">%1$s をインストールできませんでした</string>
- <string name="copy_no_download">Projectivy をダウンロードできませんでした</string>
+ <string name="copy_no_download">%1$s をダウンロードできませんでした</string>
<string name="copy_no_download_offline">スマートフォンから GitHub に接続できません。インターネット接続を確認して、もう一度お試しください。</string>
<string name="copy_no_download_limited_until">GitHub が %1$s まで、お使いのネットワークからのダウンロードを制限しています。その後でもう一度お試しいただくか、ご自身でダウンロードしてください。</string>
<string name="copy_no_download_limited">GitHub がしばらくの間、お使いのネットワークからのダウンロードを制限しています。時間をおいてもう一度お試しいただくか、ご自身でダウンロードしてください。</string>
<string name="copy_or_yourself">または自分でダウンロード</string>
<string name="copy_yourself_page">ブラウザでリリースページを開き、アプリファイル(.apk)をダウンロードしてください。</string>
- <string name="copy_yourself_pick_file">ここに戻って %1$s を選んでください。Tellyscope はインストール前に Projectivy であることを確認します。</string>
- <string name="copy_yourself_pick">ここに戻ってファイルを選んでください。Tellyscope はインストール前に Projectivy であることを確認します。</string>
+ <string name="copy_yourself_pick_file">ここに戻って %1$s を選んでください。Tellyscope はインストール前に %2$s であることを確認します。</string>
+ <string name="copy_yourself_pick">ここに戻ってファイルを選んでください。Tellyscope はインストール前に %1$s であることを確認します。</string>
<string name="copy_latest_release">最新リリース</string>
<string name="copy_pick_downloaded">ダウンロードしたファイルを選択</string>
<string name="copy_pick_another">別のファイルを選択</string>
<string name="copy_try_download_again">もう一度ダウンロード</string>
+ <string name="copy_own_list_title">追加したリストから</string>
+ <string name="copy_own_list_text">Tellyscope はこのアプリを保証できません。ファイルがこのリストと一致することだけを確認します。署名はリストの管理者が選んだものです。</string>
+ <string name="copy_own_list_list">リスト</string>
+ <string name="copy_own_list_signer">署名 (SHA-256)</string>
+ <string name="copy_own_list_trust">このリストとその署名を信頼する</string>
<string name="copy_service_off_text">%1$s のユーザー補助サービスがオフのため、テレビがホームを取り戻す可能性があります。</string>
<string name="copy_open_again">もう一度開く</string>
<string name="copy_undo">元に戻す</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 1b58979..cb6fd57 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -38,8 +38,8 @@
<string name="copy_keeps_home">Удерживает главный экран с помощью службы специальных возможностей</string>
<string name="copy_make_home">Сделать главным</string>
<string name="copy_get_launcher">Другой лаунчер</string>
- <string name="copy_get_launcher_text">Установите лаунчер из Play Маркета, например Projectivy или FLauncher. Вернуть прежний можно в любой момент.</string>
- <string name="copy_get_projectivy_text">Установите Projectivy. Вернуть прежний можно в любой момент.</string>
+ <string name="copy_get_launcher_text">Установите лаунчер из Play Маркета. Вернуть прежний можно в любой момент.</string>
+ <string name="copy_get_fire_launcher_text">Установите %1$s. Вернуть прежний можно в любой момент.</string>
<string name="copy_home_settings">Настройки главного экрана</string>
<string name="copy_make_home_title">Сделать %1$s главным экраном?</string>
<string name="copy_explain_replace_opens">Кнопка «Домой» будет открывать %1$s. Чтобы телевизор не возвращал прежний экран сам, Tellyscope отключит %2$s — встроенный лаунчер телевизора.</string>
@@ -106,12 +106,12 @@
<string name="copy_not_installed">%1$s не установлен</string>
<string name="copy_wasnt_installed">%1$s не был установлен</string>
<string name="copy_not_installed_text">Play Маркет на телевизоре закрылся до завершения установки. Если там было написано, что приложение недоступно для этого телевизора, выберите другой лаунчер.</string>
- <string name="copy_install_projectivy">Установить Projectivy</string>
+ <string name="copy_install_launcher">Установить %1$s</string>
<string name="copy_fire_install_text">Главный экран без рекламы. Tellyscope сам установит его на телевизор, на телевизоре ничего делать не нужно.</string>
<string name="copy_downloads_from">Tellyscope скачивает %1$s со страницы релизов самого разработчика:</string>
<string name="copy_release">Релиз %1$s · %2$s</string>
<string name="copy_where_from">Откуда он берется</string>
- <string name="copy_signed_check">Перед установкой на телевизор Tellyscope проверяет, что файл подписан разработчиком Projectivy. Tellyscope не связан с Projectivy.</string>
+ <string name="copy_signed_check">Перед установкой на телевизор Tellyscope проверяет, что файл подписан разработчиком %1$s. Tellyscope не связан с %1$s.</string>
<string name="copy_download_and_install">Скачать и установить</string>
<string name="copy_download_directly_title">Скачать %1$s напрямую?</string>
<string name="copy_direct_check">Tellyscope проверяет, что у приложения есть подпись разработчика. Вредоносный код он не ищет, и приложение не будет обновляться само.</string>
@@ -123,11 +123,11 @@
<string name="copy_step_downloaded">Скачано</string>
<string name="copy_downloading">Скачивание · %1$d%% · %2$s из %3$s</string>
<string name="copy_step_picked">Файл выбран</string>
- <string name="copy_step_check">Проверить, что это Projectivy</string>
- <string name="copy_step_checking">Проверяем, что это Projectivy…</string>
- <string name="copy_step_checked">Это Projectivy</string>
+ <string name="copy_step_check">Проверить, что это %1$s</string>
+ <string name="copy_step_checking">Проверяем, что это %1$s…</string>
+ <string name="copy_step_checked">Это %1$s</string>
<string name="copy_step_checked_text">Подписано разработчиком</string>
- <string name="copy_step_failed">Это не Projectivy</string>
+ <string name="copy_step_failed">Это не %1$s</string>
<string name="copy_step_failed_text">Название пакета или подпись не совпали</string>
<string name="copy_install_on">Установить на %1$s</string>
<string name="copy_stop_title">Остановить скачивание?</string>
@@ -135,24 +135,29 @@
<string name="copy_stop">Остановить</string>
<string name="copy_keep_downloading">Продолжить скачивание</string>
<string name="copy_installing_on">Установка на %1$s…</string>
- <string name="copy_not_projectivy">Скачанный файл — не Projectivy</string>
- <string name="copy_not_projectivy_text">Файл с GitHub не совпал по названию пакета Projectivy или подписи его разработчика, поэтому Tellyscope ничего не установил на телевизор.</string>
- <string name="copy_not_projectivy_file">Этот файл — не Projectivy</string>
- <string name="copy_not_projectivy_file_text">Он не совпал по названию пакета Projectivy или подписи его разработчика, поэтому Tellyscope ничего не установил на телевизор.</string>
+ <string name="copy_wrong_apk">Скачанный файл — не %1$s</string>
+ <string name="copy_wrong_apk_text">Файл с GitHub не совпал по названию пакета %1$s или подписи его разработчика, поэтому Tellyscope ничего не установил на телевизор.</string>
+ <string name="copy_wrong_apk_file">Этот файл — не %1$s</string>
+ <string name="copy_wrong_apk_file_text">Он не совпал по названию пакета %1$s или подписи его разработчика, поэтому Tellyscope ничего не установил на телевизор.</string>
<string name="copy_cant_read_file">Tellyscope не удалось прочитать этот файл. Выберите его снова или скачайте заново.</string>
<string name="copy_cant_install">Не удалось установить %1$s</string>
- <string name="copy_no_download">Не удалось скачать Projectivy</string>
+ <string name="copy_no_download">Не удалось скачать %1$s</string>
<string name="copy_no_download_offline">Телефон не может подключиться к GitHub. Проверьте интернет и повторите попытку.</string>
<string name="copy_no_download_limited_until">GitHub ограничивает скачивание из вашей сети до %1$s. Повторите попытку позже или скачайте файл сами.</string>
<string name="copy_no_download_limited">GitHub временно ограничивает скачивание из вашей сети. Повторите попытку позже или скачайте файл сами.</string>
<string name="copy_or_yourself">Или скачайте сами</string>
<string name="copy_yourself_page">Скачайте файл приложения (.apk) со страницы релиза в браузере.</string>
- <string name="copy_yourself_pick_file">Вернитесь сюда и выберите %1$s. Перед установкой Tellyscope проверит, что это Projectivy.</string>
- <string name="copy_yourself_pick">Вернитесь сюда и выберите его. Перед установкой Tellyscope проверит, что это Projectivy.</string>
+ <string name="copy_yourself_pick_file">Вернитесь сюда и выберите %1$s. Перед установкой Tellyscope проверит, что это %2$s.</string>
+ <string name="copy_yourself_pick">Вернитесь сюда и выберите его. Перед установкой Tellyscope проверит, что это %1$s.</string>
<string name="copy_latest_release">Последний релиз</string>
<string name="copy_pick_downloaded">Выбрать скачанный файл</string>
<string name="copy_pick_another">Выбрать другой файл</string>
<string name="copy_try_download_again">Скачать снова</string>
+ <string name="copy_own_list_title">Из списка, который вы добавили</string>
+ <string name="copy_own_list_text">Tellyscope не может ручаться за это приложение. Он лишь проверяет, что файл совпадает с этим списком, а подпись выбрал тот, кто ведёт список.</string>
+ <string name="copy_own_list_list">Список</string>
+ <string name="copy_own_list_signer">Подпись (SHA-256)</string>
+ <string name="copy_own_list_trust">Я доверяю этому списку и его подписи</string>
<string name="copy_service_off_text">Служба специальных возможностей %1$s отключена, поэтому телевизор может вернуть свой главный экран.</string>
<string name="copy_open_again">Открыть снова</string>
<string name="copy_undo">Отменить</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index fc991f3..29dc5b8 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -38,8 +38,8 @@
<string name="copy_keeps_home">通过无障碍服务保持为主屏幕</string>
<string name="copy_make_home">设为主屏幕</string>
<string name="copy_get_launcher">获取其他启动器</string>
- <string name="copy_get_launcher_text">从 Play 商店安装一个,例如 Projectivy 或 FLauncher。随时可以切换回来。</string>
- <string name="copy_get_projectivy_text">安装 Projectivy。随时可以切换回来。</string>
+ <string name="copy_get_launcher_text">从 Play 商店安装一个。随时可以切换回来。</string>
+ <string name="copy_get_fire_launcher_text">安装 %1$s。随时可以切换回来。</string>
<string name="copy_home_settings">主屏幕设置</string>
<string name="copy_make_home_title">要将 %1$s 设为主屏幕吗?</string>
<string name="copy_explain_replace_opens">按主页键将打开 %1$s。为防止电视自行切换回去,Tellyscope 会停用电视内置的启动器 %2$s。</string>
@@ -106,12 +106,12 @@
<string name="copy_not_installed">%1$s 未安装</string>
<string name="copy_wasnt_installed">%1$s 未安装成功</string>
<string name="copy_not_installed_text">安装完成前,电视上的 Play 商店已关闭。如果商店提示此电视无法使用该应用,请选择其他启动器。</string>
- <string name="copy_install_projectivy">安装 Projectivy</string>
+ <string name="copy_install_launcher">安装 %1$s</string>
<string name="copy_fire_install_text">没有广告的主屏幕。Tellyscope 会为你在电视上安装,无需在电视上进行任何操作。</string>
<string name="copy_downloads_from">Tellyscope 从开发者自己的发布页面下载 %1$s:</string>
<string name="copy_release">版本 %1$s · %2$s</string>
<string name="copy_where_from">来源</string>
- <string name="copy_signed_check">在安装到电视之前,Tellyscope 会检查它是否由 Projectivy 的开发者签名。Tellyscope 与 Projectivy 无关联。</string>
+ <string name="copy_signed_check">在安装到电视之前,Tellyscope 会检查它是否由 %1$s 的开发者签名。Tellyscope 与 %1$s 无关联。</string>
<string name="copy_download_and_install">下载并安装</string>
<string name="copy_download_directly_title">要直接下载 %1$s 吗?</string>
<string name="copy_direct_check">Tellyscope 会检查应用是否带有开发者的签名,但不会扫描应用中的恶意代码,而且应用不会自动更新。</string>
@@ -123,11 +123,11 @@
<string name="copy_step_downloaded">已下载</string>
<string name="copy_downloading">正在下载 · %1$d%% · %2$s / %3$s</string>
<string name="copy_step_picked">已选择文件</string>
- <string name="copy_step_check">确认是 Projectivy</string>
- <string name="copy_step_checking">正在确认是否为 Projectivy…</string>
- <string name="copy_step_checked">确认是 Projectivy</string>
+ <string name="copy_step_check">确认是 %1$s</string>
+ <string name="copy_step_checking">正在确认是否为 %1$s…</string>
+ <string name="copy_step_checked">确认是 %1$s</string>
<string name="copy_step_checked_text">由其开发者签名</string>
- <string name="copy_step_failed">不是 Projectivy</string>
+ <string name="copy_step_failed">不是 %1$s</string>
<string name="copy_step_failed_text">软件包名称或签名不匹配</string>
<string name="copy_install_on">安装到 %1$s</string>
<string name="copy_stop_title">要停止下载吗?</string>
@@ -135,24 +135,29 @@
<string name="copy_stop">停止</string>
<string name="copy_keep_downloading">继续下载</string>
<string name="copy_installing_on">正在安装到 %1$s…</string>
- <string name="copy_not_projectivy">下载的文件不是 Projectivy</string>
- <string name="copy_not_projectivy_text">从 GitHub 下载的文件与 Projectivy 的软件包名称或其开发者签名不匹配,因此 Tellyscope 没有在电视上安装任何内容。</string>
- <string name="copy_not_projectivy_file">该文件不是 Projectivy</string>
- <string name="copy_not_projectivy_file_text">它与 Projectivy 的软件包名称或其开发者签名不匹配,因此 Tellyscope 没有在电视上安装任何内容。</string>
+ <string name="copy_wrong_apk">下载的文件不是 %1$s</string>
+ <string name="copy_wrong_apk_text">从 GitHub 下载的文件与 %1$s 的软件包名称或其开发者签名不匹配,因此 Tellyscope 没有在电视上安装任何内容。</string>
+ <string name="copy_wrong_apk_file">该文件不是 %1$s</string>
+ <string name="copy_wrong_apk_file_text">它与 %1$s 的软件包名称或其开发者签名不匹配,因此 Tellyscope 没有在电视上安装任何内容。</string>
<string name="copy_cant_read_file">Tellyscope 无法读取该文件。请重新选择,或重新下载。</string>
<string name="copy_cant_install">无法安装 %1$s</string>
- <string name="copy_no_download">无法下载 Projectivy</string>
+ <string name="copy_no_download">无法下载 %1$s</string>
<string name="copy_no_download_offline">手机无法连接到 GitHub。请检查网络连接,然后重试。</string>
<string name="copy_no_download_limited_until">GitHub 正在限制你所在网络的下载,直到 %1$s。届时再试,或自行下载。</string>
<string name="copy_no_download_limited">GitHub 暂时限制了你所在网络的下载。请稍后再试,或自行下载。</string>
<string name="copy_or_yourself">或自行下载</string>
<string name="copy_yourself_page">在浏览器中从发布页面下载应用文件(.apk)。</string>
- <string name="copy_yourself_pick_file">回到这里并选择 %1$s。Tellyscope 会在安装前确认它是 Projectivy。</string>
- <string name="copy_yourself_pick">回到这里并选择它。Tellyscope 会在安装前确认它是 Projectivy。</string>
+ <string name="copy_yourself_pick_file">回到这里并选择 %1$s。Tellyscope 会在安装前确认它是 %2$s。</string>
+ <string name="copy_yourself_pick">回到这里并选择它。Tellyscope 会在安装前确认它是 %1$s。</string>
<string name="copy_latest_release">最新版本</string>
<string name="copy_pick_downloaded">选择已下载的文件</string>
<string name="copy_pick_another">选择其他文件</string>
<string name="copy_try_download_again">重新下载</string>
+ <string name="copy_own_list_title">来自你添加的列表</string>
+ <string name="copy_own_list_text">Tellyscope 无法为此应用担保。它只检查文件是否与此列表一致,签名由维护该列表的人选定。</string>
+ <string name="copy_own_list_list">列表</string>
+ <string name="copy_own_list_signer">签名 (SHA-256)</string>
+ <string name="copy_own_list_trust">我信任此列表及其签名</string>
<string name="copy_service_off_text">%1$s 的无障碍服务已关闭,因此电视可能会抢回主屏幕。</string>
<string name="copy_open_again">再次打开</string>
<string name="copy_undo">撤消</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e6ce088..81d5df8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -52,8 +52,8 @@
<string name="copy_keeps_home">Keeps Home with its accessibility service</string>
<string name="copy_make_home">Make Home</string>
<string name="copy_get_launcher">Get another launcher</string>
- <string name="copy_get_launcher_text">Install one from the Play Store, like Projectivy or FLauncher. Switch back any time.</string>
- <string name="copy_get_projectivy_text">Install Projectivy. Switch back any time.</string>
+ <string name="copy_get_launcher_text">Install one from the Play Store. Switch back any time.</string>
+ <string name="copy_get_fire_launcher_text">Install %1$s. Switch back any time.</string>
<string name="copy_home_settings">Home screen settings</string>
<string name="copy_make_home_title">Make %1$s the home screen?</string>
@@ -139,15 +139,15 @@
<string name="copy_wasnt_installed">%1$s wasn\'t installed</string>
<string name="copy_not_installed_text">The Play Store closed on the TV before it was installed. If the Store said it isn\'t available for this TV, choose another launcher.</string>
- <!-- Installing Projectivy on Fire OS: downloaded from its developer's GitHub, installed over adb -->
- <string name="copy_install_projectivy">Install Projectivy</string>
+ <!-- Installing a launcher's APK (Fire OS, or Download directly): from its developer's GitHub, installed over adb. %1$s the launcher's name -->
+ <string name="copy_install_launcher">Install %1$s</string>
<string name="copy_fire_install_text">A home screen without ads. Tellyscope installs it on the TV for you; there\'s nothing to do on the TV.</string>
<!-- %1$s the app's name -->
<string name="copy_downloads_from">Tellyscope downloads %1$s from the developer\'s own release page:</string>
<!-- %1$s the version, %2$s its size (copy_size_*) -->
<string name="copy_release">Release %1$s · %2$s</string>
<string name="copy_where_from">Where it comes from</string>
- <string name="copy_signed_check">Tellyscope checks it\'s signed by Projectivy\'s developer before installing it on the TV. Tellyscope isn\'t affiliated with Projectivy.</string>
+ <string name="copy_signed_check">Tellyscope checks it\'s signed by %1$s\'s developer before installing it on the TV. Tellyscope isn\'t affiliated with %1$s.</string>
<string name="copy_download_and_install">Download and install</string>
<!-- Download directly, on a TV with the Play Store; %1$s the app's name -->
<string name="copy_download_directly_title">Download %1$s directly?</string>
@@ -161,11 +161,11 @@
<!-- %1$d percent done, %2$s and %3$s sizes (copy_size_*) -->
<string name="copy_downloading">Downloading · %1$d%% · %2$s of %3$s</string>
<string name="copy_step_picked">Picked a file</string>
- <string name="copy_step_check">Check it\'s Projectivy</string>
- <string name="copy_step_checking">Checking it\'s Projectivy…</string>
- <string name="copy_step_checked">It\'s Projectivy</string>
+ <string name="copy_step_check">Check it\'s %1$s</string>
+ <string name="copy_step_checking">Checking it\'s %1$s…</string>
+ <string name="copy_step_checked">It\'s %1$s</string>
<string name="copy_step_checked_text">Signed by its developer</string>
- <string name="copy_step_failed">Not Projectivy</string>
+ <string name="copy_step_failed">Not %1$s</string>
<string name="copy_step_failed_text">Package name or signature didn\'t match</string>
<string name="copy_install_on">Install on %1$s</string>
<string name="copy_stop_title">Stop the download?</string>
@@ -174,26 +174,32 @@
<string name="copy_keep_downloading">Keep downloading</string>
<!-- %1$s the TV's name -->
<string name="copy_installing_on">Installing on %1$s…</string>
- <string name="copy_not_projectivy">That download isn\'t Projectivy</string>
- <string name="copy_not_projectivy_text">The file from GitHub didn\'t match Projectivy\'s package name or its developer\'s signature, so Tellyscope installed nothing on the TV.</string>
- <string name="copy_not_projectivy_file">That file isn\'t Projectivy</string>
- <string name="copy_not_projectivy_file_text">It didn\'t match Projectivy\'s package name or its developer\'s signature, so Tellyscope installed nothing on the TV.</string>
+ <string name="copy_wrong_apk">That download isn\'t %1$s</string>
+ <string name="copy_wrong_apk_text">The file from GitHub didn\'t match %1$s\'s package name or its developer\'s signature, so Tellyscope installed nothing on the TV.</string>
+ <string name="copy_wrong_apk_file">That file isn\'t %1$s</string>
+ <string name="copy_wrong_apk_file_text">It didn\'t match %1$s\'s package name or its developer\'s signature, so Tellyscope installed nothing on the TV.</string>
<string name="copy_cant_read_file">Tellyscope couldn\'t read that file. Pick it again, or download it again.</string>
<string name="copy_cant_install">Couldn\'t install %1$s</string>
- <string name="copy_no_download">Couldn\'t download Projectivy</string>
+ <string name="copy_no_download">Couldn\'t download %1$s</string>
<string name="copy_no_download_offline">The phone can\'t reach GitHub. Check its internet, then try again.</string>
<!-- %1$s a clock time, like 18:44 -->
<string name="copy_no_download_limited_until">GitHub is limiting downloads from your network until %1$s. Try again then, or download it yourself.</string>
<string name="copy_no_download_limited">GitHub is limiting downloads from your network for a while. Try again then, or download it yourself.</string>
<string name="copy_or_yourself">Or download it yourself</string>
<string name="copy_yourself_page">Download the app file (.apk) from the release page in your browser.</string>
- <!-- %1$s the release's file name, like Projectivy.apk -->
- <string name="copy_yourself_pick_file">Come back and pick %1$s. Tellyscope checks it\'s Projectivy before installing it.</string>
- <string name="copy_yourself_pick">Come back and pick it. Tellyscope checks it\'s Projectivy before installing it.</string>
+ <!-- %1$s the release's file name, like Launcher.apk; %2$s the launcher's name -->
+ <string name="copy_yourself_pick_file">Come back and pick %1$s. Tellyscope checks it\'s %2$s before installing it.</string>
+ <string name="copy_yourself_pick">Come back and pick it. Tellyscope checks it\'s %1$s before installing it.</string>
<string name="copy_latest_release">Latest release</string>
<string name="copy_pick_downloaded">Pick the downloaded file</string>
<string name="copy_pick_another">Pick another file</string>
<string name="copy_try_download_again">Try download again</string>
+ <!-- A launcher from a list the user added, not the default: confirmed before anything installs -->
+ <string name="copy_own_list_title">From a list you added</string>
+ <string name="copy_own_list_text">Tellyscope can\'t vouch for this app. It only checks that the file matches this list, and whoever runs the list chose the signer.</string>
+ <string name="copy_own_list_list">List</string>
+ <string name="copy_own_list_signer">Signer (SHA-256)</string>
+ <string name="copy_own_list_trust">I trust this list and its signer</string>
<string name="copy_service_off_text">%1$s\'s accessibility service is off, so the TV can take Home back.</string>
<string name="copy_open_again">Open again</string>
diff --git a/app/src/test/java/app/tellyscope/FireOsTest.kt b/app/src/test/java/app/tellyscope/FireOsTest.kt
index 3197f63..7ed9292 100644
--- a/app/src/test/java/app/tellyscope/FireOsTest.kt
+++ b/app/src/test/java/app/tellyscope/FireOsTest.kt
@@ -15,21 +15,20 @@ import app.tellyscope.data.DeviceState
import app.tellyscope.data.FIRE_TV_LAUNCHER
import app.tellyscope.data.FakeDeviceSource
import app.tellyscope.data.HistoryEntry
+import app.tellyscope.data.KnownLauncher
import app.tellyscope.data.LauncherDownload
import app.tellyscope.data.LauncherRelease
-import app.tellyscope.data.NotProjectivy
-import app.tellyscope.data.PROJECTIVY
-import app.tellyscope.data.PROJECTIVY_SIGNERS
import app.tellyscope.data.PickedApp
import app.tellyscope.data.ScanHit
import app.tellyscope.data.ScanKind
import app.tellyscope.data.Snapshot
import app.tellyscope.data.Suggestions
import app.tellyscope.data.UiText
+import app.tellyscope.data.WrongApk
import app.tellyscope.data.isFireOs
-import app.tellyscope.data.isProjectivy
import app.tellyscope.data.latestTag
import app.tellyscope.data.pageApk
+import app.tellyscope.data.parseLaunchers
import app.tellyscope.data.parseRelease
import app.tellyscope.ui.FireInstall
import app.tellyscope.ui.LauncherFlow
@@ -37,6 +36,8 @@ import app.tellyscope.ui.PLAY_STORE
import app.tellyscope.ui.RECOMMENDED
import app.tellyscope.ui.TellyscopeViewModel
import app.tellyscope.ui.fireInstall
+import app.tellyscope.ui.fireLauncher
+import app.tellyscope.ui.groupedHex
import app.tellyscope.ui.offerChoose
import app.tellyscope.ui.offerLauncher
import kotlinx.coroutines.Dispatchers
@@ -76,6 +77,15 @@ private val fireHome = AppInfo(FIRE_TV_LAUNCHER, "Fire TV Home", null, true, tru
private val store = AppInfo(PLAY_STORE, "Google Play Store", null, true, true, null, "1.0")
private val tvHome = AppInfo("com.google.android.tvlauncher", "Google TV Home", null, true, true, UiText(R.string.data_protected_home_screen), "1.0", home = true)
+// Sample data from the test launcher list (fixtures/launchers.json): its Fire OS launcher.
+private const val PROJECTIVY = "com.spocky.projengmenu"
+private const val SIGNER = "f6697bf4082ee97511e4de07863193884a015b7ab5860430321bda1042b0aadd"
+private const val RELEASES = "https://github.com/spocky/miproja1/releases"
+private val projectivy get() = RECOMMENDED.first { it.pkg == PROJECTIVY }.launcher
+
+/** A list the user added in place of the default source. */
+private const val OWN_LIST = "https://example.org/tv-lists/"
+
private const val TAG = "4.72"
private const val PAGE = "https://github.com/spocky/miproja1/releases/tag/$TAG"
private const val APK = "https://github.com/spocky/miproja1/releases/download/$TAG/ProjectivyLauncher-4.72-c97-xda-release.apk"
@@ -113,15 +123,15 @@ private class FireTv(val tv: Device = amazon, val own: List<AppInfo> = listOf(fi
private class FakeDownload(var signedByDeveloper: Boolean = true) : LauncherDownload {
var fetched = 0
var offline = false
- override suspend fun latest() = if (offline) throw IOException("offline") else parseRelease(release())!!
- override suspend fun fetch(release: LauncherRelease, onProgress: (Progress) -> Unit): PickedApp {
+ override suspend fun latest(launcher: KnownLauncher) = if (offline) throw IOException("offline") else parseRelease(release(), launcher)!!
+ override suspend fun fetch(launcher: KnownLauncher, release: LauncherRelease, onProgress: (Progress) -> Unit): PickedApp {
fetched++
- if (!signedByDeveloper) throw NotProjectivy()
- return PickedApp(listOf(File("projectivy.apk")), ApkInfo(PROJECTIVY, 97, release.version), "Projectivy Launcher")
+ if (!signedByDeveloper) throw WrongApk()
+ return PickedApp(listOf(File("launcher.apk")), ApkInfo(launcher.pkg, 97, release.version), launcher.name)
}
- override suspend fun open(uri: Uri): PickedApp {
- if (!signedByDeveloper) throw NotProjectivy()
- return PickedApp(listOf(File("projectivy.apk")), ApkInfo(PROJECTIVY, 97, "4.72"), "Projectivy Launcher")
+ override suspend fun open(uri: Uri, launcher: KnownLauncher): PickedApp {
+ if (!signedByDeveloper) throw WrongApk()
+ return PickedApp(listOf(File("launcher.apk")), ApkInfo(launcher.pkg, 97, "4.72"), launcher.name)
}
}
@@ -135,6 +145,8 @@ class FireOsTest {
private var source = FireTv()
private val download = FakeDownload()
private var vm: TellyscopeViewModel? = null
+ /** The source as the app reads it now: a test switches it mid-flow. */
+ private var ownList: String? = null
@Before fun setUp() = Dispatchers.setMain(dispatcher)
@@ -165,7 +177,34 @@ class FireOsTest {
assertFalse(offerLauncher(listOf(fireHome), hidden = false))
}
- @Test fun aListWithoutProjectivyLeavesFireOsAsToday() {
+ @Test fun theListsFireOsLauncherIsTheOneFireOsInstalls() {
+ assertEquals(PROJECTIVY, fireLauncher()?.pkg)
+ assertEquals(setOf(SIGNER), projectivy.signers)
+ assertEquals(64L shl 20, projectivy.maxBytes)
+ assertEquals(RELEASES, projectivy.releases)
+ }
+
+ @Test fun aFireOsLauncherWithoutSignersIsntOffered() {
+ val unsigned = RECOMMENDED.map { if (it.pkg == PROJECTIVY) it.copy(launcher = it.launcher.copy(signers = emptySet())) else it }
+ assertNull(fireLauncher(unsigned))
+ assertFalse(fireInstall(amazon, listOf(fireHome), unsigned))
+ }
+
+ @Test fun installFieldsThatDontReadAreDropped() {
+ fun one(fields: String) = parseLaunchers("""{"schema": 1, "launchers": [{"package": "a.b", "name": "A", $fields}]}""").single()
+ assertEquals(emptySet<String>(), one(""""signers": ["$SIGNER", "F6697BF4"]""").signers)
+ assertEquals(256L shl 20, one(""""max_mb": 100000""").maxBytes)
+ assertNull(one(""""releases": "https://example.com/a/b/releases"""").releases)
+ assertNull(one(""""releases": "https://github.com/x/../releases"""").releases)
+ assertNull(one(""""releases": "https://github.com/x/./releases"""").releases)
+ assertEquals("https://github.com/x/.github/releases", one(""""releases": "https://github.com/x/.github/releases"""").releases)
+ }
+
+ @Test fun theSignerReadsInGroupsOfEight() {
+ assertEquals("f6697bf4 082ee975 11e4de07 86319388\n4a015b7a b5860430 321bda10 42b0aadd", groupedHex(SIGNER))
+ }
+
+ @Test fun aListWithoutItsFireOsLauncherLeavesFireOsAsToday() {
val without = RECOMMENDED.filter { it.pkg != PROJECTIVY }
assertTrue(without.isNotEmpty())
val fire = fireInstall(amazon, listOf(fireHome), without)
@@ -174,31 +213,35 @@ class FireOsTest {
assertFalse(offerLauncher(listOf(fireHome), hidden = false, fire = fire))
}
- @Test fun theLatestReleaseFromProjectivysRepo() {
- assertEquals(LauncherRelease(TAG, PAGE, APK, 11432750), parseRelease(release()))
+ @Test fun theLatestReleaseFromTheLaunchersRepo() {
+ assertEquals(LauncherRelease(TAG, PAGE, APK, 11432750), parseRelease(release(), projectivy))
}
- @Test fun releasesThatArentProjectivysOwnAreRefused() {
- assertNull(parseRelease(release(prerelease = true)))
- assertNull(parseRelease(release(page = "https://github.com/someone/miproja1/releases/tag/$TAG")))
- assertNull(parseRelease(release(assets = listOf("a.apk" to APK, "b.apk" to APK))))
- assertNull(parseRelease(release(assets = listOf("p.apk" to "https://example.com/$TAG/p.apk"))))
- assertNull(parseRelease(release(assets = listOf("p.apk" to APK.replace("/$TAG/", "/4.70/")))))
- assertNull(parseRelease(release(size = 0)))
- assertNull(parseRelease(release(size = 200L shl 20)))
- assertNull(parseRelease("not json"))
+ @Test fun releasesThatArentTheLaunchersOwnAreRefused() {
+ assertNull(parseRelease(release(prerelease = true), projectivy))
+ assertNull(parseRelease(release(page = "https://github.com/someone/miproja1/releases/tag/$TAG"), projectivy))
+ assertNull(parseRelease(release(assets = listOf("a.apk" to APK, "b.apk" to APK)), projectivy))
+ assertNull(parseRelease(release(assets = listOf("p.apk" to "https://example.com/$TAG/p.apk")), projectivy))
+ assertNull(parseRelease(release(assets = listOf("p.apk" to APK.replace("/$TAG/", "/4.70/"))), projectivy))
+ assertNull(parseRelease(release(size = 0), projectivy))
+ assertNull(parseRelease(release(size = 200L shl 20), projectivy))
+ assertNull(parseRelease(release(), projectivy.copy(releases = null)))
+ assertNull(parseRelease("not json", projectivy))
}
- @Test fun onlyProjectivySignedByItsDeveloper() {
- assertTrue(isProjectivy(PROJECTIVY, PROJECTIVY_SIGNERS))
- assertFalse(isProjectivy(PROJECTIVY, setOf("0".repeat(64))))
- assertFalse(isProjectivy(PROJECTIVY, PROJECTIVY_SIGNERS + "0".repeat(64)))
- assertFalse(isProjectivy(PROJECTIVY, emptySet()))
- assertFalse(isProjectivy("com.example.launcher", PROJECTIVY_SIGNERS))
+ @Test fun onlyTheLauncherSignedByItsDeveloper() {
+ assertTrue(projectivy.accepts(PROJECTIVY, setOf(SIGNER)))
+ assertFalse(projectivy.accepts(PROJECTIVY, setOf("0".repeat(64))))
+ assertFalse(projectivy.accepts(PROJECTIVY, setOf(SIGNER, "0".repeat(64))))
+ assertFalse(projectivy.accepts(PROJECTIVY, emptySet()))
+ assertFalse(projectivy.accepts("com.example.launcher", setOf(SIGNER)))
+ assertFalse(projectivy.copy(signers = emptySet()).accepts(PROJECTIVY, setOf(SIGNER)))
}
- private fun TestScope.opened(): TellyscopeViewModel {
- val v = TellyscopeViewModel(source, clock = { 0L }, launcherDownload = download)
+ /** [list]: the user's own list. */
+ private fun TestScope.opened(list: String? = null): TellyscopeViewModel {
+ ownList = list
+ val v = TellyscopeViewModel(source, clock = { 0L }, launcherDownload = download, ownList = { ownList })
vm = v
runCurrent()
v.openLauncherFlow()
@@ -210,13 +253,14 @@ class FireOsTest {
val flow = v.state.value.device.launcher!!
assertEquals(PROJECTIVY, flow.pkg)
assertEquals(FireInstall(), flow.fire)
+ assertNull(flow.fire?.list)
- v.checkProjectivy()
+ v.checkLauncherApk(PROJECTIVY)
runCurrent()
assertEquals(FireInstall.Step.Confirm, v.state.value.device.launcher?.fire?.step)
assertEquals(PAGE, v.state.value.device.launcher?.fire?.release?.page)
- v.installProjectivy()
+ v.installLauncherApk()
runCurrent()
assertEquals(listOf(PROJECTIVY), source.installs.map { it.packageName })
assertEquals(LauncherFlow.Step.Installed, v.state.value.device.launcher?.step)
@@ -227,13 +271,13 @@ class FireOsTest {
@Test fun aWrongSignatureInstallsNothing() = with(test) {
download.signedByDeveloper = false
val v = opened()
- v.checkProjectivy()
+ v.checkLauncherApk(PROJECTIVY)
runCurrent()
- v.installProjectivy()
+ v.installLauncherApk()
runCurrent()
assertEquals(1, download.fetched)
assertTrue(source.installs.isEmpty())
- assertEquals(FireInstall.Step.NotProjectivy, v.state.value.device.launcher?.fire?.step)
+ assertEquals(FireInstall.Step.WrongApk, v.state.value.device.launcher?.fire?.step)
assertEquals(LauncherFlow.Step.Pick, v.state.value.device.launcher?.step)
}
@@ -243,14 +287,14 @@ class FireOsTest {
assertNull(v.state.value.device.launcher?.fire)
assertTrue(v.directDownload)
- v.checkProjectivy()
+ v.checkLauncherApk(PROJECTIVY)
runCurrent()
val warning = v.state.value.device.launcher?.fire
assertEquals(FireInstall.Step.Confirm, warning?.step)
assertEquals(true, warning?.store)
assertTrue(source.installs.isEmpty())
- v.installProjectivy()
+ v.installLauncherApk()
runCurrent()
assertEquals(listOf(PROJECTIVY), source.installs.map { it.packageName })
assertEquals(LauncherFlow.Step.Installed, v.state.value.device.launcher?.step)
@@ -260,55 +304,149 @@ class FireOsTest {
@Test fun cancellingTheWarningGoesBackToThePicker() = with(test) {
source = FireTv(androidTv, listOf(store, tvHome))
val v = opened()
- v.checkProjectivy()
+ v.checkLauncherApk(PROJECTIVY)
runCurrent()
- v.dismissProjectivy()
+ v.dismissLauncherApk()
assertEquals(LauncherFlow.Step.Pick, v.state.value.device.launcher?.step)
assertNull(v.state.value.device.launcher?.fire)
assertEquals(0, download.fetched)
}
@Test fun whenTheApiIsLimitedTheReleasePageGivesTheTagAndItsOneApk() {
- assertEquals(TAG, latestTag(PAGE))
- assertNull(latestTag("https://github.com/someone/miproja1/releases/tag/$TAG"))
- assertNull(latestTag(null))
+ assertEquals(TAG, latestTag(PAGE, RELEASES))
+ assertNull(latestTag("https://github.com/someone/miproja1/releases/tag/$TAG", RELEASES))
+ assertNull(latestTag(null, RELEASES))
val link = APK.removePrefix("https://github.com")
- assertEquals(APK, pageApk("""<a href="$link" rel="nofollow">x</a><a href="$link">x</a>""", TAG))
- assertNull(pageApk("""<a href="$link">a</a><a href="${link.replace(".apk", "-b.apk")}">b</a>""", TAG))
- assertNull(pageApk("""<a href="${link.replace("/$TAG/", "/4.70/")}">old</a>""", TAG))
+ assertEquals(APK, pageApk("""<a href="$link" rel="nofollow">x</a><a href="$link">x</a>""", TAG, RELEASES))
+ assertNull(pageApk("""<a href="$link">a</a><a href="${link.replace(".apk", "-b.apk")}">b</a>""", TAG, RELEASES))
+ assertNull(pageApk("""<a href="${link.replace("/$TAG/", "/4.70/")}">old</a>""", TAG, RELEASES))
}
@Test fun aPickedFileIsCheckedThenInstalled() = with(test) {
val v = couldntDownload()
- v.pickedProjectivy(Uri.parse("content://downloads/1"))
+ v.pickedLauncherApk(Uri.parse("content://downloads/1"))
runCurrent()
assertEquals(listOf(PROJECTIVY), source.installs.map { it.packageName })
assertEquals(LauncherFlow.Step.Installed, v.state.value.device.launcher?.step)
}
- @Test fun aPickedFileThatIsntProjectivyInstallsNothing() = with(test) {
+ @Test fun aPickedFileThatIsntTheLauncherInstallsNothing() = with(test) {
download.signedByDeveloper = false
val v = couldntDownload()
- v.pickedProjectivy(Uri.parse("content://downloads/1"))
+ v.pickedLauncherApk(Uri.parse("content://downloads/1"))
runCurrent()
assertTrue(source.installs.isEmpty())
val fire = v.state.value.device.launcher?.fire
- assertEquals(FireInstall.Step.NotProjectivy, fire?.step)
+ assertEquals(FireInstall.Step.WrongApk, fire?.step)
assertEquals(true, fire?.picked)
}
@Test fun aPickOutsideAFailedStepIsIgnored() = with(test) {
val v = opened()
- v.pickedProjectivy(Uri.parse("content://downloads/1"))
+ v.pickedLauncherApk(Uri.parse("content://downloads/1"))
runCurrent()
assertTrue(source.installs.isEmpty())
assertNull(v.state.value.device.launcher?.fire?.step)
}
- private fun TestScope.couldntDownload(): TellyscopeViewModel {
- download.offline = true
+ @Test fun fromTheUsersOwnListNothingDownloadsUntilTheyTrustIt() = with(test) {
+ val v = opened(list = OWN_LIST)
+ assertEquals(OWN_LIST, v.state.value.device.launcher?.fire?.list)
+ v.checkLauncherApk(PROJECTIVY)
+ runCurrent()
+ val confirm = v.state.value.device.launcher?.fire
+ assertEquals(FireInstall.Step.Confirm, confirm?.step)
+ assertEquals(OWN_LIST, confirm?.list)
+ assertTrue(confirm!!.gated)
+
+ v.installLauncherApk()
+ runCurrent()
+ assertEquals(0, download.fetched)
+ assertEquals(FireInstall.Step.Confirm, v.state.value.device.launcher?.fire?.step)
+
+ v.trustLauncherList(true)
+ v.installLauncherApk()
+ runCurrent()
+ assertEquals(listOf(PROJECTIVY), source.installs.map { it.packageName })
+ }
+
+ @Test fun fromTheUsersOwnListDownloadDirectlyWaitsForTheTickToo() = with(test) {
+ source = FireTv(androidTv, listOf(store, tvHome))
+ val v = opened(list = OWN_LIST)
+ v.checkLauncherApk(PROJECTIVY)
+ runCurrent()
+ assertEquals(true, v.state.value.device.launcher?.fire?.gated)
+ v.installLauncherApk()
+ runCurrent()
+ assertEquals(0, download.fetched)
+ v.trustLauncherList(true)
+ v.installLauncherApk()
+ runCurrent()
+ assertEquals(1, download.fetched)
+ }
+
+ @Test fun fromTheUsersOwnListThePickWaitsForTheTick() = with(test) {
+ val v = couldntDownload(list = OWN_LIST)
+ v.pickedLauncherApk(Uri.parse("content://downloads/1"))
+ runCurrent()
+ assertTrue(source.installs.isEmpty())
+ assertEquals(FireInstall.Step.NoDownload, v.state.value.device.launcher?.fire?.step)
+
+ v.trustLauncherList(true)
+ v.pickedLauncherApk(Uri.parse("content://downloads/1"))
+ runCurrent()
+ assertEquals(listOf(PROJECTIVY), source.installs.map { it.packageName })
+ }
+
+ @Test fun dismissingAWrongPickAsksForTheTickAgain() = with(test) {
+ val v = couldntDownload(list = OWN_LIST)
+ v.trustLauncherList(true)
+ download.signedByDeveloper = false
+ v.pickedLauncherApk(Uri.parse("content://downloads/1"))
+ runCurrent()
+ assertEquals(FireInstall.Step.WrongApk, v.state.value.device.launcher?.fire?.step)
+
+ v.dismissLauncherApk()
+ val fire = v.state.value.device.launcher?.fire
+ assertEquals(OWN_LIST, fire?.list)
+ assertEquals(true, fire?.gated)
+ }
+
+ @Test fun switchingToTheirOwnListUnderConfirmChecksAgainFirst() = with(test) {
val v = opened()
- v.checkProjectivy()
+ v.checkLauncherApk(PROJECTIVY)
+ runCurrent()
+ assertEquals(false, v.state.value.device.launcher?.fire?.gated)
+
+ ownList = OWN_LIST
+ v.installLauncherApk()
+ runCurrent()
+ assertEquals(0, download.fetched)
+ val fire = v.state.value.device.launcher?.fire
+ assertEquals(FireInstall.Step.Confirm, fire?.step)
+ assertEquals(OWN_LIST, fire?.list)
+ assertEquals(true, fire?.gated)
+ }
+
+ @Test fun switchingToTheirOwnListAfterCouldntDownloadGatesThePick() = with(test) {
+ val v = couldntDownload()
+ ownList = OWN_LIST
+ v.pickedLauncherApk(Uri.parse("content://downloads/1"))
+ runCurrent()
+ assertTrue(source.installs.isEmpty())
+ assertEquals(true, v.state.value.device.launcher?.fire?.gated)
+ }
+
+ @Test fun onTheDefaultSourceTheTickDoesNothing() = with(test) {
+ val v = opened()
+ v.trustLauncherList(true)
+ assertEquals(FireInstall(), v.state.value.device.launcher?.fire)
+ }
+
+ private fun TestScope.couldntDownload(list: String? = null): TellyscopeViewModel {
+ download.offline = true
+ val v = opened(list)
+ v.checkLauncherApk(PROJECTIVY)
runCurrent()
assertEquals(FireInstall.Step.NoDownload, v.state.value.device.launcher?.fire?.step)
return v
diff --git a/app/src/test/java/app/tellyscope/LauncherFlowTest.kt b/app/src/test/java/app/tellyscope/LauncherFlowTest.kt
index ff16afd..d1ba461 100644
--- a/app/src/test/java/app/tellyscope/LauncherFlowTest.kt
+++ b/app/src/test/java/app/tellyscope/LauncherFlowTest.kt
@@ -315,14 +315,14 @@ class LauncherScreenTest {
@Test fun theStoreComesFirstAndOnlyAPinnedLauncherDownloadsDirectly() {
val installs = mutableListOf<String>()
- var downloads = 0
+ val downloads = mutableListOf<String>()
compose.setContent {
- LauncherScreen(tv, LauncherFlow(pkg = PROJECTIVY), listOf(store, stock), LauncherActions(install = { installs += it }, fireCheck = { downloads++ }), direct = true)
+ LauncherScreen(tv, LauncherFlow(pkg = PROJECTIVY), listOf(store, stock), LauncherActions(install = { installs += it }, fireCheck = { downloads += it }), direct = true)
}
compose.onNodeWithText(Copy.STORE_RECOMMENDED.text()).assertExists()
compose.onNodeWithText(Copy.DOWNLOAD_DIRECTLY.text()).performClick()
compose.onNodeWithText(Copy.GET_FROM_STORE.text()).performClick()
- assertEquals(1, downloads)
+ assertEquals(listOf(PROJECTIVY), downloads)
assertEquals(listOf(PROJECTIVY), installs)
compose.onNodeWithText("FLauncher").performScrollTo().performClick()
compose.onNodeWithText(Copy.DOWNLOAD_DIRECTLY.text()).assertDoesNotExist()
diff --git a/app/src/test/resources/fixtures/launchers.json b/app/src/test/resources/fixtures/launchers.json
index 200382e..1b3a84e 100644
--- a/app/src/test/resources/fixtures/launchers.json
+++ b/app/src/test/resources/fixtures/launchers.json
@@ -1,7 +1,9 @@
{
"schema": 1,
"launchers": [
- { "package": "com.spocky.projengmenu", "name": "Projectivy Launcher", "about": "The most popular. Rows, wallpapers and icons you can change." },
+ { "package": "com.spocky.projengmenu", "name": "Projectivy Launcher", "about": "The most popular. Rows, wallpapers and icons you can change.",
+ "signers": ["f6697bf4082ee97511e4de07863193884a015b7ab5860430321bda1042b0aadd"], "max_mb": 64,
+ "releases": "https://github.com/spocky/miproja1/releases", "fire_os": true },
{ "package": "me.efesser.flauncher", "name": "FLauncher", "about": "Simple: your apps in rows, nothing else." },
{ "package": "com.wolf.firelauncher", "name": "Wolf Launcher" }
]