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

Installer instances require an Apk instance, mark @NonNull #1436

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2018-04-25 11:13:47 +02:00
parent 7b66ad4920
commit 80734891a6
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java
View File

@ -24,6 +24,7 @@ import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.NonNull;
import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.Apk;
/** /**
@ -37,7 +38,7 @@ public class DefaultInstaller extends Installer {
public static final String TAG = "DefaultInstaller"; public static final String TAG = "DefaultInstaller";
DefaultInstaller(Context context, Apk apk) { DefaultInstaller(Context context, @NonNull Apk apk) {
super(context, apk); super(context, apk);
} }

3
app/src/main/java/org/fdroid/fdroid/installer/ExtensionInstaller.java
View File

@ -24,6 +24,7 @@ import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.NonNull;
import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.BuildConfig;
import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.Apk;
import org.fdroid.fdroid.privileged.install.InstallExtensionDialogActivity; import org.fdroid.fdroid.privileged.install.InstallExtensionDialogActivity;
@ -44,7 +45,7 @@ import java.io.File;
@Deprecated @Deprecated
public class ExtensionInstaller extends Installer { public class ExtensionInstaller extends Installer {
ExtensionInstaller(Context context, Apk apk) { ExtensionInstaller(Context context, @NonNull Apk apk) {
super(context, apk); super(context, apk);
} }

3
app/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java
View File

@ -24,11 +24,12 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.NonNull;
import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.Apk;
public class FileInstaller extends Installer { public class FileInstaller extends Installer {
public FileInstaller(Context context, Apk apk) { public FileInstaller(Context context, @NonNull Apk apk) {
super(context, apk); super(context, apk);
} }

3
app/src/main/java/org/fdroid/fdroid/installer/Installer.java
View File

@ -28,6 +28,7 @@ import android.content.pm.PackageManager;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.PatternMatcher; import android.os.PatternMatcher;
import android.support.annotation.NonNull;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
import android.text.TextUtils; import android.text.TextUtils;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;
@ -77,7 +78,7 @@ public abstract class Installer {
* @param apk must be included so that all the phases of the install process * @param apk must be included so that all the phases of the install process
* can get all the data about the app, even after F-Droid was killed * can get all the data about the app, even after F-Droid was killed
*/ */
Installer(Context context, Apk apk) { Installer(Context context, @NonNull Apk apk) {
this.context = context; this.context = context;
this.apk = apk; this.apk = apk;
} }

7
app/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java
View File

@ -21,8 +21,8 @@
package org.fdroid.fdroid.installer; package org.fdroid.fdroid.installer;
import android.content.Context; import android.content.Context;
import android.support.annotation.NonNull;
import android.text.TextUtils; import android.text.TextUtils;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.Apk;
@ -39,12 +39,11 @@ public class InstallerFactory {
* @param apk to be installed, always required. * @param apk to be installed, always required.
* @return instance of an Installer * @return instance of an Installer
*/ */
public static Installer create(Context context, Apk apk) { public static Installer create(Context context, @NonNull Apk apk) {
if (apk == null || TextUtils.isEmpty(apk.packageName)) { if (TextUtils.isEmpty(apk.packageName)) {
throw new IllegalArgumentException("Apk.packageName must not be empty: " + apk); throw new IllegalArgumentException("Apk.packageName must not be empty: " + apk);
} }
Installer installer; Installer installer;
if (!apk.isApk()) { if (!apk.isApk()) {
Utils.debugLog(TAG, "Using FileInstaller for non-apk file"); Utils.debugLog(TAG, "Using FileInstaller for non-apk file");

3
app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java
View File

@ -29,6 +29,7 @@ import android.content.pm.PackageManager;
import android.net.Uri; import android.net.Uri;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
import android.support.annotation.NonNull;
import android.util.Log; import android.util.Log;
import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
@ -256,7 +257,7 @@ public class PrivilegedInstaller extends Installer {
"device owner has marked the package as uninstallable."); "device owner has marked the package as uninstallable.");
} }
public PrivilegedInstaller(Context context, Apk apk) { public PrivilegedInstaller(Context context, @NonNull Apk apk) {
super(context, apk); super(context, apk);
} }