kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-15 10:26:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix code styling issues

Browse Source
This commit is contained in:
Abishek 2018-03-03 06:21:29 +05:30 committed by Isaac Hutt
parent 0359bb5ad5
commit fcadd2fd41
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java
View File

@ -629,7 +629,7 @@ public class KiwixMobileActivity extends BaseActivity implements WebViewCallback
}, new AudioManager.OnAudioFocusChangeListener() {
@Override
public void onAudioFocusChange(int focusChange) {
Log.d("Focus has changed", String.valueOf(focusChange));
Log.d(TAG_KIWIX, "Focus change: " + String.valueOf(focusChange));
if (tts.currentTTSTask == null) {
tts.stop();
return;

23
app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java
View File

@ -37,9 +37,9 @@ public class KiwixTextToSpeech {
public TTSTask currentTTSTask = null;
private AudioManager audioManager;
private AudioManager am;
final Object mFocusLock;
final Object focuslock;
private OnAudioFocusChangeListener onAudioFocusChangeListener;
@ -59,8 +59,8 @@ public class KiwixTextToSpeech {
this.context = context;
this.onSpeakingListener = onSpeakingListener;
this.onAudioFocusChangeListener = onAudioFocusChangeListener;
audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
mFocusLock = new Object();
am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
focuslock = new Object();
initTTS(onInitSucceedListener);
}
@ -120,10 +120,8 @@ public class KiwixTextToSpeech {
} else {
tts.setLanguage(locale);
if(requestAudioFocus() == true) {
if (requestAudioFocus()) {
loadURL(webView);
} else {
return;
}
}
}
@ -155,18 +153,17 @@ public class KiwixTextToSpeech {
}
public Boolean requestAudioFocus() {
Log.d("Request for audio Focus", "Focus Requested");
int audioFocusRequest = audioManager.requestAudioFocus(onAudioFocusChangeListener, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
int audioFocusRequest = am.requestAudioFocus(onAudioFocusChangeListener, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
synchronized (mFocusLock) {
Log.d(TAG_KIWIX, "Audio Focus Requested");
synchronized (focuslock) {
if (audioFocusRequest == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
return true;
} else if(audioFocusRequest == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
} else {
return false;
}
}
return false;
}
public void pauseOrResume() {