Mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe.git synced 2024-11-25 12:32:31 +01:00
Code Issues Releases Activity

Fix crash on startup without internet: Cbservable callable returning null

Browse Source 
Use Maybe instead
This commit is contained in:
Stypox 2020-11-21 11:38:08 +01:00
parent 1197f44262
commit 8dc4e6dc2a
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
2 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/schabi/newpipe/App.java
View File

@ -8,6 +8,7 @@ import android.os.Build;
import android.util.Log; import android.util.Log;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.multidex.MultiDexApplication; import androidx.multidex.MultiDexApplication;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
@ -67,7 +68,7 @@ public class App extends MultiDexApplication {
protected static final String TAG = App.class.toString(); protected static final String TAG = App.class.toString();
private static App app; private static App app;
private Disposable disposable = null; @Nullable private Disposable disposable = null;
@NonNull @NonNull
public static App getApp() { public static App getApp() {

69
app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
View File

@ -12,6 +12,7 @@ import android.net.Uri;
import android.util.Log; import android.util.Log;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat; import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
@ -36,10 +37,9 @@ import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory; import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import io.reactivex.Observable; import io.reactivex.Maybe;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import io.reactivex.disposables.Disposables;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
public final class CheckForNewAppVersion { public final class CheckForNewAppVersion {
@ -174,54 +174,51 @@ public final class CheckForNewAppVersion {
return getCertificateSHA1Fingerprint(app).equals(GITHUB_APK_SHA1); return getCertificateSHA1Fingerprint(app).equals(GITHUB_APK_SHA1);
} }
@NonNull @Nullable
public static Disposable checkNewVersion(@NonNull final App app) { public static Disposable checkNewVersion(@NonNull final App app) {
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app); final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app);
// Check if user has enabled/disabled update checking // Check if user has enabled/disabled update checking
// and if the current apk is a github one or not. // and if the current apk is a github one or not.
if (!prefs.getBoolean(app.getString(R.string.update_app_key), true) if (!prefs.getBoolean(app.getString(R.string.update_app_key), true) || !isGithubApk(app)) {
|| !isGithubApk(app)) { return null;
return Disposables.empty();
} }
return Observable.fromCallable(() -> { return Maybe
if (!isConnected(app)) { .fromCallable(() -> {
return null; if (!isConnected(app)) {
} return null;
}
// Make a network request to get latest NewPipe data. // Make a network request to get latest NewPipe data.
try { try {
return DownloaderImpl.getInstance().get(NEWPIPE_API_URL).responseBody(); return DownloaderImpl.getInstance().get(NEWPIPE_API_URL).responseBody();
} catch (IOException | ReCaptchaException e) { } catch (IOException | ReCaptchaException e) {
// connectivity problems, do not alarm user and fail silently // connectivity problems, do not alarm user and fail silently
if (DEBUG) { if (DEBUG) {
Log.w(TAG, Log.getStackTraceString(e)); Log.w(TAG, Log.getStackTraceString(e));
} }
} return null;
}
return null; })
})
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(response -> { .subscribe(response -> {
// Parse the json from the response. // Parse the json from the response.
if (response != null) { try {
try { final JsonObject githubStableObject = JsonParser.object().from(response)
final JsonObject githubStableObject = JsonParser.object().from(response) .getObject("flavors").getObject("github").getObject("stable");
.getObject("flavors").getObject("github").getObject("stable");
final String versionName = githubStableObject.getString("version"); final String versionName = githubStableObject.getString("version");
final int versionCode = githubStableObject.getInt("version_code"); final int versionCode = githubStableObject.getInt("version_code");
final String apkLocationUrl = githubStableObject.getString("apk"); final String apkLocationUrl = githubStableObject.getString("apk");
compareAppVersionAndShowNotification(app, versionName, apkLocationUrl, compareAppVersionAndShowNotification(app, versionName, apkLocationUrl,
versionCode); versionCode);
} catch (final JsonParserException e) { } catch (final JsonParserException e) {
// connectivity problems, do not alarm user and fail silently // connectivity problems, do not alarm user and fail silently
if (DEBUG) { if (DEBUG) {
Log.w(TAG, Log.getStackTraceString(e)); Log.w(TAG, Log.getStackTraceString(e));
}
} }
} }
}); });