Merge branch 'super-fdroid' of gitlab.com:fdroid/fdroidclient into super-fdroid
This commit is contained in:
commit
fb1e19e510
@ -57,7 +57,6 @@ public class DefaultInstaller extends Installer {
|
|||||||
intent.setAction(android.content.Intent.ACTION_VIEW);
|
intent.setAction(android.content.Intent.ACTION_VIEW);
|
||||||
intent.setDataAndType(Uri.parse("file://" + apkFile.getPath()),
|
intent.setDataAndType(Uri.parse("file://" + apkFile.getPath()),
|
||||||
"application/vnd.android.package-archive");
|
"application/vnd.android.package-archive");
|
||||||
extraNotUnknownSource(intent);
|
|
||||||
try {
|
try {
|
||||||
mActivity.startActivityForResult(intent, REQUEST_CODE_INSTALL);
|
mActivity.startActivityForResult(intent, REQUEST_CODE_INSTALL);
|
||||||
} catch (ActivityNotFoundException e) {
|
} catch (ActivityNotFoundException e) {
|
||||||
@ -65,14 +64,6 @@ public class DefaultInstaller extends Installer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@TargetApi(14)
|
|
||||||
private void extraNotUnknownSource(Intent intent) {
|
|
||||||
if (Build.VERSION.SDK_INT < 14) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
intent.putExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void deletePackage(String packageName) throws AndroidNotCompatibleException {
|
public void deletePackage(String packageName) throws AndroidNotCompatibleException {
|
||||||
super.deletePackage(packageName);
|
super.deletePackage(packageName);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user