Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept same set of characters for apk file names for 'pm install' like for package names

Browse Source
This commit is contained in:
Dominik Schürmann 2015-01-19 16:19:31 +01:00 committed by Hans-Christoph Steiner
parent d941ac5eb0
commit 2392507634
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
F-Droid/src/org/fdroid/fdroid/installer/RootInstaller.java
View File

@ -132,6 +132,16 @@ public class RootInstaller extends Installer {
} }
private void addInstallCommand(File apkFile) { private void addInstallCommand(File apkFile) {
// Like package names, apk files should also only contain letters, numbers, dots, or underscore,
// e.g., org.fdroid.fdroid_9.apk
if (!isValidPackageName(apkFile.getName())) {
Log.e(TAG, "File name is not valid (contains characters other than letters, numbers, dots, or underscore): "
+ apkFile.getName());
mCallback.onError(InstallerCallback.OPERATION_DELETE,
InstallerCallback.ERROR_CODE_OTHER);
return;
}
rootSession.addCommand("pm install -r \"" + apkFile.getAbsolutePath() + "\"", 0, rootSession.addCommand("pm install -r \"" + apkFile.getAbsolutePath() + "\"", 0,
new Shell.OnCommandResultListener() { new Shell.OnCommandResultListener() {
public void onCommandResult(int commandCode, int exitCode, List<String> output) { public void onCommandResult(int commandCode, int exitCode, List<String> output) {
@ -153,6 +163,14 @@ public class RootInstaller extends Installer {
List<String> commands = new ArrayList<String>(); List<String> commands = new ArrayList<String>();
String pm = "pm install -r "; String pm = "pm install -r ";
for (File apkFile : apkFiles) { for (File apkFile : apkFiles) {
// see addInstallCommand()
if (!isValidPackageName(apkFile.getName())) {
Log.e(TAG, "File name is not valid (contains characters other than letters, numbers, dots, or underscore): "
+ apkFile.getName());
mCallback.onError(InstallerCallback.OPERATION_DELETE,
InstallerCallback.ERROR_CODE_OTHER);
return;
}
commands.add(pm + "\"" + apkFile.getAbsolutePath() + "\""); commands.add(pm + "\"" + apkFile.getAbsolutePath() + "\"");
} }
@ -177,7 +195,8 @@ public class RootInstaller extends Installer {
private void addDeleteCommand(String packageName) { private void addDeleteCommand(String packageName) {
if (!isValidPackageName(packageName)) { if (!isValidPackageName(packageName)) {
Log.e(TAG, "Package name is not valid (contains characters other than letters, numbers, dots, or underscore): " + packageName); Log.e(TAG, "Package name is not valid (contains characters other than letters, numbers, dots, or underscore): "
+ packageName);
mCallback.onError(InstallerCallback.OPERATION_DELETE, mCallback.onError(InstallerCallback.OPERATION_DELETE,
InstallerCallback.ERROR_CODE_OTHER); InstallerCallback.ERROR_CODE_OTHER);
return; return;