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

Improve constants

Browse Source
This commit is contained in:
Dominik Schürmann 2015-09-28 09:37:53 +02:00
parent f27823adc8
commit 3c9df2fc74
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
F-Droid/src/org/fdroid/fdroid/installer/Installer.java
View File

@ -155,8 +155,8 @@ abstract public class Installer {
return;
}
// special case: F-Droid Privileged
if (packageName != null && packageName.equals(PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME)) {
// special case: F-Droid Privileged Extension
if (packageName != null && packageName.equals(PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME)) {
Activity activity;
try {
activity = (Activity) mContext;
@ -196,8 +196,8 @@ abstract public class Installer {
return;
}
// special case: F-Droid Privileged
if (packageName != null && packageName.equals(PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME)) {
// special case: F-Droid Privileged Extension
if (packageName != null && packageName.equals(PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME)) {
Activity activity;
try {
activity = (Activity) mContext;

18
F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java
View File

@ -74,8 +74,8 @@ public class PrivilegedInstaller extends Installer {
private static final String TAG = "PrivilegedInstaller";
private static final String PRIVILEGED_SERVICE_INTENT = "org.fdroid.fdroid.privileged.IPrivilegedService";
public static final String PRIVILEGED_PACKAGE_NAME = "org.fdroid.fdroid.privileged";
private static final String PRIVILEGED_EXTENSION_SERVICE_INTENT = "org.fdroid.fdroid.privileged.IPrivilegedService";
public static final String PRIVILEGED_EXTENSION_PACKAGE_NAME = "org.fdroid.fdroid.privileged";
private Activity mActivity;
@ -95,7 +95,7 @@ public class PrivilegedInstaller extends Installer {
public static boolean isExtensionInstalled(Context context) {
PackageManager pm = context.getPackageManager();
try {
pm.getPackageInfo(PRIVILEGED_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
pm.getPackageInfo(PRIVILEGED_EXTENSION_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
return true;
} catch (PackageManager.NameNotFoundException e) {
return false;
@ -131,8 +131,8 @@ public class PrivilegedInstaller extends Installer {
public void onServiceDisconnected(ComponentName name) {
}
};
Intent serviceIntent = new Intent(PRIVILEGED_SERVICE_INTENT);
serviceIntent.setPackage(PRIVILEGED_PACKAGE_NAME);
Intent serviceIntent = new Intent(PRIVILEGED_EXTENSION_SERVICE_INTENT);
serviceIntent.setPackage(PRIVILEGED_EXTENSION_PACKAGE_NAME);
try {
context.getApplicationContext().bindService(serviceIntent, mServiceConnection,
@ -232,8 +232,8 @@ public class PrivilegedInstaller extends Installer {
}
};
Intent serviceIntent = new Intent(PRIVILEGED_SERVICE_INTENT);
serviceIntent.setPackage(PRIVILEGED_PACKAGE_NAME);
Intent serviceIntent = new Intent(PRIVILEGED_EXTENSION_SERVICE_INTENT);
serviceIntent.setPackage(PRIVILEGED_EXTENSION_PACKAGE_NAME);
mContext.getApplicationContext().bindService(serviceIntent, mServiceConnection,
Context.BIND_AUTO_CREATE);
}
@ -338,8 +338,8 @@ public class PrivilegedInstaller extends Installer {
}
};
Intent serviceIntent = new Intent(PRIVILEGED_SERVICE_INTENT);
serviceIntent.setPackage(PRIVILEGED_PACKAGE_NAME);
Intent serviceIntent = new Intent(PRIVILEGED_EXTENSION_SERVICE_INTENT);
serviceIntent.setPackage(PRIVILEGED_EXTENSION_PACKAGE_NAME);
mContext.getApplicationContext().bindService(serviceIntent, mServiceConnection,
Context.BIND_AUTO_CREATE);
}

10
F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java
View File

@ -87,12 +87,12 @@ abstract class InstallExtension {
final List<String> commands = new ArrayList<>();
commands.add("mount -o rw,remount /system");
commands.addAll(getCopyToSystemCommands(apkPath));
commands.add("pm uninstall " + PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
commands.add("pm uninstall " + PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
commands.add("mv " + getInstallPath() + ".tmp " + getInstallPath());
commands.add("pm install -r " + getInstallPath());
commands.add("sleep 5"); // wait until the app is really installed
commands.add("mount -o ro,remount /system");
commands.add("am force-stop " + PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
commands.add("am force-stop " + PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
commands.addAll(getPostInstallCommands());
return commands;
}
@ -113,10 +113,10 @@ abstract class InstallExtension {
private List<String> getUninstallCommands() {
final List<String> commands = new ArrayList<>();
commands.add("am force-stop " + PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
commands.add("pm clear " + PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
commands.add("am force-stop " + PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
commands.add("pm clear " + PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
commands.add("mount -o rw,remount /system");
commands.add("pm uninstall " + PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
commands.add("pm uninstall " + PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
commands.addAll(getCleanUninstallCommands());
commands.add("sleep 5");
commands.add("mount -o ro,remount /system");

2
F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java
View File

@ -188,7 +188,7 @@ public class InstallExtensionDialogActivity extends FragmentActivity {
// Open details of F-Droid Privileged
Intent intent = new Intent(InstallExtensionDialogActivity.this, AppDetails.class);
intent.putExtra(AppDetails.EXTRA_APPID,
PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
startActivity(intent);
}
})

4
F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
View File

@ -234,7 +234,7 @@ public class PreferencesFragment extends PreferenceFragment
// Open details of F-Droid Privileged
Intent intent = new Intent(getActivity(), AppDetails.class);
intent.putExtra(AppDetails.EXTRA_APPID,
PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
startActivity(intent);
}
});
@ -264,7 +264,7 @@ public class PreferencesFragment extends PreferenceFragment
// Open details of F-Droid Privileged
Intent intent = new Intent(getActivity(), AppDetails.class);
intent.putExtra(AppDetails.EXTRA_APPID,
PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME);
PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
startActivity(intent);
return true;