diff --git a/app/build.gradle b/app/build.gradle index 51ce75719..112eb56d1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,6 +60,8 @@ android { } release { buildConfigField 'String', 'APPCENTER_KEY', '""' + minifyEnabled true + proguardFile 'proguard-rules.pro' } } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index e4650c9d6..489f1e589 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -18,4 +18,15 @@ ## If you keep the line number information, uncomment this to ## hide the original source file name. ##-renamesourcefileattribute SourceFile -#-keepclassmembers class fq \ No newline at end of file +#-keepclassmembers class fq + +-dontshrink +-dontobfuscate +-assumenosideeffects class android.util.Log { + public static boolean isLoggable(java.lang.String, int); + public static int v(...); + public static int i(...); + public static int w(...); + public static int d(...); + public static int e(...); +} \ No newline at end of file diff --git a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java index a4d4e949f..6596b2bbd 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java @@ -164,7 +164,7 @@ public class JsonInjectors { Log.d("NewsfeedList", "Added list " + id + " to feed"); item.put("is_hidden", hide) .put("is_unavailable", hide); - if (dev()) Log.d("NewsfeedListInj", "Unlocked " + id + " in newsfeed list"); + Log.d("NewsfeedListInj", "Unlocked " + id + " in newsfeed list"); } Preferences.getPreferences().edit().putStringSet("news_feed_items_set", mutableFiltersSet) .apply(); diff --git a/app/src/main/java/ru/vtosters/lite/music/Genius.java b/app/src/main/java/ru/vtosters/lite/music/Genius.java index 1024f231f..4a1aa4a79 100644 --- a/app/src/main/java/ru/vtosters/lite/music/Genius.java +++ b/app/src/main/java/ru/vtosters/lite/music/Genius.java @@ -78,11 +78,6 @@ public class Genius { } private static String getText(String track) { - if (TextUtils.isEmpty(track)) { - Log.d("Genius", "No track"); - return null; - } - Request request = new Request.a() .b(URL + track + "?text_format=plain") .a("User-Agent", "Genius/5.14.0 (Android; Android 13; Google Pixel 4 XL)") @@ -100,7 +95,7 @@ public class Genius { return AndroidUtils.getString("error_no_text"); } - return payload.getJSONObject("response").getJSONObject("song").getJSONObject("lyrics").getString("plain"); + return " " + payload.getJSONObject("response").getJSONObject("song").getJSONObject("lyrics").getString("plain"); } catch (JSONException | IOException e) { return AndroidUtils.getString("error_no_text") + "\n\n" + AndroidUtils.getString(R.string.error) + ": \n" + e.getMessage(); } diff --git a/app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java b/app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java index f3fbd3880..d79f6f63e 100644 --- a/app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java +++ b/app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java @@ -73,7 +73,7 @@ public class CatalogJsonInjector { var id = catalogarr.optString("id"); var url = catalogarr.optString("url"); - if (dev()) Log.d("VKMusic", "Added " + title + " in music sections"); + Log.d("VKMusic", "Added " + title + " in music sections"); oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url)); } @@ -86,7 +86,7 @@ public class CatalogJsonInjector { var id = catalogarr.optString("id"); var url = catalogarr.optString("url"); - if (dev()) Log.d("VKMusic", "Added " + title + " in music sections"); + Log.d("VKMusic", "Added " + title + " in music sections"); oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url)); } @@ -102,7 +102,7 @@ public class CatalogJsonInjector { if (url.contains(value) && !value.isEmpty()) { catalog.put("default_section", id); - if (dev()) Log.d("VKMusic", "Added " + title + " as default music section"); + Log.d("VKMusic", "Added " + title + " as default music section"); } } } @@ -231,7 +231,7 @@ public class CatalogJsonInjector { if (links.optJSONObject(0).optString("url").contains("?section=recent")) { json.remove("links"); - if (dev()) Log.d("VKMusic", "Removed links buttons"); + Log.d("VKMusic", "Removed links buttons"); } } diff --git a/app/src/main/java/ru/vtosters/lite/ssfs/UsersList.java b/app/src/main/java/ru/vtosters/lite/ssfs/UsersList.java index 030d3b646..58c063d5c 100644 --- a/app/src/main/java/ru/vtosters/lite/ssfs/UsersList.java +++ b/app/src/main/java/ru/vtosters/lite/ssfs/UsersList.java @@ -64,10 +64,8 @@ public class UsersList { var idsDescription = json.getJSONArray("with_service_descriptions"); var idsBanner = json.getJSONArray("with_chat_banners"); - if (dev()) { - Log.d(TAG, idsDescription.toString()); - Log.d(TAG, idsBanner.toString()); - } + Log.d(TAG, idsDescription.toString()); + Log.d(TAG, idsBanner.toString()); processIds(idsBanner, bannersList); processIds(idsDescription, descriptionsList);