From 7afee40d8f72cadc3de53f133126e69acd70a8d2 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 12 Aug 2016 11:28:36 +0200 Subject: [PATCH] standardize priv-app install name as FDroidPrivilegedExtension This syncs up the name the root install method uses with what is used by the ROM integration and update.zip. It also uses the full name for consistency, with non-alpha and spaces removed following priv-app naming conventions. https://gitlab.com/fdroid/privileged-extension/merge_requests/3 https://gitlab.com/fdroid/privileged-extension/merge_requests/5 --- .../fdroid/fdroid/privileged/install/InstallExtension.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtension.java b/app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtension.java index 3ea179fec..773dc738a 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtension.java +++ b/app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtension.java @@ -41,7 +41,8 @@ abstract class InstallExtension { final Context context; - private static final String APK_FILE_NAME = "FDroidPrivileged.apk"; + private static final String BASE_NAME = "FDroidPrivilegedExtension"; + private static final String APK_FILE_NAME = BASE_NAME + ".apk"; InstallExtension(final Context context) { this.context = context; @@ -191,7 +192,7 @@ abstract class InstallExtension { */ @Override protected String getSystemFolder() { - return FDroidApp.SYSTEM_DIR_NAME + "/priv-app/FDroidPrivileged/"; + return FDroidApp.SYSTEM_DIR_NAME + "/priv-app/" + BASE_NAME + "/"; } /**