kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-24 05:04:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1733 from kiwix/feature/macgills/1732-npe-tts

Browse Source 
#1732 3.1.3 Crash Report: NPE CoreMainActivity.setupTTS - guard mainM…
This commit is contained in:
Seán Mac Gillicuddy 2020-01-29 14:40:17 +00:00 committed by GitHub
commit 237c4aa3d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
View File

@ -493,8 +493,10 @@ public abstract class CoreMainActivity extends BaseActivity
tabRecyclerView.getLayoutManager() != null) { tabRecyclerView.getLayoutManager() != null) {
tabRecyclerView.getLayoutManager().scrollToPosition(tabsAdapter.getSelected()); tabRecyclerView.getLayoutManager().scrollToPosition(tabsAdapter.getSelected());
} }
if (mainMenu != null) {
mainMenu.showTabSwitcherOptions(); mainMenu.showTabSwitcherOptions();
} }
}
private void startAnimation(View view, @AnimRes int anim) { private void startAnimation(View view, @AnimRes int anim) {
view.startAnimation(AnimationUtils.loadAnimation(view.getContext(), anim)); view.startAnimation(AnimationUtils.loadAnimation(view.getContext(), anim));
@ -662,7 +664,9 @@ public abstract class CoreMainActivity extends BaseActivity
@Override @Override
public void onSpeakingStarted() { public void onSpeakingStarted() {
runOnUiThread(() -> { runOnUiThread(() -> {
if (mainMenu != null) {
mainMenu.onTextToSpeechStartedTalking(); mainMenu.onTextToSpeechStartedTalking();
}
TTSControls.setVisibility(View.VISIBLE); TTSControls.setVisibility(View.VISIBLE);
}); });
} }
@ -670,7 +674,9 @@ public abstract class CoreMainActivity extends BaseActivity
@Override @Override
public void onSpeakingEnded() { public void onSpeakingEnded() {
runOnUiThread(() -> { runOnUiThread(() -> {
if (mainMenu != null) {
mainMenu.onTextToSpeechStoppedTalking(); mainMenu.onTextToSpeechStoppedTalking();
}
TTSControls.setVisibility(View.GONE); TTSControls.setVisibility(View.GONE);
pauseTTSButton.setText(R.string.tts_pause); pauseTTSButton.setText(R.string.tts_pause);
}); });