From fcadd2fd41322b8c84c461aed623f0f6c7abae3b Mon Sep 17 00:00:00 2001
From: Abishek <abishekkumar2@gmail.com>
Date: Sat, 3 Mar 2018 06:21:29 +0530
Subject: [PATCH] Fix code styling issues

---
 .../kiwixmobile/KiwixMobileActivity.java      |  4 +--
 .../kiwixmobile/utils/KiwixTextToSpeech.java  | 27 +++++++++----------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java
index e4aab006e..eb5265f8f 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java
@@ -629,14 +629,14 @@ 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;
         }
         switch (focusChange) {
           case (AudioManager.AUDIOFOCUS_LOSS):
-            if(!tts.currentTTSTask.paused) tts.pauseOrResume();
+            if (!tts.currentTTSTask.paused) tts.pauseOrResume();
             pauseTTSButton.setText(R.string.tts_resume);
             break;
           case (AudioManager.AUDIOFOCUS_GAIN):
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java b/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java
index 0585eced6..0eb2c893c 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java
@@ -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) {
-      if(audioFocusRequest == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+    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() {
@@ -174,7 +171,7 @@ public class KiwixTextToSpeech {
       return;
 
     if (currentTTSTask.paused) {
-      if(!requestAudioFocus()) return;
+      if (!requestAudioFocus()) return;
       currentTTSTask.start();
     }
     else {