From 6ffcbe83298c7a33199173a51ceffb880bfef2f1 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Thu, 28 Jul 2022 01:41:21 +0300
Subject: [PATCH] some improvements of scrobbler

---
 .../ru/vtosters/lite/music/Scrobbler.java     | 51 ++++++++++++++-----
 smali/res/xml/preferences_media.xml           | 11 ++--
 2 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/music/Scrobbler.java b/app/src/main/java/ru/vtosters/lite/music/Scrobbler.java
index e2f78b68d..463424635 100644
--- a/app/src/main/java/ru/vtosters/lite/music/Scrobbler.java
+++ b/app/src/main/java/ru/vtosters/lite/music/Scrobbler.java
@@ -24,11 +24,11 @@ import ru.vtosters.lite.net.NetResponse;
 import ru.vtosters.lite.utils.Preferences;
 
 public class Scrobbler{
-    public static final String key = "5965d63402414776c54c266db0211746";
-    public static final String keysecret = "d982180eed13275bb948e41cf225f88f";
-    public static final String url = "https://ws.audioscrobbler.com/2.0/";
+    private static final String key = "5965d63402414776c54c266db0211746";
+    private static final String keysecret = "d982180eed13275bb948e41cf225f88f";
+    private static final String url = "https://ws.audioscrobbler.com/2.0/";
     private static final NetClient client = new NetClient.Builder().build();
-    public static ArrayList<String> scrobbled = new ArrayList<>();
+    private static ArrayList<String> scrobbled = new ArrayList<>();
 
     public static void scrobbleTrack(long duration, String artist, String title, String uid){
         var string = getDefaultPrefs().getString("sessionKey", null);
@@ -36,9 +36,14 @@ public class Scrobbler{
 
         Log.d("Scrobbler", "scrobbleTrack: " + title + " - " + artist + " - " + duration + " - " + uid);
 
-        if (!needToBeScrobble(uid)) {
-            return;
-        }
+        if (!needToBeScrobble(uid) ||
+                string == null ||
+                string.isEmpty() ||
+                artist == null ||
+                artist.isEmpty() ||
+                title == null ||
+                title.isEmpty() ||
+                duration == 0) return;
 
         scrobbled.add(uid); // add to scrobbled list
 
@@ -74,12 +79,18 @@ public class Scrobbler{
             sb.append(entry.getKey());
             sb.append(entry.getValue());
         }
+
         sb.append(keysecret);
 
         return MD5(sb.toString());
     }
 
     public static void auth(String login, String pass){
+        if (login == null || pass == null) {
+            sendToast("Логин или пароль не заданы");
+            return;
+        }
+
         TreeMap<String, String> treeMap = new TreeMap<>(); // create map for request
         treeMap.put("method", "auth.getMobileSession");
         treeMap.put("api_key", key);
@@ -98,12 +109,9 @@ public class Scrobbler{
             @Override
             public void onResponse(NetCall call, NetResponse response){
                 try {
-                    JSONObject jSONObject = new JSONObject(response.getDataString()).getJSONObject("session");
-                    String string = jSONObject.getString("name");
-                    getDefaultPrefs().edit().putString("username", string).putString("sessionKey", jSONObject.getString("key")).apply();
-                    sendToast("Успешно вошли как " + string);
-
-                    Log.d("Scrobbler", "Auth " + response.getDataString());
+                    var jSONObject = new JSONObject(response.getDataString());
+                    sessionFetcher(jSONObject);
+                    Log.d("Scrobbler", "Auth response " + response.getDataString());
                 } catch (JSONException e) {
                     Log.d("Scrobbler", "Auth failed", e);
                 }
@@ -111,6 +119,21 @@ public class Scrobbler{
         });
     }
 
+    public static void sessionFetcher(JSONObject jsonObject) throws JSONException{
+        if (!jsonObject.has("session")) {
+            Log.d("Scrobbler", "Auth failed - no session");
+            return;
+        }
+
+        var session = jsonObject.getJSONObject("session");
+        var name = session.getString("name");
+        var key = session.getString("key");
+
+        getDefaultPrefs().edit().putString("username", name).putString("sessionKey", key).apply();
+
+        Log.d("Scrobbler", "Auth success as " + name + ", key " + key);
+    }
+
     public static void reset(){
         edit().remove("username").apply();
         edit().remove("sessionKey").apply();
@@ -123,7 +146,7 @@ public class Scrobbler{
     }
 
     public static boolean isLoggedIn(){
-        return !getDefaultPrefs().getString("sessionKey", null).isEmpty();
+        return getDefaultPrefs().getString("sessionKey", null) != null;
     }
 
     public static boolean isScrobblingEnabled(){
diff --git a/smali/res/xml/preferences_media.xml b/smali/res/xml/preferences_media.xml
index 0721d6dff..37cfab8f8 100644
--- a/smali/res/xml/preferences_media.xml
+++ b/smali/res/xml/preferences_media.xml
@@ -37,16 +37,17 @@
             android:title="@string/sett_compress_videos" />
     </PreferenceCategory>
     <PreferenceCategory android:title="Last.fm">
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="lastfm_enabled"
+            android:summary="Полезный сервис по учету прослушивания песен"
+            android:title="Включить скробблинг" />
         <Preference
             android:key="lastfm_auth"
             android:title="Войти в аккаунт" />
         <Preference
             android:key="lastfm_reset"
-            android:title="Сбросить настройки аккаунта" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="lastfm_enabled"
-            android:title="Включить скробблинг" />
+            android:title="Выйти из аккаунта" />
     </PreferenceCategory>
     <PreferenceCategory android:title="Музыка">
         <com.vtosters.lite.ui.MaterialSwitchPreference