Beta 0.54

shkcodes · Aug 1, 2018 · 8c365be · 8c365be
1 parent 49f7d5e
commit 8c365be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,15 +14,18 @@ android {
         applicationId "com.shkmishra.lyrically"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 15
-        versionName "0.53"
+        versionCode 16
+        versionName "0.54"
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {

diff --git a/app/src/main/java/com/shkmishra/lyrically/LyricsService.kt b/app/src/main/java/com/shkmishra/lyrically/LyricsService.kt
@@ -263,7 +263,7 @@ class LyricsService : Service() {
 
 
         val showLyrics = Intent(this, ShowLyrics::class.java)
-        showLyrics?.putExtra("messenger", Messenger(handler))
+        showLyrics.putExtra("messenger", Messenger(handler))
         pendingIntent = PendingIntent.getService(this, 1, showLyrics, PendingIntent.FLAG_UPDATE_CURRENT)
 
 
@@ -297,6 +297,7 @@ class LyricsService : Service() {
 
     //####
     private fun handleIntent(intent: Intent) {
+        if (asyncJob != null && asyncJob!!.isActive) asyncJob?.cancel()
         try {
             // check if the song was changed by comparing the current artist and title with those received from the broadcast
             if (!artist.equals(intent.getStringExtra("artist"), ignoreCase = true) || !track.equals(intent.getStringExtra("track"), ignoreCase = true)) {
@@ -332,7 +333,6 @@ class LyricsService : Service() {
                             lyricsTV.visibility = View.INVISIBLE
                             artistU = artist.replace(" ".toRegex(), "+")
                             trackU = track.replace(" ".toRegex(), "+")
-                            if (asyncJob != null && asyncJob!!.isActive) asyncJob?.cancel()
                             fetchLyricsAsync()
                             break
                         }
@@ -351,13 +351,11 @@ class LyricsService : Service() {
                         } else {
                             artistU = artist.replace(" ".toRegex(), "+")
                             trackU = track.replace(" ".toRegex(), "+")
-                            if (asyncJob != null && asyncJob!!.isActive) asyncJob?.cancel()
                             fetchLyricsAsync()
                         }
                     } else {
                         artistU = artist.replace(" ".toRegex(), "+")
                         trackU = track.replace(" ".toRegex(), "+")
-                        if (asyncJob != null && asyncJob!!.isActive) asyncJob?.cancel()
                         fetchLyricsAsync()
                     }
                 }