From afd257f1753f509276fa7e1a5ec9f4c1f670349a Mon Sep 17 00:00:00 2001
From: h4h13 <hemanths@live.com>
Date: Wed, 22 May 2019 08:23:18 +0530
Subject: [PATCH] Fix crashing on What' new

---
 .../retromusic/activities/WhatsNewActivity.java     | 13 +++++--------
 .../name/monkey/retromusic/util/PreferenceUtil.java | 11 ++++++-----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java
index e4897424..8323aa98 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java
@@ -5,16 +5,16 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.webkit.WebView;
-import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
 
 import com.google.android.material.appbar.AppBarLayout;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
+import java.nio.charset.StandardCharsets;
 
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.util.ATHUtil;
@@ -26,7 +26,6 @@ import code.name.monkey.retromusic.util.PreferenceUtil;
 
 public class WhatsNewActivity extends AbsBaseActivity {
     WebView webView;
-    TextView title;
     Toolbar toolbar;
     AppBarLayout appBarLayout;
 
@@ -51,7 +50,6 @@ public class WhatsNewActivity extends AbsBaseActivity {
         setContentView(R.layout.activity_whats_new);
 
         webView = findViewById(R.id.webView);
-        title = findViewById(R.id.bannerTitle);
         toolbar = findViewById(R.id.toolbar);
         appBarLayout = findViewById(R.id.appBarLayout);
 
@@ -65,14 +63,13 @@ public class WhatsNewActivity extends AbsBaseActivity {
         setSupportActionBar(toolbar);
 
         toolbar.setNavigationOnClickListener(v -> onBackPressed());
-        title.setTextColor(ThemeStore.Companion.textColorPrimary(this));
         ToolbarContentTintHelper.colorBackButton(toolbar, ThemeStore.Companion.textColorSecondary(this));
 
         try {
             // Load from phonograph-changelog.html in the assets folder
             StringBuilder buf = new StringBuilder();
             InputStream json = getAssets().open("retro-changelog.html");
-            BufferedReader in = new BufferedReader(new InputStreamReader(json, "UTF-8"));
+            BufferedReader in = new BufferedReader(new InputStreamReader(json, StandardCharsets.UTF_8));
             String str;
             while ((str = in.readLine()) != null)
                 buf.append(str);
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
index f67e2cfc..8548a049 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
@@ -21,15 +21,16 @@ import android.content.SharedPreferences.Editor;
 import android.content.res.TypedArray;
 import android.preference.PreferenceManager;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
+import androidx.viewpager.widget.ViewPager;
+
 import com.google.android.material.bottomnavigation.LabelVisibilityMode;
 
 import java.io.File;
 import java.util.Objects;
 
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.StyleRes;
-import androidx.viewpager.widget.ViewPager;
 import code.name.monkey.retromusic.App;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.activities.MainActivity;
@@ -277,7 +278,7 @@ public final class PreferenceUtil {
 
 
     public final int getLastPage() {
-        return mPreferences.getInt(LAST_PAGE, R.id.action_home);
+        return mPreferences.getInt(LAST_PAGE, R.id.action_song);
     }
 
     public void setLastPage(final int value) {