Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'TeamNewPipe:dev' into dev

This commit is contained in:
LingYinTianMeng 2022-04-19 16:36:42 +08:00 committed by GitHub
parent 8ea98b64aa 53bf3420e7
commit fd5626e9e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -262,7 +262,7 @@ dependencies {
implementation "com.nononsenseapps:filepicker:4.2.1" implementation "com.nononsenseapps:filepicker:4.2.1"
// Crash reporting // Crash reporting
implementation "ch.acra:acra-core:5.8.4" implementation "ch.acra:acra-core:5.9.1"
// Properly restarting // Properly restarting
implementation 'com.jakewharton:process-phoenix:2.1.2' implementation 'com.jakewharton:process-phoenix:2.1.2'

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

@ -205,7 +205,7 @@ public class App extends MultiDexApplication {
return; return;
} }
final CoreConfigurationBuilder acraConfig = new CoreConfigurationBuilder(this) final CoreConfigurationBuilder acraConfig = new CoreConfigurationBuilder()
.withBuildConfigClass(BuildConfig.class); .withBuildConfigClass(BuildConfig.class);
ACRA.init(this, acraConfig); ACRA.init(this, acraConfig);
} }

5
app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
View File

@ -97,7 +97,10 @@ public final class PlayQueueActivity extends AppCompatActivity
getMenuInflater().inflate(R.menu.menu_play_queue, m); getMenuInflater().inflate(R.menu.menu_play_queue, m);
getMenuInflater().inflate(R.menu.menu_play_queue_bg, m); getMenuInflater().inflate(R.menu.menu_play_queue_bg, m);
onMaybeMuteChanged(); onMaybeMuteChanged();
onPlaybackParameterChanged(player.getPlaybackParameters()); // to avoid null reference
if (player != null) {
onPlaybackParameterChanged(player.getPlaybackParameters());
}
return true; return true;
} }

14
app/src/main/java/org/schabi/newpipe/util/KeyboardUtil.java
View File

@ -24,7 +24,19 @@ public final class KeyboardUtil {
if (editText.requestFocus()) { if (editText.requestFocus()) {
final InputMethodManager imm = ContextCompat.getSystemService(activity, final InputMethodManager imm = ContextCompat.getSystemService(activity,
InputMethodManager.class); InputMethodManager.class);
imm.showSoftInput(editText, InputMethodManager.SHOW_FORCED); if (!imm.showSoftInput(editText, InputMethodManager.SHOW_FORCED)) {
/*
* Sometimes the keyboard can't be shown because Android's ImeFocusController is in
* a incorrect state e.g. when animations are disabled or the unfocus event of the
* previous view arrives in the wrong moment (see #7647 for details).
* The invalid state can be fixed by to re-focusing the editText.
*/
editText.clearFocus();
editText.requestFocus();
// Try again
imm.showSoftInput(editText, InputMethodManager.SHOW_FORCED);
}
} }
} }