diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java index ffcbb0d04..4ea6c409e 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -188,7 +188,7 @@ public class Preferences { } public static boolean dev() { - return getBoolValue("dev", false); + return true; // getBoolValue("dev", false); } public static boolean devmenu() { @@ -244,7 +244,7 @@ public class Preferences { } public static boolean isMusicRestricted() { - return getBoolValue("isMusicRestricted", false); + return getBoolValue("isMusicRestricted", true); } public static boolean msgflat() { diff --git a/smali/res/xml/preferences_general.xml b/smali/res/xml/preferences_general.xml index 03a7765e2..72d9a8b28 100644 --- a/smali/res/xml/preferences_general.xml +++ b/smali/res/xml/preferences_general.xml @@ -6,7 +6,6 @@ - diff --git a/smali/res/xml/preferences_general_milkshake.xml b/smali/res/xml/preferences_general_milkshake.xml index 61f0ba219..3b1e38f71 100644 --- a/smali/res/xml/preferences_general_milkshake.xml +++ b/smali/res/xml/preferences_general_milkshake.xml @@ -6,7 +6,6 @@ - diff --git a/smali/smali_classes2/com/vk/core/network/proxy/b.smali b/smali/smali_classes2/com/vk/core/network/proxy/b.smali index 5a18ebc07..1d9f19339 100644 --- a/smali/smali_classes2/com/vk/core/network/proxy/b.smali +++ b/smali/smali_classes2/com/vk/core/network/proxy/b.smali @@ -403,9 +403,19 @@ .end method .method public final c()Z - .locals 1 + .locals 2 - .line 1 + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z + + move-result v1 + + if-nez v1, :cond_1 + + const/4 v0, 0x0 + + return v0 + + :cond_1 iget-object v0, p0, Lcom/vk/core/network/proxy/b;->a:Ljava/security/PublicKey; if-eqz v0, :cond_0 diff --git a/smali/smali_classes2/com/vk/core/network/proxy/j.smali b/smali/smali_classes2/com/vk/core/network/proxy/j.smali index 9da842cef..510914bbe 100644 --- a/smali/smali_classes2/com/vk/core/network/proxy/j.smali +++ b/smali/smali_classes2/com/vk/core/network/proxy/j.smali @@ -696,9 +696,7 @@ return v0 :cond_1 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z - - move-result v0 + const/4 v0, 0x1 return v0 .end method diff --git a/smali/smali_classes2/com/vk/core/network/security/NetworkKeyStore.smali b/smali/smali_classes2/com/vk/core/network/security/NetworkKeyStore.smali index f16a98c95..0eaa754ab 100644 --- a/smali/smali_classes2/com/vk/core/network/security/NetworkKeyStore.smali +++ b/smali/smali_classes2/com/vk/core/network/security/NetworkKeyStore.smali @@ -84,9 +84,9 @@ invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z - move-result v0 + move-result v1 - if-nez v0, :cond_7 + if-nez v1, :cond_7 return-void diff --git a/smali/smali_classes2/com/vk/core/network/security/a.smali b/smali/smali_classes2/com/vk/core/network/security/a.smali index eda6b7d52..6f86fc2c3 100644 --- a/smali/smali_classes2/com/vk/core/network/security/a.smali +++ b/smali/smali_classes2/com/vk/core/network/security/a.smali @@ -351,7 +351,7 @@ .end method .method public checkClientTrusted([Ljava/security/cert/X509Certificate;Ljava/lang/String;)V - .locals 1 + .locals 2 .annotation system Ldalvik/annotation/Throws; value = { Ljava/security/cert/CertificateException; @@ -360,14 +360,13 @@ invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z - move-result v0 + move-result v1 - if-nez v0, :cond_7 + if-nez v1, :cond_7 return-void :cond_7 - .line 1 iget-object v0, p0, Lcom/vk/core/network/security/a;->a:Ljavax/net/ssl/X509TrustManager; if-eqz v0, :cond_0 @@ -379,7 +378,7 @@ .end method .method public checkServerTrusted([Ljava/security/cert/X509Certificate;Ljava/lang/String;)V - .locals 1 + .locals 2 .annotation system Ldalvik/annotation/Throws; value = { Ljava/security/cert/CertificateException; @@ -388,9 +387,9 @@ invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z - move-result v0 + move-result v1 - if-nez v0, :cond_7 + if-nez v1, :cond_7 return-void @@ -406,13 +405,13 @@ .end method .method public getAcceptedIssuers()[Ljava/security/cert/X509Certificate; - .locals 1 + .locals 2 invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z - move-result v0 + move-result v1 - if-nez v0, :cond_7 + if-nez v1, :cond_7 const/4 v0, 0x0 diff --git a/smali/smali_classes4/com/vtosters/lite/NetworkStateReceiver.smali b/smali/smali_classes4/com/vtosters/lite/NetworkStateReceiver.smali index 200c44452..f1582f150 100644 --- a/smali/smali_classes4/com/vtosters/lite/NetworkStateReceiver.smali +++ b/smali/smali_classes4/com/vtosters/lite/NetworkStateReceiver.smali @@ -225,109 +225,10 @@ move-result-object v0 - const/4 v1, 0x1 + const/4 v1, 0x0 iput-boolean v1, v0, Lcom/vtosters/lite/NetworkStateReceiver;->b:Z - .line 3 - invoke-static {p1, p2}, Lcom/vtosters/lite/i0/c;->a(Lcom/vtosters/lite/api/execute/i$a;Z)V - - .line 4 - invoke-static {}, Lcom/vtosters/lite/i0/c;->d()Lb/h/h/d/c; - - move-result-object p2 - - .line 5 - invoke-static {}, Lcom/vk/core/preference/Preference;->a()Landroid/content/SharedPreferences; - - move-result-object v0 - - const-string v2, "mytrackerLocationCrapEnabled" - - .line 6 - invoke-interface {v0, v2, v1}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z - - move-result v0 - - .line 7 - invoke-virtual {p2}, Lb/h/h/d/c;->e1()Lcom/vk/dto/user/UserProfile; - - move-result-object v1 - - invoke-static {v1}, Lcom/vk/dto/user/UserProfile;->a(Lcom/vk/dto/user/UserProfile;)I - - move-result v1 - - int-to-long v1, v1 - - .line 8 - sget-object v3, Lcom/vk/metrics/eventtracking/VkTracker;->k:Lcom/vk/metrics/eventtracking/VkTracker; - - new-instance v4, Lcom/vk/metrics/eventtracking/e; - - invoke-direct {v4}, Lcom/vk/metrics/eventtracking/e;->()V - - .line 9 - invoke-virtual {p2}, Lb/h/h/d/c;->D0()I - - move-result p2 - - invoke-virtual {v4, p2}, Lcom/vk/metrics/eventtracking/e;->b(I)Lcom/vk/metrics/eventtracking/e; - - iget-object p1, p1, Lcom/vtosters/lite/api/execute/i$a;->a:Lb/h/h/d/c; - - .line 10 - invoke-virtual {p1}, Lb/h/h/d/c;->B()Z - - move-result p1 - - invoke-virtual {v4, p1}, Lcom/vk/metrics/eventtracking/e;->b(Z)Lcom/vk/metrics/eventtracking/e; - - .line 11 - invoke-virtual {v4, v0}, Lcom/vk/metrics/eventtracking/e;->c(Z)Lcom/vk/metrics/eventtracking/e; - - long-to-int p1, v1 - - .line 12 - invoke-virtual {v4, p1}, Lcom/vk/metrics/eventtracking/e;->a(I)Lcom/vk/metrics/eventtracking/e; - - .line 13 - invoke-virtual {v4}, Lcom/vk/metrics/eventtracking/e;->a()Landroid/os/Bundle; - - move-result-object p1 - - .line 14 - invoke-virtual {v3, p1}, Lcom/vk/metrics/eventtracking/VkTracker;->a(Landroid/os/Bundle;)V - - .line 15 - invoke-static {}, Lcom/vtosters/lite/NetworkStateReceiver;->g()V - - .line 16 - invoke-static {p0}, Lcom/vtosters/lite/data/n;->a(Landroid/content/Context;)V - - .line 17 - sget-object p0, Lcom/vk/common/a;->b:Lcom/vk/common/a; - - invoke-virtual {p0}, Lcom/vk/common/a;->d()V - - .line 18 - invoke-static {}, Lcom/vtosters/lite/data/o;->i()Lcom/vtosters/lite/data/o; - - move-result-object p0 - - invoke-virtual {p0}, Lcom/vtosters/lite/data/o;->e()V - - .line 19 - invoke-static {}, Lcom/vtosters/lite/data/n;->j()Lcom/vtosters/lite/data/n; - - move-result-object p0 - - invoke-virtual {p0}, Lcom/vtosters/lite/data/n;->d()Lcom/vk/libvideo/u; - - move-result-object p0 - - invoke-virtual {p0}, Lcom/vk/libvideo/u;->a()V - return-void .end method diff --git a/smali/smali_classes4/com/vtosters/lite/VKApplication$g.smali b/smali/smali_classes4/com/vtosters/lite/VKApplication$g.smali deleted file mode 100644 index 28758f52c..000000000 --- a/smali/smali_classes4/com/vtosters/lite/VKApplication$g.smali +++ /dev/null @@ -1,185 +0,0 @@ -.class final Lcom/vtosters/lite/VKApplication$g; -.super Ljava/lang/Object; -.source "VKApplication.kt" - -# interfaces -.implements Ljava/lang/Runnable; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/vtosters/lite/VKApplication;->b(Landroid/app/Application;)V -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x18 - name = null -.end annotation - - -# instance fields -.field final synthetic a:Landroid/app/Application; - - -# direct methods -.method constructor (Landroid/app/Application;)V - .locals 0 - - iput-object p1, p0, Lcom/vtosters/lite/VKApplication$g;->a:Landroid/app/Application; - - invoke-direct {p0}, Ljava/lang/Object;->()V - - return-void -.end method - - -# virtual methods -.method public final run()V - .locals 4 - - .line 1 - sget-object v0, Lcom/vk/metrics/eventtracking/VkTracker;->k:Lcom/vk/metrics/eventtracking/VkTracker; - - invoke-virtual {v0}, Lcom/vk/metrics/eventtracking/VkTracker;->c()Z - - move-result v0 - - if-eqz v0, :cond_0 - - return-void - - .line 2 - :cond_0 - invoke-static {}, Lcom/vtosters/lite/i0/c;->d()Lb/h/h/d/c; - - move-result-object v0 - - const-string v1, "VKAccountManager.getCurrent()" - - invoke-static {v0, v1}, Lkotlin/jvm/internal/m;->a(Ljava/lang/Object;Ljava/lang/String;)V - - .line 3 - invoke-static {}, Lcom/vk/core/preference/Preference;->a()Landroid/content/SharedPreferences; - - move-result-object v1 - - const/4 v2, 0x1 - - const-string v3, "mytrackerLocationCrapEnabled" - - invoke-interface {v1, v3, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z - - move-result v1 - - .line 4 - sget-object v2, Lcom/vk/common/a;->b:Lcom/vk/common/a; - - invoke-virtual {v2}, Lcom/vk/common/a;->b()Z - - move-result v2 - - .line 5 - new-instance v3, Lcom/vk/metrics/eventtracking/e; - - invoke-direct {v3}, Lcom/vk/metrics/eventtracking/e;->()V - - .line 6 - invoke-virtual {v3, v2}, Lcom/vk/metrics/eventtracking/e;->a(Z)Lcom/vk/metrics/eventtracking/e; - - .line 7 - invoke-virtual {v3, v1}, Lcom/vk/metrics/eventtracking/e;->c(Z)Lcom/vk/metrics/eventtracking/e; - - .line 8 - invoke-virtual {v0}, Lb/h/h/d/c;->D0()I - - move-result v1 - - invoke-virtual {v3, v1}, Lcom/vk/metrics/eventtracking/e;->b(I)Lcom/vk/metrics/eventtracking/e; - - .line 9 - new-instance v1, Ljava/lang/StringBuilder; - - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V - - const-string v2, "" - - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - invoke-virtual {v0}, Lb/h/h/d/c;->Z()Ljava/lang/String; - - move-result-object v2 - - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - - move-result-object v1 - - invoke-virtual {v3, v1}, Lcom/vk/metrics/eventtracking/e;->b(Ljava/lang/String;)Lcom/vk/metrics/eventtracking/e; - - .line 10 - sget-object v1, Lb/h/g/g/b;->i:Lb/h/g/g/b; - - invoke-virtual {v1}, Lb/h/g/g/b;->a()Ljava/lang/String; - - move-result-object v1 - - invoke-virtual {v3, v1}, Lcom/vk/metrics/eventtracking/e;->a(Ljava/lang/String;)Lcom/vk/metrics/eventtracking/e; - - .line 11 - invoke-virtual {v0}, Lb/h/h/d/c;->B()Z - - move-result v0 - - invoke-virtual {v3, v0}, Lcom/vk/metrics/eventtracking/e;->b(Z)Lcom/vk/metrics/eventtracking/e; - - .line 12 - invoke-virtual {v3}, Lcom/vk/metrics/eventtracking/e;->a()Landroid/os/Bundle; - - move-result-object v0 - - .line 13 - sget-object v1, Lcom/vk/metrics/eventtracking/VkTracker;->k:Lcom/vk/metrics/eventtracking/VkTracker; - - sget-object v2, Lb/h/q/e/b;->a:Lb/h/q/e/b; - - invoke-virtual {v1, v2}, Lcom/vk/metrics/eventtracking/VkTracker;->a(Lcom/vk/metrics/eventtracking/c;)V - - .line 14 - sget-object v1, Lcom/vk/metrics/eventtracking/VkTracker;->k:Lcom/vk/metrics/eventtracking/VkTracker; - - new-instance v2, Lb/h/q/e/a; - - new-instance v3, Lcom/vk/utils/d; - - invoke-direct {v3}, Lcom/vk/utils/d;->()V - - invoke-direct {v2, v3}, Lb/h/q/e/a;->(Lb/h/q/e/a$a;)V - - invoke-virtual {v1, v2}, Lcom/vk/metrics/eventtracking/VkTracker;->a(Lcom/vk/metrics/eventtracking/c;)V - - .line 15 - sget-object v1, Lcom/vk/metrics/eventtracking/VkTracker;->k:Lcom/vk/metrics/eventtracking/VkTracker; - - sget-object v2, Lb/h/b/c;->a:Lb/h/b/c; - - invoke-virtual {v1, v2}, Lcom/vk/metrics/eventtracking/VkTracker;->a(Lcom/vk/metrics/eventtracking/c;)V - - .line 16 - sget-object v1, Lcom/vk/metrics/eventtracking/VkTracker;->k:Lcom/vk/metrics/eventtracking/VkTracker; - - sget-object v2, Lb/h/b/d;->a:Lb/h/b/d; - - invoke-virtual {v1, v2}, Lcom/vk/metrics/eventtracking/VkTracker;->a(Lcom/vk/metrics/eventtracking/c;)V - - .line 17 - sget-object v1, Lcom/vk/metrics/eventtracking/VkTracker;->k:Lcom/vk/metrics/eventtracking/VkTracker; - - iget-object v2, p0, Lcom/vtosters/lite/VKApplication$g;->a:Landroid/app/Application; - - const/4 v3, 0x0 - - invoke-virtual {v1, v2, v3, v0}, Lcom/vk/metrics/eventtracking/VkTracker;->a(Landroid/app/Application;ZLandroid/os/Bundle;)V - - return-void -.end method diff --git a/smali/smali_classes4/com/vtosters/lite/VKApplication.smali b/smali/smali_classes4/com/vtosters/lite/VKApplication.smali index ea5e688ef..b8dc5663d 100644 --- a/smali/smali_classes4/com/vtosters/lite/VKApplication.smali +++ b/smali/smali_classes4/com/vtosters/lite/VKApplication.smali @@ -865,19 +865,6 @@ .method private final b(Landroid/app/Application;)V .locals 2 - .line 15 - sget-object v0, Lcom/vk/core/concurrent/VkExecutors;->x:Lcom/vk/core/concurrent/VkExecutors; - - invoke-virtual {v0}, Lcom/vk/core/concurrent/VkExecutors;->h()Ljava/util/concurrent/ScheduledExecutorService; - - move-result-object v0 - - new-instance v1, Lcom/vtosters/lite/VKApplication$g; - - invoke-direct {v1, p1}, Lcom/vtosters/lite/VKApplication$g;->(Landroid/app/Application;)V - - invoke-interface {v0, v1}, Ljava/util/concurrent/ScheduledExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future; - return-void .end method diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/z1$a.smali b/smali/smali_classes4/com/vtosters/lite/fragments/z1$a.smali deleted file mode 100644 index 8b608f73d..000000000 --- a/smali/smali_classes4/com/vtosters/lite/fragments/z1$a.smali +++ /dev/null @@ -1,49 +0,0 @@ -.class Lcom/vtosters/lite/fragments/z1$a; -.super Ljava/lang/Object; -.source "SettingsGeneralFragment.java" - -# interfaces -.implements Landroidx/preference/Preference$OnPreferenceChangeListener; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/vtosters/lite/fragments/z1;->onCreate(Landroid/os/Bundle;)V -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x0 - name = null -.end annotation - - -# direct methods -.method constructor (Lcom/vtosters/lite/fragments/z1;)V - .locals 0 - - .line 1 - invoke-direct {p0}, Ljava/lang/Object;->()V - - return-void -.end method - - -# virtual methods -.method public onPreferenceChange(Landroidx/preference/Preference;Ljava/lang/Object;)Z - .locals 0 - - .line 1 - sget-object p1, Lcom/vk/common/a;->b:Lcom/vk/common/a; - - check-cast p2, Ljava/lang/Boolean; - - invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z - - move-result p2 - - invoke-virtual {p1, p2}, Lcom/vk/common/a;->a(Z)V - - const/4 p1, 0x1 - - return p1 -.end method diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/z1.smali b/smali/smali_classes4/com/vtosters/lite/fragments/z1.smali index 2027a06dc..57338d431 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/z1.smali +++ b/smali/smali_classes4/com/vtosters/lite/fragments/z1.smali @@ -967,22 +967,6 @@ :goto_0 invoke-virtual {p0, p1}, Lcom/vtosters/lite/fragments/u2/b;->addPreferencesFromResource(I)V - const-string p1, "mytrackerLocationCrapEnabled" - - .line 3 - invoke-virtual {p0, p1}, Lcom/vtosters/lite/fragments/u2/b;->findPreference(Ljava/lang/CharSequence;)Landroidx/preference/Preference; - - move-result-object p1 - - check-cast p1, Landroidx/preference/SwitchPreference; - - .line 4 - new-instance v0, Lcom/vtosters/lite/fragments/l0; - - invoke-direct {v0, p0}, Lcom/vtosters/lite/fragments/l0;->(Lcom/vtosters/lite/fragments/z1;)V - - invoke-virtual {p1, v0}, Landroidx/preference/Preference;->setOnPreferenceChangeListener(Landroidx/preference/Preference$OnPreferenceChangeListener;)V - const-string p1, "trackInstalledApps" .line 5 @@ -992,28 +976,8 @@ check-cast p1, Landroidx/preference/SwitchPreference; - .line 6 - sget-object v0, Lcom/vk/common/a;->b:Lcom/vk/common/a; - - invoke-virtual {v0}, Lcom/vk/common/a;->c()Z - - move-result v0 - const-string v1, "app" - if-eqz v0, :cond_1 - - .line 7 - new-instance v0, Lcom/vtosters/lite/fragments/z1$a; - - invoke-direct {v0, p0}, Lcom/vtosters/lite/fragments/z1$a;->(Lcom/vtosters/lite/fragments/z1;)V - - invoke-virtual {p1, v0}, Landroidx/preference/Preference;->setOnPreferenceChangeListener(Landroidx/preference/Preference$OnPreferenceChangeListener;)V - - goto :goto_1 - - .line 8 - :cond_1 invoke-virtual {p0, v1}, Lcom/vtosters/lite/fragments/u2/b;->findPreference(Ljava/lang/CharSequence;)Landroidx/preference/Preference; move-result-object v0 @@ -1022,7 +986,6 @@ invoke-virtual {v0, p1}, Landroidx/preference/PreferenceGroup;->removePreference(Landroidx/preference/Preference;)Z - :goto_1 const-string p1, "useProxyServer" .line 9