Merge branch 'master' into dev

pull/7242/head
TobiGr 2021-10-12 20:03:42 +02:00
commit d7b29aae5c
4 zmienionych plików z 7 dodań i 7 usunięć

Wyświetl plik

@ -17,8 +17,8 @@ android {
resValue "string", "app_name", "NewPipe" resValue "string", "app_name", "NewPipe"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 29 targetSdkVersion 29
versionCode 977 versionCode 978
versionName "0.21.11" versionName "0.21.12"
multiDexEnabled true multiDexEnabled true

Wyświetl plik

@ -43,8 +43,6 @@ import io.reactivex.rxjava3.exceptions.UndeliverableException;
import io.reactivex.rxjava3.functions.Consumer; import io.reactivex.rxjava3.functions.Consumer;
import io.reactivex.rxjava3.plugins.RxJavaPlugins; import io.reactivex.rxjava3.plugins.RxJavaPlugins;
import static org.schabi.newpipe.CheckForNewAppVersion.startNewVersionCheckService;
/* /*
* Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org> * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
* App.java is part of NewPipe. * App.java is part of NewPipe.
@ -113,9 +111,6 @@ public class App extends MultiDexApplication {
&& prefs.getBoolean(getString(R.string.show_image_indicators_key), false)); && prefs.getBoolean(getString(R.string.show_image_indicators_key), false));
configureRxJavaErrorHandler(); configureRxJavaErrorHandler();
// Check for new version
startNewVersionCheckService();
} }
@Override @Override

Wyświetl plik

@ -20,6 +20,7 @@
package org.schabi.newpipe; package org.schabi.newpipe;
import static org.schabi.newpipe.CheckForNewAppVersion.startNewVersionCheckService;
import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage; import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
@ -163,6 +164,9 @@ public class MainActivity extends AppCompatActivity {
FocusOverlayView.setupFocusObserver(this); FocusOverlayView.setupFocusObserver(this);
} }
openMiniPlayerUponPlayerStarted(); openMiniPlayerUponPlayerStarted();
// Check for new version
startNewVersionCheckService();
} }
private void setupDrawer() throws ExtractionException { private void setupDrawer() throws ExtractionException {

Wyświetl plik

@ -0,0 +1 @@
Fixed executing the check for a new NewPipe version. This check was executed too early sometimes and therefore lead to an app crash. That should be fixed now.