Merge pull request #502 from a93h/master

Icon Kitkat & Error Handle
simple-last-fm-scrobbler · Sep 8, 2019 · 5fd9fd1 · 5fd9fd1
2 parents c7f3b31 + 56196fe
commit 5fd9fd1
Show file tree

Hide file tree

Showing 11 changed files with 197 additions and 155 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.adam.aslfms"
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode = 51
-        versionName = "1.6.0"
+        versionCode = 52
+        versionName = "1.6.1"
 
         testApplicationId "com.adam.aslfms.test"
         testInstrumentationRunner "android.test.InstrumentationTestRunner"

diff --git a/app/src/main/java/com/adam/aslfms/service/ControllerReceiverService.java b/app/src/main/java/com/adam/aslfms/service/ControllerReceiverService.java
@@ -119,10 +119,10 @@ public void onListenerDisconnected() {
     }
 
     public void init(){
-        MediaSessionManager mediaSessionManager = (MediaSessionManager) this.getApplicationContext().getSystemService(Context.MEDIA_SESSION_SERVICE) ;
-        mControllerReceiverSession = new ControllerReceiverSession(this);
-
+        MediaSessionManager mediaSessionManager = null;
         try {
+            mediaSessionManager = (MediaSessionManager) this.getApplicationContext().getSystemService(Context.MEDIA_SESSION_SERVICE) ;
+            mControllerReceiverSession = new ControllerReceiverSession(this);
             mediaSessionManager.addOnActiveSessionsChangedListener(mControllerReceiverSession, new ComponentName(this, ControllerReceiverService.class));
             Log.d(TAG, "media session manager loaded");
         } catch (Exception e) {

diff --git a/app/src/main/res/drawable-hdpi/ic_icon.png b/app/src/main/res/drawable-hdpi/ic_icon.png
diff --git a/app/src/main/res/drawable-mdpi/ic_icon.png b/app/src/main/res/drawable-mdpi/ic_icon.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_icon.png b/app/src/main/res/drawable-xhdpi/ic_icon.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_icon.png b/app/src/main/res/drawable-xxhdpi/ic_icon.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_icon.png b/app/src/main/res/drawable-xxxhdpi/ic_icon.png
diff --git a/app/src/main/res/drawable/ic_icon.xml b/app/src/main/res/drawable/ic_icon.xml
diff --git a/art/icon_new_white.svg b/art/icon_new_white.svg
diff --git a/art/icon_new_white_square_rounded.svg b/art/icon_new_white_square_rounded.svg
diff --git a/art/icon_white.svg b/art/icon_white.svg