fixed groups load

fix #1607
fixed profiles loading
2024-04-12 10:24:02 +03:00 · 2024-04-12 10:08:57 +03:00 · 2024-04-12 09:58:44 +03:00 · 2024-03-30 05:54:56 +03:00 · 2024-03-29 15:16:33 +03:00 · 2024-03-29 15:12:56 +03:00
499 changed files with 26731 additions and 15732 deletions
@@ -21,14 +21,21 @@ jobs:
    runs-on: ubuntu-latest

    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        
+      - name: Set up NDK
+        uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r25c
+          add-to-path: false
+
      - name: Set up JDK
        uses: actions/setup-java@v3
        with:
          java-version: '17'
          distribution: 'adopt'
-          
-      - uses: actions/checkout@v3
-      
+              
      - name: Download tools
        run: |
          sudo apt update
@@ -47,6 +54,8 @@ jobs:
          java -jar scripts/apktool.jar b smali -o smali/VTLite.apk --use-aapt2 -p scripts/framework/
          zipalign -p -f 4 smali/VTLite.apk smali/VTLite.apk_aligned
          mv smali/VTLite.apk_aligned smali/VTLite.apk
+        env:
+          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}

      - name: Sign and verify the apk
        run: |
@@ -0,0 +1,28 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RClass Regeneration" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/scripts/rclass_regenerator.sh" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/zsh" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="true" />
+    <envs />
+    <method v="2" />
+  </configuration>
+  <configuration default="false" name="RClass Regeneration" type="BatchConfigurationType" factoryName="Batch">
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="WORKING_DIRECTORY" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <module name="" />
+    <option name="SCRIPT_NAME" value="./scripts/rclass_regenerator.bat" />
+    <option name="PARAMETERS" value="" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Update APKs Jars (MacOS)" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/scripts/update_jars_brew.sh" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/zsh" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="true" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Update APKs Jars" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/scripts/update_jars.sh" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/zsh" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="true" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lite [app:buildAndInstallVTLBeta]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="app:buildAndInstallVTLBeta" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms4g -Xmx4g" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lite [app:buildAndInstallVTLDev]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="app:buildAndInstallVTLDev" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms4g -Xmx4g" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lite [app:buildAndInstallVTLRelease]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="app:buildAndInstallVTLRelease" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms4g -Xmx4g" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lite [app:buildAndLaunchVTLBeta]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="app:buildAndLaunchVTLBeta" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms4g -Xmx4g" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lite [app:buildAndLaunchVTLDev]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="app:buildAndLaunchVTLDev" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms4g -Xmx4g" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lite [app:buildAndLaunchVTLRelease]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="app:buildAndLaunchVTLRelease" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms4g -Xmx4g" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lite [app:buildVTLBeta]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="app:buildVTLBeta" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms4g -Xmx4g" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lite [app:buildVTLDev]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="app:buildVTLDev" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms4g -Xmx4g" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lite [app:buildVTLRelease]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="app:buildVTLRelease" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms4g -Xmx4g" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lite [app:exportDexBeta]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="app:exportDexBeta" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms4g -Xmx4g" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lite [app:exportDexDev]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="app:exportDexDev" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms4g -Xmx4g" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lite [app:exportDexRelease]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="app:exportDexRelease" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms4g -Xmx4g" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lite [app:prepareDexForMergeDev]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="app:prepareDexForMergeDev" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms4g -Xmx4g" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lite [app:prepareDexForMergeRelease]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="app:prepareDexForMergeRelease" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms4g -Xmx4g" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -20,9 +20,9 @@ cargo {
 def smaliFolder = projectDir.toPath().resolve("../smali").normalize()
 def scriptsFolder = projectDir.toPath().resolve("../scripts").normalize()
 //you can add own folders with decompiled smali code
-def dexes=smaliFolder.toFile()
-            .listFiles( { f -> f.isDirectory() && f.name.startsWith("smali") } as FileFilter)
-            .size()
+def dexes = smaliFolder.toFile()
+        .listFiles({ f -> f.isDirectory() && f.name.startsWith("smali") } as FileFilter)
+        .size()

 versionFile {
    file = projectDir.toPath().resolve("src/main/assets/version.properties").toFile()
@@ -91,11 +91,13 @@ task testClasses {
 }

 dependencies {
-    implementation 'com.microsoft.appcenter:appcenter-analytics:5.0.1'
-    implementation 'com.microsoft.appcenter:appcenter-crashes:5.0.1'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
+    implementation 'com.microsoft.appcenter:appcenter-analytics:5.0.4'
+    implementation 'com.microsoft.appcenter:appcenter-crashes:5.0.4'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
    implementation 'net.sourceforge.streamsupport:streamsupport-minifuture:1.7.4'
-    implementation 'com.google.guava:guava:23.3-android'
+    implementation 'com.google.guava:guava:32.0.0-android'
+
+    implementation 'com.mpatric:mp3agic:0.9.1'

    implementation fileTree(dir: 'libs', include: ['*.aar'])
    compileOnly fileTree(dir: 'libs', include: ['*.jar'])
@@ -105,38 +107,35 @@ task generateBuildTasks() {
    android.applicationVariants.all { variant ->
        variant.outputs.each { output ->
            def buildType = output.name.toString().capitalize()
-            if(buildType=="Base")return
+            if (buildType == "Base") return
            task "exportDex$buildType"() {
                dependsOn('assemble' + buildType)
                doLast {
                    try {
-                        def suffix=buildType.toLowerCase()
-                        String apkPath=projectDir.getAbsolutePath()+"/build/outputs/apk/$suffix/app-$suffix"
-                        def apk=new File(apkPath+"-unsigned.apk")
-                        if(!apk.exists())apk=new File(apkPath+".apk")
-                        def zip=new ZipFile(apk)
-                        def entries=zip.entries()
-                        def dexCounter=dexes
-                        while(entries.hasMoreElements())
-                        {
-                            def entry=entries.nextElement()
-                            String filename
-                            if(entry.name.matches("^classes(?:(?=\\d)2|)\\.dex\$"))filename="classes${++dexCounter}.dex"
-                            else if(entry.name=="assets/version.properties")filename="version.properties"
-                            else continue
-                            println("Exporting "+entry.name)
-                            def tmpFile=new File(projectDir,filename)
-                            def is=zip.getInputStream(entry)
-                            def fos=new FileOutputStream(tmpFile)
-                            def buff=new byte[0x800]
-                            int len
-                            while((len=is.read(buff))>0)fos.write(buff,0,len)
-                            is.close()
-                            fos.close()
-                        }
+                        def suffix = buildType.toLowerCase()
+                        String apkPath = projectDir.getAbsolutePath() + "/build/outputs/apk/$suffix/app-$suffix"
+                        def apk = new File(apkPath + "-unsigned.apk")
+                        if (!apk.exists()) apk = new File(apkPath + ".apk")
+                        def zip = new ZipFile(apk)
+                        def dexCounter = dexes
+                        zip.stream()
+                                .filter(entry -> entry.name.matches("^classes(?:(?=\\d)2|)\\.dex\$") || entry.name == "assets/version.properties")
+                                .forEach(entry -> {
+                                    String filename
+                                    if (entry.name.matches("^classes(?:(?=\\d)2|)\\.dex\$")) filename = "classes${++dexCounter}.dex"
+                                    else filename = "version.properties"
+                                    println("Exporting " + entry.name)
+                                    def tmpFile = new File(projectDir, filename)
+                                    try (def is = zip.getInputStream(entry); def fos = new FileOutputStream(tmpFile)) {
+                                        def buff = new byte[0x800]
+                                        int len
+                                        while ((len = is.read(buff)) > 0) fos.write(buff, 0, len)
+                                    }
+                                });
                    } catch (Exception e) {
                        e.printStackTrace()
                    }
+
                }
            }
            task "prepareDexForMerge$buildType"(type: Copy) {
@@ -152,19 +151,19 @@ task generateBuildTasks() {
                    include 'version.properties'
                    into 'assets'
                }
-                from('../native-effects/target/aarch64-linux-android/release'){
+                from('../native-effects/target/aarch64-linux-android/release') {
                    include 'libnative_effects.so'
                    into 'lib/arm64-v8a'
                }
-                from('../native-effects/target/armv7-linux-androideabi/release'){
+                from('../native-effects/target/armv7-linux-androideabi/release') {
                    include 'libnative_effects.so'
                    into 'lib/armeabi-v7a'
                }
            }
-            task "cleanTemporaryFiles$buildType"(type:Delete)
+            task "cleanTemporaryFiles$buildType"(type: Delete)
            {
-                delete fileTree(dir:projectDir,include:["*.dex","version.properties"])
-                delete fileTree(dir:smaliFolder,include:['*.dex',"assets/version.properties"])
+                delete fileTree(dir: projectDir, include: ["*.dex", "version.properties"])
+                delete fileTree(dir: smaliFolder, include: ['*.dex', "assets/version.properties"])
            }
            task "buildVTL$buildType"(type: Exec) {
                dependsOn('prepareDexForMerge' + buildType)
@@ -35,7 +35,7 @@
 -optimizationpasses 5
 -keepattributes SourceFile, LineNumberTable

-keep,allowoptimization class ru.vtosters.hooks.**, ru.vtosters.lite.utils.AndroidUtils, ru.vtosters.lite.utils.NetworkUtils, ru.vtosters.lite.utils.CrashReporter, ru.vtosters.lite.ui.activities.**, ru.vtosters.lite.services.**, ru.vtosters.lite.ui.fragments.**, ru.vtosters.lite.themes.**, ru.vtosters.lite.music.hook.**, ru.vtosters.lite.music.cache.injectors.**, ru.vtosters.lite.ui.wallpapers.NativeEffects, com.aefyr.tsg.g2.TelegramStickersService {
+-keep,allowoptimization class ru.vtosters.hooks.**, ru.vtosters.sponsorpost.internal.Native, ru.vtosters.lite.utils.AndroidUtils, ru.vtosters.lite.utils.NetworkUtils, ru.vtosters.lite.utils.CrashReporter, ru.vtosters.lite.ui.activities.**, ru.vtosters.lite.services.**, ru.vtosters.lite.ui.fragments.**, ru.vtosters.lite.themes.**, ru.vtosters.lite.music.hook.**, ru.vtosters.lite.music.cache.injectors.**, ru.vtosters.lite.ui.wallpapers.NativeEffects, com.aefyr.tsg.g2.TelegramStickersService {
  public <fields>;
  public <methods>;
  public <init>(...);
@@ -6,6 +6,7 @@ import android.os.RemoteException;
 import bruhcollective.itaysonlab.libvkx.ILibVkxService;
 import com.vk.dto.music.MusicTrack;
 import com.vk.music.common.MusicPlaybackLaunchContext;
+import ru.vtosters.hooks.other.Preferences;

 import java.util.ArrayList;
 import java.util.List;
@@ -33,7 +34,7 @@ public class LibVKXClient {
    public static boolean isVkxInstalled() {
        try {
            getGlobalContext().getPackageManager().getPackageInfo("ua.itaysonlab.vkx", 0);
-            return isValidSignature();
+            return isValidSignature() && !Preferences.serverFeaturesDisable();
        } catch (Exception unused) {
            return false;
        }
@@ -80,6 +81,7 @@ public class LibVKXClient {
        lambdaplay(list, musicTrack, iLibVkxService, null);
    }

-    public static String asId(MusicTrack musicTrack)
-    { return musicTrack.y1(); }
+    public static String asId(MusicTrack musicTrack) {
+        return musicTrack.y1();
+    }
 }
@@ -36,8 +36,8 @@ public class TelegramStickersPack extends CustomStickersPack {
    public HashMap<String, List<Integer>> emojis = new HashMap<>();

    public TelegramStickersPack(String id) {
-        this.id=this.title=id;
-        this.hash=id.hashCode();
+        this.id = this.title = id;
+        this.hash = id.hashCode();
    }

    public JSONObject encodeEmojis() throws JSONException {
@@ -26,19 +26,13 @@ import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 public class TelegramStickersService {
    private static final String TAG = "TGStickersService";
    private static TelegramStickersService instance;
-
-    private final Context c;
-
    private final ArrayList<TelegramStickersPack> packs;
    private final ArrayList<TelegramStickersPack> activePacks;
    private final ArrayList<TelegramStickersPack> inactivePacks;
    private final ArrayList<StickersEventsListener> listeners;
    private final HashSet<String> currentlyDownloading;
-
    private final Handler uiThreadHandler;
-
    private final TelegramStickersGrabber grabber;
-
    private final TelegramStickersDbHelper dbHelper;
    private final ArrayList<Runnable> queuedTasks;
    private final ThreadPoolExecutor executor;
@@ -48,16 +42,14 @@ public class TelegramStickersService {
    private TelegramStickersService(Context context) {
        instance = this;

-        this.c = context.getApplicationContext();
-
        listeners = new ArrayList<>();
        currentlyDownloading = new HashSet<>();
        uiThreadHandler = new Handler(Looper.getMainLooper());
        grabber = new TelegramStickersGrabber(null);
-        dbHelper = new TelegramStickersDbHelper(c);
+        dbHelper = new TelegramStickersDbHelper(context);
        queuedTasks = new ArrayList<>();
        executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(2);
-        notificationsHelper = new NotificationsHelper(c);
+        notificationsHelper = new NotificationsHelper(context);

        packs = new ArrayList<>();
        activePacks = new ArrayList<>();
@@ -70,11 +62,11 @@ public class TelegramStickersService {
        return instance == null ? new TelegramStickersService(c) : instance;
    }

-    private void updatePacks(final boolean notify) {
+    private void updatePacks(boolean notify) {
        packs.clear();
        dbHelper.getAllPacks(new TelegramStickersDbHelper.PacksLoadingListener() {
            @Override
-            public void onPackLoaded(final TelegramStickersPack pack) {
+            public void onPackLoaded(TelegramStickersPack pack) {
                runOnUiThread(() -> {
                    packs.add(pack);

@@ -103,14 +95,6 @@ public class TelegramStickersService {
        });
    }

-    public void addStickersEventsListener(StickersEventsListener listener) {
-        listeners.add(listener);
-    }
-
-    public void removeStickersEventsListener(StickersEventsListener listener) {
-        listeners.remove(listener);
-    }
-
    private void notifyPackAdded(TelegramStickersPack pack, int atIndex) {
        getGlobalContext().sendBroadcast(new Intent(StickersFragment.ACTION_RELOAD));
        if (listeners.isEmpty())
@@ -188,20 +172,16 @@ public class TelegramStickersService {
        return inactivePacks;
    }

-    public boolean isDoneLoading() {
-        return ready;
-    }
-
-    public boolean requestPackDownload(final String id, File packFolder) {
+    public void requestPackDownload(String id, File packFolder) {
        if (currentlyDownloading.contains(id)) {
            Log.e(TAG, String.format("Got request to download pack %s which is already downloading", id));
-            return false;
+            return;
        }

        if (!ready) {
-            final File folder = packFolder;
+            File folder = packFolder;
            queuedTasks.add(() -> requestPackDownload(id, folder));
-            return true;
+            return;
        }

        TelegramStickersPack pack = new TelegramStickersPack(id);
@@ -221,85 +201,86 @@ public class TelegramStickersService {
            notifyPackAdded(pack, packs.size() - 1);
        }

-        final TelegramStickersPack newPack = pack;
-        final boolean isUpdate = update;
+        TelegramStickersPack newPack = pack;
+        boolean isUpdate = update;

        currentlyDownloading.add(id);
        notificationsHelper.packStartedDownloading(newPack);

-
-        grabber.enableProxy();
-        grabber.grabPack(id, packFolder, pack.version, new TelegramStickersGrabber.PackDownloadListener() {
-            @Override
-            public void onPackDownloaded(TelegramStickersPackInfo packInfo, boolean newVersionFound) {
-
-                runOnUiThread(() -> {
-                    newPack.state = TelegramStickersPack.DOWNLOADED;
-                    notifyPackChanged(newPack, packs.indexOf(newPack));
-                    currentlyDownloading.remove(newPack.id);
-                    syncPack(newPack);
-
-                    if (isUpdate) {
-                        if (newPack.enabled)
-                            notifyActivePacksListChanged();
-                    } else {
-                        activePacks.add(newPack);
-                        notifyActivePacksListChanged();
-                    }
-                });
-                notificationsHelper.packDoneDownloading(newPack, true, isUpdate, null);
-            }
-
-            @Override
-            public void onPackDownloadError(final Exception e) {
-                runOnUiThread(() -> {
-                    Log.e(TAG, "Error while downloading pack " + newPack.id);
-                    e.printStackTrace();
-
-                    if (!isUpdate) {
-                        int index = packs.indexOf(newPack);
-                        packs.remove(index);
-                        notifyPackRemoved(newPack, index);
-                    } else {
+        // try-catch block to handle possible timeout exception
+        try {
+            grabber.grabPack(id, packFolder, pack.version, new TelegramStickersGrabber.PackDownloadListener() {
+                @Override
+                public void onPackDownloaded(TelegramStickersPackInfo packInfo, boolean newVersionFound) {
+                    runOnUiThread(() -> {
                        newPack.state = TelegramStickersPack.DOWNLOADED;
                        notifyPackChanged(newPack, packs.indexOf(newPack));
-                    }
+                        currentlyDownloading.remove(newPack.id);
+                        syncPack(newPack);

-                    notifyPackDownloadError(newPack, e);
-                    currentlyDownloading.remove(newPack.id);
-                });
-                notificationsHelper.packDoneDownloading(newPack, false, isUpdate, e);
-            }
+                        if (isUpdate) {
+                            if (newPack.enabled)
+                                notifyActivePacksListChanged();
+                        } else {
+                            activePacks.add(newPack);
+                            notifyActivePacksListChanged();
+                        }
+                    });
+                    notificationsHelper.packDoneDownloading(newPack, true, isUpdate, null);
+                }

-            @Override
-            public void onGotPackInfo(final TelegramStickersPackInfo packInfo) {
-                runOnUiThread(() -> {
-                    newPack.title = packInfo.title;
-                    newPack.stickersCount = packInfo.stickersCount;
-                    newPack.version = packInfo.version;
-                    notifyPackChanged(newPack, packs.indexOf(newPack));
-                });
+                @Override
+                public void onPackDownloadError(Exception e) {
+                    runOnUiThread(() -> {
+                        Log.e(TAG, "Error while downloading pack " + newPack.id);
+                        e.printStackTrace();

-                notificationsHelper.packDownloadUpdated(newPack, 0);
-            }
+                        if (!isUpdate) {
+                            int index = packs.indexOf(newPack);
+                            packs.remove(index);
+                            notifyPackRemoved(newPack, index);
+                        } else {
+                            newPack.state = TelegramStickersPack.DOWNLOADED;
+                            notifyPackChanged(newPack, packs.indexOf(newPack));
+                        }

-            @Override
-            public void onStickerDownloaded(String pack, File sticker, String boundEmoji, int stickerIndex, int downloadedStickersCount, int totalStickersCount) {
-                stickerIndex--;
+                        notifyPackDownloadError(newPack, e);
+                        currentlyDownloading.remove(newPack.id);
+                    });
+                    notificationsHelper.packDoneDownloading(newPack, false, isUpdate, e);
+                }

-                List<Integer> list = newPack.emojis.get(boundEmoji);
-                if (list == null) list = new ArrayList<>();
-                list.add(stickerIndex);
-                newPack.emojis.put(boundEmoji, list);
+                @Override
+                public void onGotPackInfo(TelegramStickersPackInfo packInfo) {
+                    runOnUiThread(() -> {
+                        newPack.title = packInfo.title;
+                        newPack.stickersCount = packInfo.stickersCount;
+                        newPack.version = packInfo.version;
+                        notifyPackChanged(newPack, packs.indexOf(newPack));
+                    });

-                notificationsHelper.packDownloadUpdated(newPack, downloadedStickersCount);
-            }
-        });
+                    notificationsHelper.packDownloadUpdated(newPack, 0);
+                }

-        return true;
+                @Override
+                public void onStickerDownloaded(String pack, File sticker, String boundEmoji, int stickerIndex, int downloadedStickersCount, int totalStickersCount) {
+                    stickerIndex--;
+
+                    List<Integer> list = newPack.emojis.get(boundEmoji);
+                    if (list == null) list = new ArrayList<>();
+                    list.add(stickerIndex);
+                    newPack.emojis.put(boundEmoji, list);
+
+                    notificationsHelper.packDownloadUpdated(newPack, downloadedStickersCount);
+                }
+            });
+        } catch (Exception e) {
+            // handle other possible exceptions
+            e.printStackTrace();
+        }
    }

-    public void setPackEnabled(final TelegramStickersPack pack, final boolean enabled, final boolean notify) {
+    public void setPackEnabled(TelegramStickersPack pack, boolean enabled, boolean notify) {
        if (!ready) {
            queuedTasks.add(() -> setPackEnabled(pack, enabled, notify));
            return;
@@ -325,7 +306,7 @@ public class TelegramStickersService {
        }
    }

-    public void deletePack(final TelegramStickersPack pack) {
+    public void deletePack(TelegramStickersPack pack) {
        if (!ready) {
            queuedTasks.add(() -> deletePack(pack));
            return;
@@ -334,7 +315,6 @@ public class TelegramStickersService {
        boolean d = dbHelper.deletePack(pack);
        Log.d(TAG, "Delete from DB=" + d);

-
        int index = packs.indexOf(pack);
        packs.remove(index);
        notifyPackRemoved(pack, index);
@@ -355,7 +335,7 @@ public class TelegramStickersService {
        uiThreadHandler.post(r);
    }

-    private void syncPack(final TelegramStickersPack pack) {
+    private void syncPack(TelegramStickersPack pack) {
        if (!ready) {
            queuedTasks.add(() -> syncPack(pack));
            return;
@@ -397,6 +377,4 @@ public class TelegramStickersService {

        void onInactivePacksListChanged();
    }
-
-
 }
@@ -7,23 +7,20 @@ import android.os.Looper;
 import android.util.Log;
 import com.aefyr.tsg.g2.stickersgrabber.util.Flag;
 import com.aefyr.tsg.g2.stickersgrabber.util.GoalCounter;
+import okhttp3.*;
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
-import ru.vtosters.lite.net.*;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;

 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.PasswordAuthentication;
-import java.net.Proxy;
-import java.net.Socket;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;

 /**
@@ -31,14 +28,19 @@ import java.util.concurrent.atomic.AtomicInteger;
 */
 public class TelegramStickersGrabber {
    private static final String TAG = "TSG";
-    public static String REAL_TG_IP = null;
-    public static String PROXY_IP = null;
-    public static int PROXY_PORT = -1;
-    public static String PROXY_USER = null;
-    public static String PROXY_PASS = null;
-    public static boolean PROXY_SOCKS = true;
-    public static boolean HAS_PASS = false;
-    public static boolean USE_PROXY = false;
+    private static final OkHttpClient sClient = VtOkHttpClient.getInstance();
+    private static final int MAX_RETRIES = 2;
+    private static final AtomicInteger retryCount = new AtomicInteger();
+    private static final int STICKER_QUALITY = 100;
+    private static final String STICKER_FILE_NAME_FORMAT = "%03d.png";
+    private static final String STICKERS_KEY = "stickers";
+    private static final String FILE_ID_KEY = "file_id";
+    private static final String EMOJI_KEY = "emoji";
+    private static final String IS_ANIMATED_KEY = "is_animated";
+    private static final String IS_VIDEO_KEY = "is_video";
+    private static final String THUMB_KEY = "thumb";
+    private static final String NAME_KEY = "name";
+    private static final String TITLE_KEY = "title";
    private static String BOT_API_BASE_URL;
    private static String GET_STICKER_SET_URL;
    private static String GET_FILE_URL;
@@ -50,12 +52,10 @@ public class TelegramStickersGrabber {

    private final MessageDigest sha256;
    private final Handler uiThreadHandler;
-    private String botApiKey = "";
-    private NetClient httpClient;
+    private String botApiKey;

    public TelegramStickersGrabber(String botApiKey) {
        this.botApiKey = botApiKey;
-        httpClient = new NetClient.Builder().connectTimeout(5, TimeUnit.SECONDS).build();
        uiThreadHandler = new Handler(Looper.getMainLooper());
        try {
            sha256 = MessageDigest.getInstance("SHA-256");
@@ -69,81 +69,12 @@ public class TelegramStickersGrabber {
    public static void updateURLs() {
        BOT_API_BASE_FILE_URL = "https://api.telegram.org/file/bot%s/%s";

-
-        BOT_API_BASE_URL = REAL_TG_IP != null ? "https://" + REAL_TG_IP + "/bot%s/" : "https://api.telegram.org/bot%s/";
+        BOT_API_BASE_URL = "https://api.telegram.org/bot%s/";
        GET_STICKER_SET_URL = BOT_API_BASE_URL + "getStickerSet?name=%s";
        GET_FILE_URL = BOT_API_BASE_URL + "getFile?file_id=%s";
    }

-    public static boolean isTelegramBlocked() {
-        NetClient client = new NetClient.Builder().connectTimeout(5, TimeUnit.SECONDS).build();
-        try {
-            if (PROXY_IP != null) {
-                Socket socket = new Socket(PROXY_IP, PROXY_PORT);
-                Proxy proxy = new Proxy(Proxy.Type.SOCKS, socket.getRemoteSocketAddress());
-                NetClient.Builder b = new NetClient.Builder().proxy(proxy);
-                if (PROXY_USER != null) {
-                    b = b.proxyAuthenticator(new PasswordAuthentication(PROXY_USER, PROXY_PASS.toCharArray()));
-                }
-                client = b.build();
-                socket.close();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        NetRequest req = new NetRequest.Builder().url(REAL_TG_IP != null ? "https://" + REAL_TG_IP + "/test/" : "https://api.telegram.org/test/").build();
-        try {
-            NetResponse res = client.newCall(req).execute();
-            String s = res.getDataString();
-
-            if (!s.equals("{\"ok\":false,\"error_code\":404,\"description\":\"Not Found\"}"))
-                return true;
-        } catch (Exception e) {
-            return true;
-        }
-        return false;
-    }
-
-    public void resetProxy() {
-        httpClient = new NetClient.Builder().connectTimeout(5, TimeUnit.SECONDS).build();
-    }
-
-    public void enableProxy() {
-        Thread kostil = new Thread() {
-            @Override
-            public void run() {
-                try {
-                    if (PROXY_IP != null) {
-                        Socket socket = new Socket(PROXY_IP, PROXY_PORT);
-                        Proxy proxy = new Proxy(Proxy.Type.SOCKS, socket.getRemoteSocketAddress());
-                        NetClient.Builder b = httpClient.newBuilder().proxy(proxy);
-
-                        if (PROXY_USER != null) {
-                            httpClient = b.proxyAuthenticator(new PasswordAuthentication(PROXY_USER, PROXY_PASS.toCharArray())).build();
-                        }
-
-                        httpClient = b.build();
-                        socket.close();
-                    }
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        };
-
-        kostil.start();
-        try {
-            kostil.join();
-            Log.d(TAG, "Proxy set");
-        } catch (InterruptedException e) {
-            Log.e(TAG, "Unable to set proxy:");
-            e.printStackTrace();
-
-        }
-    }
-
-    public void grabPack(String id, File packFolder, String installedVersion, final PackDownloadListener listener) {
+    public void grabPack(String id, File packFolder, String installedVersion, PackDownloadListener listener) {
        getPackInfo(id, packFolder, installedVersion, listener);
    }

@@ -151,264 +82,247 @@ public class TelegramStickersGrabber {
        botApiKey = key;
    }

-    public void checkKey(final KeyCheckListener listener) {
+    public void checkKey(KeyCheckListener listener) {
        Log.d(TAG, "Checking key: " + botApiKey);
-        NetRequest request = new NetRequest.Builder().get().url(String.format(BOT_API_BASE_URL + "getMe", botApiKey)).build();
-        httpClient.newCall(request).enqueue(new NetCallback() {
+        // Create a request object with the URL and bot API key
+        Request request = new Request.a()
+                .b(String.format(BOT_API_BASE_URL + "getMe", botApiKey))
+                .a();
+        // Create a new call object and enqueue it to run asynchronously
+        sClient.a(request).a(new Callback() {
            @Override
-            public void onFailure(NetCall call, IOException e) {
-                e.printStackTrace();
+            public void a(Call call, IOException e) {
+                // Handle the failure case
+                Log.d(TAG, e.getMessage());
                runOnUiThread(listener::onNetError);
            }

            @Override
-            public void onResponse(NetCall call, final NetResponse response) throws IOException {
-                runOnUiThread(() -> listener.onKeyChecked(response.code() == 200));
+            public void a(Call call, Response response) {
+                Log.d(TAG, response.toString());
+                runOnUiThread(() -> listener.onKeyChecked(response.h()));
            }
        });
    }

-    private void getPackInfo(final String packName, final File packFolder, final String installedVersion, final PackDownloadListener listener) {
-        NetRequest packInfoRequest = new NetRequest.Builder().get().url(String.format(GET_STICKER_SET_URL, botApiKey, packName)).build();
-        httpClient.newCall(packInfoRequest).enqueue(new NetCallback() {
+    private void getPack(StickerSet set, File packFolder, TelegramStickersPackInfo packInfo, PackDownloadListener listener) {
+        GoalCounter downloadedStickers = new GoalCounter(set.stickers.size(), () -> {
+            Log.d(TAG, String.format("Pack %s has been downloaded to %s", set.id, packFolder.getAbsolutePath()));
+            listener.onPackDownloaded(packInfo, true);
+        });
+
+        Flag deathFlag = new Flag();
+
+        for (int i = 0; i < set.stickers.size(); i++) {
+            Sticker sticker = set.stickers.get(i);
+            String getFileUrl = String.format(GET_FILE_URL, botApiKey, sticker.fileId);
+            Request fileInfoRequest = new Request.a()
+                    .b(getFileUrl)
+                    .a();
+
+            int stickerIndex = i + 1;
+
+            sClient.a(fileInfoRequest).a(new Callback() {
+                @Override
+                public void a(Call call, IOException e) {
+                    handleFailure(deathFlag, listener, e, downloadedStickers, call, fileInfoRequest, this);
+                }
+
+                @Override
+                public void a(Call call, Response response) {
+                    if (deathFlag.up())
+                        return;
+
+                    if (!response.h()) {
+                        retryRequest(call, fileInfoRequest, this);
+                        return;
+                    }
+
+                    try (ResponseBody responseBody = response.a()) {
+                        JSONObject fileInfoResponse = new JSONObject(responseBody.g()).getJSONObject("result");
+                        String filePath = fileInfoResponse.getString("file_path");
+
+                        if (botApiKey == null) botApiKey = "";
+
+                        String fileDownloadUrl = String.format(BOT_API_BASE_FILE_URL, botApiKey, filePath);
+                        Request fileDownloadRequest = new Request.a()
+                                .b(fileDownloadUrl)
+                                .a();
+
+                        sClient.a(fileDownloadRequest).a(new Callback() {
+                            @Override
+                            public void a(Call call, IOException e) {
+                                handleFailure(deathFlag, listener, e, downloadedStickers, call, fileDownloadRequest, this);
+                            }
+
+                            @Override
+                            public void a(Call call, Response response) {
+                                if (deathFlag.up())
+                                    return;
+
+                                if (!response.h()) {
+                                    retryRequest(call, fileDownloadRequest, this);
+                                    return;
+                                }
+
+                                try (ResponseBody responseBody = response.a()) {
+                                    if (responseBody == null) {
+                                        handleFailure(deathFlag, listener, new TSGException("Response body for a sticker is null :/"), downloadedStickers, call, fileDownloadRequest, this);
+                                        return;
+                                    }
+
+                                    InputStream stickerInputStream = responseBody.a();
+                                    Bitmap stickerImage = BitmapFactory.decodeStream(stickerInputStream);
+
+                                    if (stickerImage == null) {
+                                        handleFailure(deathFlag, listener, new TSGException("Unable to decode sticker image"), downloadedStickers, call, fileDownloadRequest, this);
+                                        return;
+                                    }
+
+                                    File stickerFile = new File(packFolder, String.format(STICKER_FILE_NAME_FORMAT, stickerIndex));
+
+                                    try {
+                                        saveStickerImage(stickerImage, stickerFile);
+                                    } catch (TSGException e) {
+                                        throw new RuntimeException(e);
+                                    }
+
+                                    listener.onStickerDownloaded(set.name, stickerFile, sticker.emoji, stickerIndex,
+                                            downloadedStickers.value() + 1, set.stickers.size());
+                                    downloadedStickers.increase();
+                                }
+                            }
+                        });
+                    } catch (Exception e) {
+                        handleFailure(deathFlag, listener, e, downloadedStickers, call, fileInfoRequest, this);
+                    }
+                }
+            });
+        }
+    }
+
+    private void handleFailure(Flag deathFlag, PackDownloadListener listener, Exception e, GoalCounter downloadedStickers, Call call, Request request, Callback callback) {
+        if ((e instanceof IOException || e instanceof TSGException) && retryCount.get() > MAX_RETRIES) {
+            Log.e(TAG, "Unable to download sticker: " + e.getMessage());
+            downloadedStickers.increase();
+            return;
+        } else if (retryCount.get() < MAX_RETRIES) {
+            retryRequest(call, request, callback);
+            return;
+        }
+
+        if (deathFlag.up()) {
+            return;
+        }
+
+        deathFlag.raise();
+        listener.onPackDownloadError(e);
+    }
+
+    private void retryRequest(Call call, Request request, Callback callback) {
+        retryCount.incrementAndGet();
+
+        if (retryCount.get() > MAX_RETRIES) {
+            Log.e(TAG, "retryRequest: max retries");
+            callback.a(call, new IOException());
+        } else {
+            Log.e(TAG, "retryRequest");
+            sClient.a(request).a(callback);
+        }
+    }
+
+    private void saveStickerImage(Bitmap image, File file) throws TSGException {
+        try (FileOutputStream fos = new FileOutputStream(file)) {
+            image.compress(Bitmap.CompressFormat.PNG, 100, fos);
+        } catch (IOException e) {
+            throw new TSGException("Unable to save sticker image");
+        }
+    }
+
+    private void getPackInfo(String packName, File packFolder, String installedVersion, PackDownloadListener listener) {
+        String getStickerSetUrl = String.format(GET_STICKER_SET_URL, botApiKey, packName);
+        Request packInfoRequest = new Request.a()
+                .b(getStickerSetUrl)
+                .a();
+        sClient.a(packInfoRequest).a(new Callback() {
            @Override
-            public void onFailure(NetCall call, IOException e) {
+            public void a(Call call, IOException e) {
+                Log.d(TAG, e.getMessage());
                listener.onPackDownloadError(e);
            }

            @Override
-            public void onResponse(NetCall call, NetResponse response) {
-                if (!response.isSuccessful()) {
-                    if (response.getData() != null)
-                        listener.onPackDownloadError(new TSGException(response.getDataString() + "\nURL: " + call.request().url()));
-                    else
-                        listener.onPackDownloadError(new TSGException("Unknown Exception, no response body"));
+            public void a(Call call, Response response) throws IOException {
+                Log.d(TAG, response.toString());

+                if (!response.h()) {
+                    String errorMessage = response.a() != null ? response.a().g() + "\nURL: " + call.m0().g() : "Unknown Exception, no response body";
+                    listener.onPackDownloadError(new TSGException(errorMessage));
                    return;
                }

-                StickerSet set;
-                try {
-                    JSONObject jPackInfo = new JSONObject(response.getDataString()).getJSONObject("result");
-                    String packVersion = new String(sha256.digest(jPackInfo.toString().getBytes(StandardCharsets.UTF_8)));
+                try (ResponseBody responseBody = response.a()) {
+                    JSONObject packInfoResponse = new JSONObject(responseBody.g()).getJSONObject("result");
+                    String packVersion = new String(sha256.digest(packInfoResponse.toString().getBytes(StandardCharsets.UTF_8)));

                    if (packVersion.equals(installedVersion)) {
                        listener.onPackDownloaded(null, false);
                        return;
                    }

-                    JSONArray jStickers = jPackInfo.getJSONArray("stickers");
+                    JSONArray stickersArray = packInfoResponse.getJSONArray(STICKERS_KEY);

-                    if (jStickers.length() == 0) {
+                    if (stickersArray.length() == 0) {
                        listener.onPackDownloadError(new TSGException("No stickers in pack"));
                        return;
                    }

-                    ArrayList<Sticker> stickers = new ArrayList<>(jStickers.length());
+                    ArrayList<Sticker> stickers = parseStickers(stickersArray);

-                    Log.d(TAG, String.format("Parsing stickers in pack %s", packName));
+                    StickerSet set = new StickerSet(packInfoResponse.getString(NAME_KEY), packInfoResponse.getString(TITLE_KEY), packVersion, stickers);

-                    for (int i = 0; i < jStickers.length(); i++) {
-                        JSONObject jSticker = jStickers.getJSONObject(i);
-                        if (jSticker.optBoolean("is_animated") || jSticker.optBoolean("is_video")) {
-                            if (jSticker.has("thumb")) {
-                                stickers.add(new Sticker(jSticker.getJSONObject("thumb").getString("file_id"), jSticker.getString("emoji")));
-                            } else {
-                                listener.onPackDownloadError(new TSGException("Animated and video stickerpacks without thumbs are not supported!"));
-                                return;
-                            }
-                        } else {
-                            stickers.add(new Sticker(jSticker.getString("file_id"), jSticker.getString("emoji")));
-                        }
+                    if (!packFolder.exists() && !packFolder.mkdirs()) {
+                        // Handle the folder creation failure case
+                        listener.onPackDownloadError(new IOException("Can't create folder for the pack!"));
+                        return;
                    }

-                    set = new StickerSet(jPackInfo.getString("name"), jPackInfo.getString("title"), packVersion, stickers);
+                    Log.d(TAG, String.format("Got info for pack %s, now downloading stickers to %s", packName, packFolder.getAbsolutePath()));
+
+                    TelegramStickersPackInfo packInfo = new TelegramStickersPackInfo(packName, set.name, set.stickers.size(), set.version);
+
+                    listener.onGotPackInfo(packInfo);
+
+                    getPack(set, packFolder, packInfo, listener);
                } catch (Exception e) {
                    listener.onPackDownloadError(e);
-                    return;
                }
-
-                if (!packFolder.exists() && !packFolder.mkdirs()) {
-                    listener.onPackDownloadError(new IOException("Can't create folder for the pack!"));
-                    return;
-                }
-
-                Log.d(TAG, String.format("Got info for pack %s, now downloading stickers to %s", packName, packFolder.getAbsolutePath()));
-
-                TelegramStickersPackInfo packInfo = new TelegramStickersPackInfo(packName, set.name, set.stickers.size(), set.version);
-                listener.onGotPackInfo(packInfo);
-                getPack(set, packFolder, packInfo, listener);
            }
        });
    }

-    private void getPack(final StickerSet set, final File packFolder, final TelegramStickersPackInfo packInfo, final PackDownloadListener listener) {
-        final GoalCounter downloadedStickers = new GoalCounter(set.stickers.size(), () -> {
-            Log.d(TAG, String.format("Pack %s has been downloaded to %s", set.id, packFolder.getAbsolutePath()));
+    private ArrayList<Sticker> parseStickers(JSONArray stickersArray) throws JSONException, TSGException {
+        ArrayList<Sticker> stickers = new ArrayList<>(stickersArray.length());

-            listener.onPackDownloaded(packInfo, true);
-        });
-        final Flag deathFlag = new Flag();
+        for (int i = 0; i < stickersArray.length(); i++) {
+            JSONObject stickerObject = stickersArray.getJSONObject(i);
+            boolean isAnimated = stickerObject.optBoolean(IS_ANIMATED_KEY);
+            boolean isVideo = stickerObject.optBoolean(IS_VIDEO_KEY);
+            String fileId = stickerObject.getString(FILE_ID_KEY);
+            String emoji = stickerObject.getString(EMOJI_KEY);

-        AtomicInteger retryed = new AtomicInteger();
-        for (int i = 0; i < set.stickers.size(); i++) {
-            final Sticker sticker = set.stickers.get(i);
-            NetRequest fileInfoRequest = new NetRequest.Builder().get().url(String.format(GET_FILE_URL, botApiKey, sticker.fileId)).build();
-
-            final int stickerIndex = i + 1;
-
-            AtomicBoolean sync = new AtomicBoolean();
-            httpClient.newCall(fileInfoRequest).enqueue(new NetCallback() {
-                @Override
-                public void onFailure(NetCall call, IOException e) {
-                    if (deathFlag.up())
-                        return;
-
-                    deathFlag.raise();
-                    listener.onPackDownloadError(e);
-
-                    sync.set(true);
+            if (isAnimated || isVideo) {
+                if (stickerObject.has(THUMB_KEY)) {
+                    fileId = stickerObject.getJSONObject(THUMB_KEY).getString(FILE_ID_KEY);
+                } else {
+                    throw new TSGException("Animated and video stickerpacks without thumbs are not supported!");
                }
+            }

-                @Override
-                public void onResponse(NetCall call, NetResponse response) throws IOException {
-                    if (deathFlag.up())
-                        return;
-
-                    if (response.code() != 200) {
-                        retryed.incrementAndGet();
-
-                        if (retryed.get() > 5)
-                            onFailure(call, new IOException());
-                        else httpClient.newCall(fileInfoRequest)
-                                .enqueue(this);
-
-                        return;
-                    }
-
-                    String filePath;
-                    try {
-                        JSONObject jFileInfo = new JSONObject(response.getDataString()).getJSONObject("result");
-                        filePath = jFileInfo.getString("file_path");
-                    } catch (Exception e) {
-                        deathFlag.raise();
-                        listener.onPackDownloadError(e);
-                        sync.set(true);
-                        return;
-                    }
-
-                    if (botApiKey == null) botApiKey = "";
-
-                    NetRequest fileDownloadRequest = new NetRequest.Builder().get().url(String.format(BOT_API_BASE_FILE_URL, botApiKey, filePath)).build();
-
-                    httpClient.newCall(fileDownloadRequest).enqueue(new NetCallback() {
-                        @Override
-                        public void onFailure(NetCall call, IOException e) {
-                            if (deathFlag.up())
-                                return;
-
-                            deathFlag.raise();
-                            listener.onPackDownloadError(e);
-
-                            sync.set(true);
-                        }
-
-                        @Override
-                        public void onResponse(NetCall call, NetResponse response) throws IOException {
-                            if (deathFlag.up())
-                                return;
-
-                            if (response.code() != 200) {
-                                retryed.incrementAndGet();
-
-                                if (retryed.get() > 5)
-                                    onFailure(call, new IOException());
-                                else httpClient.newCall(fileDownloadRequest)
-                                        .enqueue(this);
-
-                                return;
-                            }
-
-                            if (response.getData() == null) {
-                                deathFlag.raise();
-                                listener.onPackDownloadError(new TSGException("Response body for a sticker is null :/"));
-                                sync.set(true);
-                                return;
-                            }
-
-                            InputStream stickerInputStream = response.getDataStream();
-
-                            Bitmap stickerImage = BitmapFactory.decodeStream(stickerInputStream);
-
-                            try {
-                                stickerInputStream.close();
-                            } catch (IOException e) {
-                                e.printStackTrace();
-
-                                deathFlag.raise();
-                                listener.onPackDownloadError(e);
-                                sync.set(true);
-                                return;
-                            }
-
-                            if (stickerImage == null) {
-                                deathFlag.raise();
-                                listener.onPackDownloadError(new TSGException("Unable to decode sticker image"));
-                                sync.set(true);
-                                return;
-                            }
-
-                            File stickerFile = new File(packFolder, String.format("%03d.png", stickerIndex));
-
-                            FileOutputStream fileOutputStream;
-                            try {
-                                fileOutputStream = new FileOutputStream(stickerFile);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-
-                                deathFlag.raise();
-                                listener.onPackDownloadError(e);
-                                sync.set(true);
-                                return;
-                            }
-
-                            if (!stickerImage.compress(Bitmap.CompressFormat.PNG, 100, fileOutputStream)) {
-                                stickerImage.recycle();
-                                deathFlag.raise();
-                                listener.onPackDownloadError(new TSGException("Unable to compress sticker to a png file at path: " + stickerFile.getAbsolutePath()));
-                                sync.set(true);
-                                return;
-                            }
-
-                            stickerImage.recycle();
-
-                            try {
-                                fileOutputStream.close();
-                            } catch (IOException e) {
-                                e.printStackTrace();
-
-                                deathFlag.raise();
-                                listener.onPackDownloadError(e);
-                                sync.set(true);
-                                return;
-                            }
-
-
-                            listener.onStickerDownloaded(set.name, stickerFile, sticker.emoji, stickerIndex, downloadedStickers.value() + 1, set.stickers.size());
-                            downloadedStickers.increase();
-
-                            sync.set(true);
-                        }
-                    });
-                }
-            });
-
-            while (!sync.get())
-                try {
-                    Thread.sleep(100);
-                } catch (InterruptedException e1) {
-                }
+            stickers.add(new Sticker(fileId, emoji));
        }
+
+        return stickers;
    }

    private void runOnUiThread(Runnable r) {
@@ -431,15 +345,13 @@ public class TelegramStickersGrabber {
        void onNetError();
    }

-    public class TSGException extends Exception {
-        private static final long serialVersionUID = 7866915509988422944L;
-
+    public static class TSGException extends Exception {
        private TSGException(String message) {
            super(message);
        }
    }

-    private class StickerSet {
+    private static class StickerSet {
        String id;
        String name;
        String version;
@@ -453,7 +365,7 @@ public class TelegramStickersGrabber {
        }
    }

-    private class Sticker {
+    private static class Sticker {
        String emoji;
        String fileId;

@@ -1,124 +0,0 @@
-package com.arthenica.ffmpegkit;
-
-import android.os.Build;
-import android.util.Log;
-import com.arthenica.smartexception.java.Exceptions;
-
-import java.util.Collections;
-import java.util.List;
-
-public class NativeLoader {
-    static final String[] FFMPEG_LIBRARIES = {"avutil", "swresample", "avcodec", "avformat", "avfilter", "avdevice"};
-
-    private static void loadLibrary(String libraryName) {
-        System.loadLibrary(libraryName);
-    }
-
-    private static List<String> loadExternalLibraries() {
-        //return Packages.getExternalLibraries();
-        return Collections.emptyList();
-    }
-
-    private static String loadNativeAbi() {
-        return AbiDetect.getNativeAbi();
-    }
-
-    static String loadAbi() {
-        return AbiDetect.getAbi();
-    }
-
-    static String loadPackageName() {
-        return Packages.getPackageName();
-    }
-
-    static String loadVersion() {
-        return FFmpegKitConfig.getVersion();
-    }
-
-    static boolean loadIsLTSBuild() {
-        return AbiDetect.isNativeLTSBuild();
-    }
-
-    static int loadLogLevel() {
-        return FFmpegKitConfig.getNativeLogLevel();
-    }
-
-    static String loadBuildDate() {
-        return FFmpegKitConfig.getBuildDate();
-    }
-
-    static void enableRedirection() {
-        FFmpegKitConfig.enableRedirection();
-    }
-
-    static void loadFFmpegKitAbiDetect() {
-        loadLibrary("ffmpegkit_abidetect");
-    }
-
-    static boolean loadFFmpeg() {
-        boolean nativeFFmpegLoaded = false;
-        boolean nativeFFmpegTriedAndFailed = false;
-
-        if (AbiDetect.ARM_V7A.equals(loadNativeAbi())) {
-            try {
-                for (String ffmpegLibrary : FFMPEG_LIBRARIES) {
-                    loadLibrary(ffmpegLibrary + "_neon");
-                }
-                nativeFFmpegLoaded = true;
-            } catch (final Error e) {
-                android.util.Log.i(FFmpegKitConfig.TAG, String.format("NEON supported armeabi-v7a ffmpeg library not found. Loading default armeabi-v7a library.%s", Exceptions.getStackTraceString(e)));
-                nativeFFmpegTriedAndFailed = true;
-            }
-        }
-
-        if (!nativeFFmpegLoaded) {
-            for (String ffmpegLibrary : FFMPEG_LIBRARIES) {
-                loadLibrary(ffmpegLibrary);
-            }
-        }
-        return nativeFFmpegTriedAndFailed;
-    }
-
-    static void loadFFmpegKit(boolean nativeFFmpegTriedAndFailed) {
-        boolean nativeFFmpegKitLoaded = false;
-        if (!nativeFFmpegTriedAndFailed && "arm-v7a".equals(loadNativeAbi())) {
-            try {
-                loadLibrary("ffmpegkit_armv7a_neon");
-                nativeFFmpegKitLoaded = true;
-                AbiDetect.setArmV7aNeonLoaded();
-            } catch (Error e) {
-                Log.i("ffmpeg-kit", String.format("NEON supported armeabi-v7a ffmpegkit library not found. Loading default armeabi-v7a library.%s", Exceptions.getStackTraceString(e)));
-            }
-        }
-        if (!nativeFFmpegKitLoaded) {
-            loadLibrary("ffmpegkit");
-        }
-    }
-
-
-    static String getDeviceDebugInformation() {
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append("brand: ");
-        stringBuilder.append(Build.BRAND);
-        stringBuilder.append(", model: ");
-        stringBuilder.append(Build.MODEL);
-        stringBuilder.append(", device: ");
-        stringBuilder.append(Build.DEVICE);
-        stringBuilder.append(", api level: ");
-        stringBuilder.append(Build.VERSION.SDK_INT);
-        if (Build.VERSION.SDK_INT >= 21) {
-            stringBuilder.append(", abis: ");
-            stringBuilder.append(FFmpegKitConfig.argumentsToString(Build.SUPPORTED_ABIS));
-            stringBuilder.append(", 32bit abis: ");
-            stringBuilder.append(FFmpegKitConfig.argumentsToString(Build.SUPPORTED_32_BIT_ABIS));
-            stringBuilder.append(", 64bit abis: ");
-            stringBuilder.append(FFmpegKitConfig.argumentsToString(Build.SUPPORTED_64_BIT_ABIS));
-        } else {
-            stringBuilder.append(", cpu abis: ");
-            stringBuilder.append(Build.CPU_ABI);
-            stringBuilder.append(", cpu abi2s: ");
-            stringBuilder.append(Build.CPU_ABI2);
-        }
-        return stringBuilder.toString();
-    }
-}
@@ -1,732 +0,0 @@
-/*
- * BSD 3-Clause License
- *
- * Copyright (c) 2020, Taner Sener
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.arthenica.smartexception;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * <p>Abstract class that includes common variables and methods for different <code>Exceptions</code> implementations.
- *
- * @author Taner Sener
- * @since 0.1.0
- */
-public abstract class AbstractExceptions {
-
-    /**
-     * <p>Default max depth used in methods which do not have a maxDepth argument.
-     */
-    public static final int DEFAULT_MAX_DEPTH = 10;
-
-    /**
-     * <p>Default value for ignoring all causes when stack trace elements are printed or converted to string.
-     */
-    public static final boolean DEFAULT_IGNORE_ALL_CAUSES = false;
-
-    /**
-     * <p>Stores global root package names.
-     */
-    public static final Set<String> rootPackageSet = Collections.synchronizedSet(new HashSet<String>());
-
-    /**
-     * <p>Stores global group package names.
-     */
-    public static final Set<String> groupPackageSet = Collections.synchronizedSet(new HashSet<String>());
-
-    /**
-     * <p>Stores global ignore package names.
-     */
-    public static final Set<String> ignorePackageSet = Collections.synchronizedSet(new HashSet<String>());
-
-    /**
-     * <p>Stores global ignore cause package names.
-     */
-    public static final Set<String> ignoreCausePackageSet = Collections.synchronizedSet(new HashSet<String>());
-
-    /**
-     * <p>Stores the value of global ignore all causes option.
-     */
-    public static boolean ignoreAllCauses = DEFAULT_IGNORE_ALL_CAUSES;
-
-    /**
-     * <p>Stores the global stack trace serializer implementation.
-     */
-    public static StackTraceElementSerializer stackTraceElementSerializer;
-
-    /**
-     * <p>Registers a new root package.
-     *
-     * @param packageString root package name to register
-     */
-    public static void registerRootPackage(final String packageString) {
-        rootPackageSet.add(packageString);
-    }
-
-    /**
-     * <p>Clears previously registered root packages.
-     */
-    public static void clearRootPackages() {
-        rootPackageSet.clear();
-    }
-
-    /**
-     * <p>Registers a new group package.
-     *
-     * @param packageString group package name to register
-     */
-    public static void registerGroupPackage(final String packageString) {
-        groupPackageSet.add(packageString);
-    }
-
-    /**
-     * <p>Clears previously registered group packages.
-     */
-    public static void clearGroupPackages() {
-        groupPackageSet.clear();
-    }
-
-    /**
-     * <p>Returns the global stack trace serializer implementation which is used to serialize {@link StackTraceElement}
-     * objects in <code>getStackTraceString</code> methods.
-     *
-     * @return current stack trace serializer implementation
-     */
-    public static StackTraceElementSerializer getStackTraceElementSerializer() {
-        return stackTraceElementSerializer;
-    }
-
-    /**
-     * <p>Sets the global stack trace serializer implementation which is used to serialize {@link StackTraceElement}
-     * objects in <code>getStackTraceString</code> methods.
-     *
-     * @param stackTraceElementSerializer new stack trace serializer implementation
-     */
-    public static void setStackTraceElementSerializer(final StackTraceElementSerializer stackTraceElementSerializer) {
-        AbstractExceptions.stackTraceElementSerializer = stackTraceElementSerializer;
-    }
-
-    /**
-     * <p>Registers a new ignore package.
-     *
-     * @param packageString      ignore package name to register
-     * @param ignoreCauseClasses ignore cause classes from this package too
-     */
-    public static void registerIgnorePackage(final String packageString, final boolean ignoreCauseClasses) {
-        ignorePackageSet.add(packageString);
-        if (ignoreCauseClasses) {
-            ignoreCausePackageSet.add(packageString);
-        }
-    }
-
-    /**
-     * <p>Clears previously registered ignore packages.
-     */
-    public static void clearIgnorePackages() {
-        ignorePackageSet.clear();
-        ignoreCausePackageSet.clear();
-    }
-
-    /**
-     * <p>Returns the value of ignore all causes option.
-     *
-     * @return the value of global ignore all causes option. If value is true then stack trace elements printed or
-     * converted to string will not include causes. If value is false causes will be appended to the stack trace of
-     * the main throwable.
-     */
-    public static boolean getIgnoreAllCauses() {
-        return ignoreAllCauses;
-    }
-
-    /**
-     * <p>Sets the value of ignore all causes option.
-     *
-     * @param ignoreAllCauses new global ignore all causes option. If value is true then stack trace elements printed
-     *                        or converted to string will not include causes. If value is false causes will be appended to the stack trace of
-     *                        the main throwable.
-     */
-    public static void setIgnoreAllCauses(final boolean ignoreAllCauses) {
-        AbstractExceptions.ignoreAllCauses = ignoreAllCauses;
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code>.
-     *
-     * <p>This method uses root packages registered by {@link #registerRootPackage(String)}, group packages registered
-     * by {@link #registerGroupPackage(String)} and ignore packages registered by
-     * {@link #registerIgnorePackage(String, boolean)} to build the smart stack trace.
-     *
-     * @param throwable parent throwable
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable) {
-        return getStackTraceString(throwable, false, rootPackageSet, groupPackageSet, ignorePackageSet, 0, ignoreAllCauses);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code>.
-     *
-     * <p>This method uses root packages registered by {@link #registerRootPackage(String)}, group packages registered
-     * by {@link #registerGroupPackage(String)} and ignore packages registered by
-     * {@link #registerIgnorePackage(String, boolean)} to build the smart stack trace.
-     *
-     * @param throwable       parent throwable
-     * @param ignoreAllCauses ignore all causes in the exception chain
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable, final boolean ignoreAllCauses) {
-        return getStackTraceString(throwable, false, rootPackageSet, groupPackageSet, ignorePackageSet, 0, ignoreAllCauses);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code> using packages provided.
-     *
-     * @param throwable        parent throwable
-     * @param rootPackageSet   root packages to use for building the stack trace
-     * @param groupPackageSet  group packages to use for building the stack trace
-     * @param ignorePackageSet ignore packages to use for building the stack trace
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable, final Set<String> rootPackageSet, final Set<String> groupPackageSet, final Set<String> ignorePackageSet) {
-        return getStackTraceString(throwable, false, rootPackageSet, groupPackageSet, ignorePackageSet, 0, ignoreAllCauses);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code> using packages provided.
-     *
-     * @param throwable        parent throwable
-     * @param rootPackageSet   root packages to use for building the stack trace
-     * @param groupPackageSet  group packages to use for building the stack trace
-     * @param ignorePackageSet ignore packages to use for building the stack trace
-     * @param ignoreAllCauses  ignore all causes in the exception chain
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable, final Set<String> rootPackageSet, final Set<String> groupPackageSet, final Set<String> ignorePackageSet, final boolean ignoreAllCauses) {
-        return getStackTraceString(throwable, false, rootPackageSet, groupPackageSet, ignorePackageSet, 0, ignoreAllCauses);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code> using root package provided.
-     *
-     * @param throwable   parent throwable
-     * @param rootPackage root package to use for building the stack trace
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable, final String rootPackage) {
-        return getStackTraceString(throwable, false, Collections.singleton(rootPackage), new HashSet<String>(), new HashSet<String>(), 0, ignoreAllCauses);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code> using root package provided.
-     *
-     * @param throwable    parent throwable
-     * @param rootPackage  root package to use for building the stack trace
-     * @param groupPackage group package to use for building the stack trace
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable, final String rootPackage, final String groupPackage) {
-        return getStackTraceString(throwable, false, Collections.singleton(rootPackage), Collections.singleton(groupPackage), new HashSet<String>(), 0, ignoreAllCauses);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code> using elements found until the maxDepth.
-     *
-     * @param throwable parent throwable
-     * @param maxDepth  max depth in exception chain that will be used
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable, final int maxDepth) {
-        return getStackTraceString(throwable, false, new HashSet<String>(), new HashSet<String>(), new HashSet<String>(), maxDepth, ignoreAllCauses);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code> using elements found until the maxDepth.
-     *
-     * @param throwable       parent throwable
-     * @param maxDepth        max depth in exception chain that will be used
-     * @param ignoreAllCauses ignore all causes in the exception chain
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable, final int maxDepth, final boolean ignoreAllCauses) {
-        return getStackTraceString(throwable, false, new HashSet<String>(), new HashSet<String>(), new HashSet<String>(), maxDepth, ignoreAllCauses);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code> using parameters provided.
-     *
-     * @param throwable        parent throwable
-     * @param isCause          throwable is a cause or not
-     * @param rootPackageSet   root packages to use for building the stack trace
-     * @param groupPackageSet  group packages to use for building the stack trace
-     * @param ignorePackageSet ignore packages to use for building the stack trace
-     * @param maxDepth         max depth in exception chain that will be used
-     * @param ignoreAllCauses  ignore all causes in the exception chain
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable, final boolean isCause, final Set<String> rootPackageSet, final Set<String> groupPackageSet, final Set<String> ignorePackageSet, final int maxDepth, final boolean ignoreAllCauses) {
-        final StringBuilder builder = new StringBuilder();
-
-        if (throwable == null) {
-            return "";
-        }
-
-        final String className = throwable.getClass().getName();
-
-        final StackTraceElement[] stackTraceElements;
-        if (maxDepth > 0) {
-            stackTraceElements = getStackTrace(throwable, maxDepth);
-        } else {
-            stackTraceElements = getStackTrace(throwable, rootPackageSet, ignorePackageSet);
-        }
-        String message = throwable.getLocalizedMessage();
-        if (isEmpty(message)) {
-            message = throwable.getMessage();
-        }
-
-        /* PRINT MESSAGE */
-        if (isCause) {
-            builder.append(System.lineSeparator());
-            builder.append("Caused by: ");
-            builder.append(className);
-            if (!isEmpty(message)) {
-                builder.append(": ");
-                builder.append(message);
-            }
-        } else {
-            builder.append(System.lineSeparator());
-            builder.append(className);
-            if (!isEmpty(message)) {
-                builder.append(": ");
-                builder.append(message);
-            }
-        }
-
-        /* PRINT SHORT STACK TRACE */
-        String currentGroupPackage = null;
-        StackTraceElement firstStackTraceElementInTheGroup = null;
-        int currentGroupCount = 0;
-        for (StackTraceElement traceElement : stackTraceElements) {
-            String traceElementClassName = traceElement.getClassName();
-            String groupPackageMatch = getContainingPackage(traceElementClassName, groupPackageSet);
-
-            if (groupPackageMatch != null) {
-                if (!groupPackageMatch.equals(currentGroupPackage)) {
-                    appendStackTraceGroupElement(builder, currentGroupPackage, currentGroupCount, firstStackTraceElementInTheGroup);
-
-                    builder.append(System.lineSeparator());
-                    builder.append("\tat ");
-
-                    currentGroupPackage = groupPackageMatch;
-                    firstStackTraceElementInTheGroup = traceElement;
-                    currentGroupCount = 1;
-                } else {
-                    currentGroupCount++;
-                }
-            } else {
-                currentGroupCount = appendStackTraceGroupElement(builder, currentGroupPackage, currentGroupCount, firstStackTraceElementInTheGroup);
-
-                builder.append(System.lineSeparator());
-                builder.append("\tat ");
-                if (stackTraceElementSerializer == null) {
-                    throw new IllegalArgumentException("Stack trace element serializer not initialized.");
-                } else {
-                    builder.append(stackTraceElementSerializer.toString(traceElement));
-                }
-                currentGroupPackage = null;
-            }
-        }
-
-        appendStackTraceGroupElement(builder, currentGroupPackage, currentGroupCount, firstStackTraceElementInTheGroup);
-
-        final Throwable cause = throwable.getCause();
-        if (cause != null && !containsPackage(className, ignoreCausePackageSet) && !ignoreAllCauses) {
-            builder.append(getStackTraceString(cause, true, rootPackageSet, groupPackageSet, ignorePackageSet, maxDepth, ignoreAllCauses));
-        }
-
-        return builder.toString();
-    }
-
-    /**
-     * <p>Appends stack trace group information for the given parameters.
-     *
-     * @param stringBuilder                     string builder that group stack trace information will be appended
-     * @param currentGroupPackage               package name of the current group
-     * @param numberOfElementsInTheCurrentGroup number of elements in the current group
-     * @param firstStackTraceElementInTheGroup  first stack trace element of this group
-     * @return new value for the group element count
-     */
-    public static int appendStackTraceGroupElement(final StringBuilder stringBuilder, final String currentGroupPackage, final int numberOfElementsInTheCurrentGroup, final StackTraceElement firstStackTraceElementInTheGroup) {
-        if (numberOfElementsInTheCurrentGroup > 0) {
-            if (stackTraceElementSerializer == null) {
-                throw new IllegalArgumentException("Stack trace element serializer not initialized.");
-            } else {
-                stringBuilder.append((numberOfElementsInTheCurrentGroup == 1) ? stackTraceElementSerializer.toString(firstStackTraceElementInTheGroup) : String.format("%s%s ... %d more", stackTraceElementSerializer.getModuleName(firstStackTraceElementInTheGroup), currentGroupPackage, (numberOfElementsInTheCurrentGroup - 1)));
-            }
-        }
-
-        return 0;
-    }
-
-    /**
-     * <p>Returns true if package of the given class name matches one of package names provided in
-     * <code>packageSet</code>.
-     *
-     * @param fullClassName fully qualified class name
-     * @param packageSet    set containing package names
-     * @return true if package of the given class name matches one of package names provided in <code>packageSet</code>,
-     * false otherwise
-     */
-    public static boolean containsPackage(final String fullClassName, final Set<String> packageSet) {
-        return getContainingPackage(fullClassName, packageSet) != null;
-    }
-
-    /**
-     * <p>Checks if one of the package names in the <code>packageSet</code> matches the package of the given class name
-     * and returns the matching package name.
-     *
-     * @param fullClassName fully qualified class name
-     * @param packageSet    set containing package names
-     * @return one of the package names in the <code>packageSet</code> that matches the package of the given class name
-     * or null if no matching package name is found in the <code>packageSet</code>
-     */
-    public static String getContainingPackage(final String fullClassName, final Set<String> packageSet) {
-        for (final String parentExceptionPackage : packageSet) {
-            if (fullClassName.startsWith(parentExceptionPackage)) {
-                return parentExceptionPackage;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * <p>Returns all messages found in the exception chain of the <code>throwable</code> as a single string.
-     *
-     * @param throwable parent throwable
-     * @return a string containing all messages found in the exception chain
-     */
-    public static String getAllMessages(final Throwable throwable) {
-        final StringBuilder messageBuilder = new StringBuilder();
-        getAllMessages(throwable, messageBuilder);
-        return messageBuilder.toString();
-    }
-
-    /**
-     * <p>Adds all messages found in the exception chain of the <code>throwable</code> into the given message builder.
-     *
-     * @param throwable      parent throwable
-     * @param messageBuilder message builder
-     */
-    public static void getAllMessages(final Throwable throwable, final StringBuilder messageBuilder) {
-        if (throwable != null) {
-            final String message = throwable.getMessage();
-            if (!isEmpty(message)) {
-                if (messageBuilder.length() != 0) {
-                    messageBuilder.append(System.lineSeparator());
-                    messageBuilder.append(" - Caused by: ");
-                }
-                messageBuilder.append(message);
-            }
-            getAllMessages(throwable.getCause(), messageBuilder);
-        }
-    }
-
-    /**
-     * <p>Builds a smart stack trace for the given <code>throwable</code> using elements found until the maxDepth and
-     * elements of it.
-     *
-     * @param throwable parent throwable
-     * @param maxDepth  max depth in exception chain that will be returned
-     * @return an array containing stack trace elements
-     */
-    public static StackTraceElement[] getStackTrace(final Throwable throwable, final int maxDepth) {
-        final ArrayList<StackTraceElement> list = new ArrayList<StackTraceElement>();
-
-        if (throwable != null) {
-            StackTraceElement[] stackTrace = throwable.getStackTrace();
-            for (int i = 0; (i < stackTrace.length) && (i < maxDepth); i++) {
-                list.add(stackTrace[i]);
-            }
-        }
-
-        return list.toArray(new StackTraceElement[0]);
-    }
-
-    /**
-     * <p>Builds a smart stack trace for the given <code>throwable</code> using packages provided and returns elements
-     * of it.
-     *
-     * @param throwable        parent throwable
-     * @param rootPackageSet   root packages to use for building the stack trace
-     * @param ignorePackageSet ignore packages to use for building the stack trace
-     * @return an array containing stack trace elements
-     */
-    public static StackTraceElement[] getStackTrace(final Throwable throwable, final Set<String> rootPackageSet, final Set<String> ignorePackageSet) {
-        final ArrayList<StackTraceElement> list = new ArrayList<StackTraceElement>();
-        final ArrayList<StackTraceElement> partialList = new ArrayList<StackTraceElement>();
-
-        if (throwable != null) {
-            for (StackTraceElement stackTraceElement : throwable.getStackTrace()) {
-                final String className = stackTraceElement.getClassName();
-                if (!isEmpty(className)) {
-                    if (containsPackage(className, rootPackageSet)) {
-                        list.addAll(partialList);
-                        list.add(stackTraceElement);
-                    } else if (!containsPackage(className, ignorePackageSet)) {
-                        partialList.add(stackTraceElement);
-                    }
-                }
-            }
-        }
-
-        if (list.isEmpty()) {
-            list.addAll(partialList);
-        }
-
-        return list.toArray(new StackTraceElement[0]);
-    }
-
-    /**
-     * <p>Returns true if the given cause class is found in the exception chain of the <code>throwable</code>.
-     * <br>
-     * <br>
-     * <p>Search starts from the <code>throwable</code> itself and goes through the exception chain up until
-     * {@link #DEFAULT_MAX_DEPTH}.
-     *
-     * @param throwable  parent throwable
-     * @param causeClass class to search for
-     * @return true if the given cause class is found in the exception chain of the <code>throwable</code>, false
-     * otherwise
-     */
-    public static boolean containsCause(final Throwable throwable, final Class<?> causeClass) {
-        return containsCause(throwable, causeClass, null);
-    }
-
-    /**
-     * <p>Returns true if the given cause class and cause message is found in the exception chain of the
-     * <code>throwable</code>.
-     * <br>
-     * <br>
-     * <p>Search starts from the <code>throwable</code> itself and goes through the exception chain up until
-     * {@link #DEFAULT_MAX_DEPTH}.
-     *
-     * @param throwable    parent throwable
-     * @param causeClass   class to search for
-     * @param causeMessage message to search for
-     * @return true if the given cause class and cause message is found in the exception chain of the
-     * <code>throwable</code>, false otherwise
-     */
-    public static boolean containsCause(final Throwable throwable, final Class<?> causeClass, final String causeMessage) {
-        return (searchCause(throwable, causeClass, causeMessage, DEFAULT_MAX_DEPTH) != null);
-    }
-
-    /**
-     * <p>Returns the cause of the <code>throwable</code> by walking through the exception chain.
-     *
-     * @param throwable parent throwable
-     * @return the cause of the <code>throwable</code> found or null if <code>throwable</code> does not have a cause
-     */
-    public static Throwable getCause(final Throwable throwable) {
-        return getCause(throwable, DEFAULT_MAX_DEPTH);
-    }
-
-    /**
-     * <p>Returns the cause of the <code>throwable</code> by walking through the exception chain.
-     * <br>
-     * <br>
-     * <p>Note that this method walks through the exception chain up to given <code>maxDepth</code>. If exception chain
-     * includes more items than <code>maxDepth</code>, cause found at <code>maxDepth</code> level is returned.
-     *
-     * @param throwable parent throwable
-     * @param maxDepth  max depth in exception chain that will be searched
-     * @return the cause of the <code>throwable</code> found until <code>maxDepth</code> is reached in the exception
-     * chain or null if <code>throwable</code> does not have a cause
-     */
-    public static Throwable getCause(final Throwable throwable, final int maxDepth) {
-        if (throwable == null) {
-            return null;
-        }
-
-        if (maxDepth <= 0) {
-            return throwable;
-        }
-
-        final Throwable cause = throwable.getCause();
-        if (cause == null) {
-            return throwable;
-        } else {
-            return getCause(cause, maxDepth - 1);
-        }
-    }
-
-    /**
-     * <p>Searches for the given cause class in the exception chain of the <code>throwable</code>.
-     * <br>
-     * <br>
-     * <p>Search starts from the <code>throwable</code> itself and goes through the exception chain up until
-     * {@link #DEFAULT_MAX_DEPTH}.
-     *
-     * @param throwable  parent throwable
-     * @param causeClass class to search for
-     * @return the <code>throwable</code> found or null if no class in exception chain matches the given cause class
-     */
-    public static Throwable searchCause(final Throwable throwable, final Class<?> causeClass) {
-        return searchCause(throwable, causeClass, null, DEFAULT_MAX_DEPTH);
-    }
-
-    /**
-     * <p>Searches for the given cause class and cause message in the exception chain of the <code>throwable</code>.
-     * <br>
-     * <br>
-     * <p>Search starts from the <code>throwable</code> itself and goes through the exception chain up until
-     * {@link #DEFAULT_MAX_DEPTH}.
-     *
-     * @param throwable    parent throwable
-     * @param causeClass   class to search for
-     * @param causeMessage message to search for
-     * @return the <code>throwable</code> found or null if no class in exception chain matches the given cause class
-     * and cause message
-     */
-    public static Throwable searchCause(final Throwable throwable, final Class<?> causeClass, final String causeMessage) {
-        return searchCause(throwable, causeClass, causeMessage, DEFAULT_MAX_DEPTH);
-    }
-
-    /**
-     * <p>Searches for the given cause class and cause message in the exception chain of the <code>throwable</code>.
-     * <br>
-     * <br>
-     * <p>Search starts from the <code>throwable</code> itself and goes through the exception chain up until the given
-     * <code>maxDepth</code>.
-     *
-     * @param throwable    parent throwable
-     * @param causeClass   class to search for
-     * @param causeMessage message to search for
-     * @param maxDepth     max depth in exception chain that will be searched
-     * @return the <code>throwable</code> found or null if no class in exception chain matches the given cause class
-     * and cause message
-     */
-    public static Throwable searchCause(final Throwable throwable, final Class<?> causeClass, final String causeMessage, final int maxDepth) {
-        if (throwable == null) {
-            return null;
-        }
-
-        if (isEmpty(causeMessage)) {
-            if (throwable.getClass().equals(causeClass)) {
-                return throwable;
-            }
-        } else {
-            if (throwable.getClass().equals(causeClass) && getAllMessages(throwable).toLowerCase().contains(causeMessage.toLowerCase())) {
-                return throwable;
-            }
-        }
-
-        if (maxDepth <= 0) {
-            return null;
-        }
-
-        final Throwable cause = throwable.getCause();
-        if (cause == null) {
-            return null;
-        } else {
-            return searchCause(cause, causeClass, causeMessage, maxDepth - 1);
-        }
-    }
-
-    /**
-     * <p>Searches for the given cause class in the exception chain of the <code>throwable</code>.
-     * <br>
-     * <br>
-     * <p>Search starts from the <code>throwable</code> itself and goes through the exception chain up until the given
-     * <code>maxDepth</code>.
-     *
-     * @param throwable  parent throwable
-     * @param causeClass class to search for
-     * @param maxDepth   max depth in exception chain that will be searched
-     * @return the <code>throwable</code> found or null if no class in exception chain matches the given cause class
-     */
-    public static Throwable searchCause(final Throwable throwable, final Class<?> causeClass, final int maxDepth) {
-        if (throwable == null) {
-            return null;
-        }
-
-        if (throwable.getClass().equals(causeClass)) {
-            return throwable;
-        }
-
-        if (maxDepth <= 0) {
-            return null;
-        }
-
-        final Throwable cause = throwable.getCause();
-        if (cause == null) {
-            return null;
-        } else {
-            return searchCause(cause, causeClass, maxDepth - 1);
-        }
-    }
-
-    /**
-     * <p>Checks if given string is empty or not.
-     *
-     * @param value string to check
-     * @return true if given string is null or has zero length after trim(), false otherwise
-     */
-    public static boolean isEmpty(final String value) {
-        if (value == null) {
-            return true;
-        }
-
-        return value.trim().length() == 0;
-    }
-
-    /**
-     * <p>Returns the package name of this class.
-     *
-     * @param className fully qualified class name
-     * @return name of the package
-     */
-    public static String packageName(final String className) {
-        if (className == null) {
-            return "";
-        }
-
-        int index = className.lastIndexOf(".");
-        if (index >= 0) {
-            return className.substring(0, index);
-        } else {
-            return "";
-        }
-    }
-
-}
@@ -1,74 +0,0 @@
-/*
- * BSD 3-Clause License
- *
- * Copyright (c) 2020, Taner Sener
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.arthenica.smartexception;
-
-/**
- * <p>Base interface for classes which can serialize {@link StackTraceElement} objects.
- *
- * @author Taner Sener
- * @since 0.1.0
- */
-public interface StackTraceElementSerializer {
-
-    /**
-     * <p>Converts the given <code>stackTraceElement</code> into a string.
-     *
-     * @param stackTraceElement stack trace element to convert
-     * @return string representing the given <code>stackTraceElement</code>
-     */
-    String toString(final StackTraceElement stackTraceElement);
-
-    /**
-     * <p>Returns module name for the given <code>stackTraceElement</code>.
-     *
-     * @param stackTraceElement stack trace element to use
-     * @return module name of the given <code>stackTraceElement</code> or an empty string if implementation does not
-     * support printing module names
-     */
-    String getModuleName(final StackTraceElement stackTraceElement);
-
-    /**
-     * <p>Returns string definition used to print native methods.
-     *
-     * @return string definition used to print native methods
-     */
-    String getNativeMethodDefinition();
-
-    /**
-     * <p>Returns string definition used to print methods with unknown source.
-     *
-     * @return string definition used to print methods with unknown source
-     */
-    String getUnknownSourceDefinition();
-
-}
@@ -1,423 +0,0 @@
-/*
- * BSD 3-Clause License
- *
- * Copyright (c) 2020, Taner Sener
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.arthenica.smartexception.java;
-
-import com.arthenica.smartexception.AbstractExceptions;
-import com.arthenica.smartexception.StackTraceElementSerializer;
-
-import java.util.Set;
-
-/**
- * <p>Utility class to handle Throwable objects and stack traces. This implementation is compatible with all Java and
- * Android versions.
- *
- * @author Taner Sener
- * @since 0.1.0
- */
-public class Exceptions {
-
-    static {
-        AbstractExceptions.setStackTraceElementSerializer(new StackTraceElementSerializer() {
-
-            @Override
-            public String toString(StackTraceElement stackTraceElement) {
-                final StringBuilder stringBuilder = new StringBuilder();
-
-                stringBuilder.append(stackTraceElement.getClassName());
-                stringBuilder.append(".");
-                stringBuilder.append(stackTraceElement.getMethodName());
-
-                if (stackTraceElement.isNativeMethod()) {
-                    stringBuilder.append("(Native Method)");
-                } else if ((stackTraceElement.getFileName() != null) && (stackTraceElement.getFileName().length() > 0)) {
-                    stringBuilder.append("(");
-                    stringBuilder.append(stackTraceElement.getFileName());
-                    if (stackTraceElement.getLineNumber() >= 0) {
-                        stringBuilder.append(":");
-                        stringBuilder.append(stackTraceElement.getLineNumber());
-                    }
-                    stringBuilder.append(")");
-                } else {
-                    stringBuilder.append("(Unknown Source)");
-                }
-
-                return stringBuilder.toString();
-            }
-
-            @Override
-            public String getModuleName(StackTraceElement stackTraceElement) {
-                return "";
-            }
-
-            @Override
-            public String getNativeMethodDefinition() {
-                return "(Native Method)";
-            }
-
-            @Override
-            public String getUnknownSourceDefinition() {
-                return "(Unknown Source)";
-            }
-        });
-    }
-
-    /**
-     * <p>Registers a new root package.
-     *
-     * @param packageString root package name to register
-     */
-    public static void registerRootPackage(final String packageString) {
-        AbstractExceptions.registerRootPackage(packageString);
-    }
-
-    /**
-     * <p>Clears previously registered root packages.
-     */
-    public static void clearRootPackages() {
-        AbstractExceptions.clearRootPackages();
-    }
-
-    /**
-     * <p>Registers a new group package.
-     *
-     * @param packageString group package name to register
-     */
-    public static void registerGroupPackage(final String packageString) {
-        AbstractExceptions.registerGroupPackage(packageString);
-    }
-
-    /**
-     * <p>Clears previously registered group packages.
-     */
-    public static void clearGroupPackages() {
-        AbstractExceptions.clearGroupPackages();
-    }
-
-    /**
-     * <p>Returns the global stack trace serializer implementation which is used to serialize {@link StackTraceElement}
-     * objects in <code>getStackTraceString</code> methods.
-     *
-     * @return current stack trace serializer implementation
-     */
-    public static StackTraceElementSerializer getStackTraceElementSerializer() {
-        return AbstractExceptions.getStackTraceElementSerializer();
-    }
-
-    /**
-     * <p>Sets the global stack trace serializer implementation which is used to serialize {@link StackTraceElement}
-     * objects in <code>getStackTraceString</code> methods.
-     *
-     * @param stackTraceElementSerializer new stack trace serializer implementation
-     */
-    public static void setStackTraceElementSerializer(final StackTraceElementSerializer stackTraceElementSerializer) {
-        AbstractExceptions.setStackTraceElementSerializer(stackTraceElementSerializer);
-    }
-
-    /**
-     * <p>Registers a new ignore package.
-     *
-     * @param packageString      ignore package name to register
-     * @param ignoreCauseClasses ignore cause classes from this package too
-     */
-    public static void registerIgnorePackage(final String packageString, final boolean ignoreCauseClasses) {
-        AbstractExceptions.registerIgnorePackage(packageString, ignoreCauseClasses);
-    }
-
-    /**
-     * <p>Clears previously registered ignore packages.
-     */
-    public static void clearIgnorePackages() {
-        AbstractExceptions.clearIgnorePackages();
-    }
-
-    /**
-     * <p>Returns the value of ignore all causes option.
-     *
-     * @return the value of global ignore all causes option. If value is true then stack trace elements printed or
-     * converted to string will not include causes. If value is false causes will be appended to the stack trace of
-     * the main throwable.
-     */
-    public static boolean getIgnoreAllCauses() {
-        return AbstractExceptions.getIgnoreAllCauses();
-    }
-
-    /**
-     * <p>Sets the value of ignore all causes option.
-     *
-     * @param ignoreAllCauses new global ignore all causes option. If value is true then stack trace elements printed
-     *                        or converted to string will not include causes. If value is false causes will be appended to the stack trace of
-     *                        the main throwable.
-     */
-    public static void setIgnoreAllCauses(final boolean ignoreAllCauses) {
-        AbstractExceptions.setIgnoreAllCauses(ignoreAllCauses);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code>.
-     *
-     * <p>This method uses root packages registered by {@link #registerRootPackage(String)}, group packages registered
-     * by {@link #registerGroupPackage(String)} and ignore packages registered by
-     * {@link #registerIgnorePackage(String, boolean)} to build the smart stack trace.
-     *
-     * @param throwable parent throwable
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable) {
-        return AbstractExceptions.getStackTraceString(throwable);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code>.
-     *
-     * <p>This method uses root packages registered by {@link #registerRootPackage(String)}, group packages registered
-     * by {@link #registerGroupPackage(String)} and ignore packages registered by
-     * {@link #registerIgnorePackage(String, boolean)} to build the smart stack trace.
-     *
-     * @param throwable       parent throwable
-     * @param ignoreAllCauses ignore all causes in the exception chain
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable, final boolean ignoreAllCauses) {
-        return AbstractExceptions.getStackTraceString(throwable, ignoreAllCauses);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code> using packages provided.
-     *
-     * @param throwable        parent throwable
-     * @param rootPackageSet   root packages to use for building the stack trace
-     * @param groupPackageSet  group packages to use for building the stack trace
-     * @param ignorePackageSet ignore packages to use for building the stack trace
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable, final Set<String> rootPackageSet, final Set<String> groupPackageSet, final Set<String> ignorePackageSet) {
-        return AbstractExceptions.getStackTraceString(throwable, rootPackageSet, groupPackageSet, ignorePackageSet);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code> using packages provided.
-     *
-     * @param throwable        parent throwable
-     * @param rootPackageSet   root packages to use for building the stack trace
-     * @param groupPackageSet  group packages to use for building the stack trace
-     * @param ignorePackageSet ignore packages to use for building the stack trace
-     * @param ignoreAllCauses  ignore all causes in the exception chain
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable, final Set<String> rootPackageSet, final Set<String> groupPackageSet, final Set<String> ignorePackageSet, final boolean ignoreAllCauses) {
-        return AbstractExceptions.getStackTraceString(throwable, rootPackageSet, groupPackageSet, ignorePackageSet, ignoreAllCauses);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code> using root package provided.
-     *
-     * @param throwable   parent throwable
-     * @param rootPackage root package to use for building the stack trace
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable, final String rootPackage) {
-        return AbstractExceptions.getStackTraceString(throwable, rootPackage);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code> using root package provided.
-     *
-     * @param throwable    parent throwable
-     * @param rootPackage  root package to use for building the stack trace
-     * @param groupPackage group package to use for building the stack trace
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable, final String rootPackage, final String groupPackage) {
-        return AbstractExceptions.getStackTraceString(throwable, rootPackage, groupPackage);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code> using elements found until the maxDepth.
-     *
-     * @param throwable parent throwable
-     * @param maxDepth  max depth in exception chain that will be used
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable, final int maxDepth) {
-        return AbstractExceptions.getStackTraceString(throwable, maxDepth);
-    }
-
-    /**
-     * <p>Returns the smart stack trace for the given <code>throwable</code> using elements found until the maxDepth.
-     *
-     * @param throwable       parent throwable
-     * @param maxDepth        max depth in exception chain that will be used
-     * @param ignoreAllCauses ignore all causes in the exception chain
-     * @return a string containing the smart stack trace for the given <code>throwable</code>
-     */
-    public static String getStackTraceString(final Throwable throwable, final int maxDepth, final boolean ignoreAllCauses) {
-        return AbstractExceptions.getStackTraceString(throwable, maxDepth, ignoreAllCauses);
-    }
-
-    /**
-     * <p>Returns all messages found in the exception chain of the <code>throwable</code> as a single string.
-     *
-     * @param throwable parent throwable
-     * @return a string containing all messages found in the exception chain
-     */
-    public static String getAllMessages(final Throwable throwable) {
-        return AbstractExceptions.getAllMessages(throwable);
-    }
-
-    /**
-     * <p>Returns true if the given cause class is found in the exception chain of the <code>throwable</code>.
-     * <br>
-     * <br>
-     * <p>Search starts from the <code>throwable</code> itself and goes through the exception chain up until
-     * {@link AbstractExceptions#DEFAULT_MAX_DEPTH}.
-     *
-     * @param throwable  parent throwable
-     * @param causeClass class to search for
-     * @return true if the given cause class is found in the exception chain of the <code>throwable</code>, false
-     * otherwise
-     */
-    public static boolean containsCause(final Throwable throwable, final Class<?> causeClass) {
-        return AbstractExceptions.containsCause(throwable, causeClass);
-    }
-
-    /**
-     * <p>Returns true if the given cause class and cause message is found in the exception chain of the
-     * <code>throwable</code>.
-     * <br>
-     * <br>
-     * <p>Search starts from the <code>throwable</code> itself and goes through the exception chain up until
-     * {@link AbstractExceptions#DEFAULT_MAX_DEPTH}.
-     *
-     * @param throwable    parent throwable
-     * @param causeClass   class to search for
-     * @param causeMessage message to search for
-     * @return true if the given cause class and cause message is found in the exception chain of the
-     * <code>throwable</code>, false otherwise
-     */
-    public static boolean containsCause(final Throwable throwable, final Class<?> causeClass, final String causeMessage) {
-        return AbstractExceptions.containsCause(throwable, causeClass, causeMessage);
-    }
-
-    /**
-     * <p>Returns the cause of the <code>throwable</code> by walking through the exception chain.
-     *
-     * @param throwable parent throwable
-     * @return the cause of the <code>throwable</code> found or null if <code>throwable</code> does not have a cause
-     */
-    public static Throwable getCause(final Throwable throwable) {
-        return AbstractExceptions.getCause(throwable);
-    }
-
-    /**
-     * <p>Returns the cause of the <code>throwable</code> by walking through the exception chain.
-     * <br>
-     * <br>
-     * <p>Note that this method walks through the exception chain up to given <code>maxDepth</code>. If exception chain
-     * includes more items than <code>maxDepth</code>, cause found at <code>maxDepth</code> level is returned.
-     *
-     * @param throwable parent throwable
-     * @param maxDepth  max depth in exception chain that will be searched
-     * @return the cause of the <code>throwable</code> found until <code>maxDepth</code> is reached in the exception
-     * chain or null if <code>throwable</code> does not have a cause
-     */
-    public static Throwable getCause(final Throwable throwable, final int maxDepth) {
-        return AbstractExceptions.getCause(throwable, maxDepth);
-    }
-
-    /**
-     * <p>Searches for the given cause class in the exception chain of the <code>throwable</code>.
-     * <br>
-     * <br>
-     * <p>Search starts from the <code>throwable</code> itself and goes through the exception chain up until
-     * {@link AbstractExceptions#DEFAULT_MAX_DEPTH}.
-     *
-     * @param throwable  parent throwable
-     * @param causeClass class to search for
-     * @return the <code>throwable</code> found or null if no class in exception chain matches the given cause class
-     */
-    public static Throwable searchCause(final Throwable throwable, final Class<?> causeClass) {
-        return AbstractExceptions.searchCause(throwable, causeClass);
-    }
-
-    /**
-     * <p>Searches for the given cause class and cause message in the exception chain of the <code>throwable</code>.
-     * <br>
-     * <br>
-     * <p>Search starts from the <code>throwable</code> itself and goes through the exception chain up until
-     * {@link AbstractExceptions#DEFAULT_MAX_DEPTH}.
-     *
-     * @param throwable    parent throwable
-     * @param causeClass   class to search for
-     * @param causeMessage message to search for
-     * @return the <code>throwable</code> found or null if no class in exception chain matches the given cause class
-     * and cause message
-     */
-    public static Throwable searchCause(final Throwable throwable, final Class<?> causeClass, final String causeMessage) {
-        return AbstractExceptions.searchCause(throwable, causeClass, causeMessage);
-    }
-
-    /**
-     * <p>Searches for the given cause class and cause message in the exception chain of the <code>throwable</code>.
-     * <br>
-     * <br>
-     * <p>Search starts from the <code>throwable</code> itself and goes through the exception chain up until the given
-     * <code>maxDepth</code>.
-     *
-     * @param throwable    parent throwable
-     * @param causeClass   class to search for
-     * @param causeMessage message to search for
-     * @param maxDepth     max depth in exception chain that will be searched
-     * @return the <code>throwable</code> found or null if no class in exception chain matches the given cause class
-     * and cause message
-     */
-    public static Throwable searchCause(final Throwable throwable, final Class<?> causeClass, final String causeMessage, final int maxDepth) {
-        return AbstractExceptions.searchCause(throwable, causeClass, causeMessage, maxDepth);
-    }
-
-    /**
-     * <p>Searches for the given cause class in the exception chain of the <code>throwable</code>.
-     * <br>
-     * <br>
-     * <p>Search starts from the <code>throwable</code> itself and goes through the exception chain up until the given
-     * <code>maxDepth</code>.
-     *
-     * @param throwable  parent throwable
-     * @param causeClass class to search for
-     * @param maxDepth   max depth in exception chain that will be searched
-     * @return the <code>throwable</code> found or null if no class in exception chain matches the given cause class
-     */
-    public static Throwable searchCause(final Throwable throwable, final Class<?> causeClass, final int maxDepth) {
-        return AbstractExceptions.searchCause(throwable, causeClass, maxDepth);
-    }
-
-}
@@ -59,26 +59,22 @@ public class ArscBlamer {
     * Maps type chunk entries to blamed resources.
     */
    private final Multimap<TypeChunk.Entry, ResourceEntry> typeEntryToBlame = HashMultimap.create();
-
-    /**
-     * Maps resources to the type chunk entries they reference.
-     */
-    private Multimap<ResourceEntry, TypeChunk.Entry> resourceEntries;
-
-    /**
-     * Maps resources which have no base config to the type chunk entries they reference.
-     */
-    private Multimap<ResourceEntry, TypeChunk.Entry> baselessKeys;
-
-    /**
-     * Contains all of the type chunks in {@link #resourceTable}.
-     */
-    private List<TypeChunk> typeChunks;
-
    /**
     * This is the {@link ResourceTableChunk} inside of the resources.arsc file in the APK.
     */
    private final ResourceTableChunk resourceTable;
+    /**
+     * Maps resources to the type chunk entries they reference.
+     */
+    private Multimap<ResourceEntry, TypeChunk.Entry> resourceEntries;
+    /**
+     * Maps resources which have no base config to the type chunk entries they reference.
+     */
+    private Multimap<ResourceEntry, TypeChunk.Entry> baselessKeys;
+    /**
+     * Contains all of the type chunks in {@link #resourceTable}.
+     */
+    private List<TypeChunk> typeChunks;

    /**
     * Creates a new {@link ArscBlamer}.
@@ -90,6 +86,14 @@ public class ArscBlamer {
        this.stringToBlame = createEntryListArray(resourceTable.getStringPool().getStringCount());
    }

+    private static List<ResourceEntry>[] createEntryListArray(int size) {
+        ArrayListResourceEntry[] result = new ArrayListResourceEntry[size];
+        for (int i = 0; i < size; ++i) {
+            result[i] = new ArrayListResourceEntry();
+        }
+        return result;
+    }
+
    /**
     * Generates blame mappings.
     */
@@ -257,14 +261,6 @@ public class ArscBlamer {
        return false;
    }

-    private static List<ResourceEntry>[] createEntryListArray(int size) {
-        ArrayListResourceEntry[] result = new ArrayListResourceEntry[size];
-        for (int i = 0; i < size; ++i) {
-            result[i] = new ArrayListResourceEntry();
-        }
-        return result;
-    }
-
    /**
     * Allows creation of concrete parameterized type arr {@link ArscBlamer#createEntryListArray}.
     */
@@ -283,6 +279,12 @@ public class ArscBlamer {
        private final String typeName;
        private final String entryName;

+        private ResourceEntry(String packageName, String typeName, String entryName) {
+            this.packageName = packageName;
+            this.typeName = typeName;
+            this.entryName = entryName;
+        }
+
        static ResourceEntry create(TypeChunk.Entry entry) {
            PackageChunk packageChunk = Preconditions.checkNotNull(entry.parent().getPackageChunk());
            String packageName = packageChunk.getPackageName();
@@ -291,12 +293,6 @@ public class ArscBlamer {
            return new ResourceEntry(packageName, typeName, entryName);
        }

-        private ResourceEntry(String packageName, String typeName, String entryName) {
-            this.packageName = packageName;
-            this.typeName = typeName;
-            this.entryName = entryName;
-        }
-
        public String packageName() {
            return packageName;
        }
@@ -31,6 +31,148 @@ import static java.nio.charset.StandardCharsets.US_ASCII;
 * Describes a particular resource configuration.
 */
 public class BinaryResourceConfiguration implements SerializableResource {
+    /**
+     * The below constants are from android.content.res.Configuration.
+     */
+    private static final int DENSITY_DPI_UNDEFINED = 0;
+    private static final int DENSITY_DPI_LDPI = 120;
+    private static final int DENSITY_DPI_MDPI = 160;
+    private static final int DENSITY_DPI_TVDPI = 213;
+    private static final int DENSITY_DPI_HDPI = 240;
+    private static final int DENSITY_DPI_XHDPI = 320;
+    private static final int DENSITY_DPI_XXHDPI = 480;
+    private static final int DENSITY_DPI_XXXHDPI = 640;
+    private static final int DENSITY_DPI_ANY = 0xFFFE;
+    private static final int DENSITY_DPI_NONE = 0xFFFF;
+    private static final Map<Integer, String> DENSITY_DPI_VALUES =
+            ImmutableMap.<Integer, String>builder()
+                    .put(DENSITY_DPI_UNDEFINED, "")
+                    .put(DENSITY_DPI_LDPI, "ldpi")
+                    .put(DENSITY_DPI_MDPI, "mdpi")
+                    .put(DENSITY_DPI_TVDPI, "tvdpi")
+                    .put(DENSITY_DPI_HDPI, "hdpi")
+                    .put(DENSITY_DPI_XHDPI, "xhdpi")
+                    .put(DENSITY_DPI_XXHDPI, "xxhdpi")
+                    .put(DENSITY_DPI_XXXHDPI, "xxxhdpi")
+                    .put(DENSITY_DPI_ANY, "anydpi")
+                    .put(DENSITY_DPI_NONE, "nodpi")
+                    .build();
+    private static final int KEYBOARD_NOKEYS = 1;
+    private static final int KEYBOARD_QWERTY = 2;
+    private static final int KEYBOARD_12KEY = 3;
+    private static final Map<Integer, String> KEYBOARD_VALUES = ImmutableMap.of(
+            KEYBOARD_NOKEYS, "nokeys",
+            KEYBOARD_QWERTY, "qwerty",
+            KEYBOARD_12KEY, "12key");
+    private static final int KEYBOARDHIDDEN_MASK = 0x03;
+    private static final int KEYBOARDHIDDEN_NO = 1;
+    private static final int KEYBOARDHIDDEN_YES = 2;
+    private static final int KEYBOARDHIDDEN_SOFT = 3;
+    private static final Map<Integer, String> KEYBOARDHIDDEN_VALUES = ImmutableMap.of(
+            KEYBOARDHIDDEN_NO, "keysexposed",
+            KEYBOARDHIDDEN_YES, "keyshidden",
+            KEYBOARDHIDDEN_SOFT, "keyssoft");
+    private static final int NAVIGATION_NONAV = 1;
+    private static final int NAVIGATION_DPAD = 2;
+    private static final int NAVIGATION_TRACKBALL = 3;
+    private static final int NAVIGATION_WHEEL = 4;
+    private static final Map<Integer, String> NAVIGATION_VALUES = ImmutableMap.of(
+            NAVIGATION_NONAV, "nonav",
+            NAVIGATION_DPAD, "dpad",
+            NAVIGATION_TRACKBALL, "trackball",
+            NAVIGATION_WHEEL, "wheel");
+    private static final int NAVIGATIONHIDDEN_MASK = 0x0C;
+    private static final int NAVIGATIONHIDDEN_NO = 0x04;
+    private static final int NAVIGATIONHIDDEN_YES = 0x08;
+    private static final Map<Integer, String> NAVIGATIONHIDDEN_VALUES = ImmutableMap.of(
+            NAVIGATIONHIDDEN_NO, "navexposed",
+            NAVIGATIONHIDDEN_YES, "navhidden");
+    private static final int ORIENTATION_PORTRAIT = 0x01;
+    private static final int ORIENTATION_LANDSCAPE = 0x02;
+    private static final Map<Integer, String> ORIENTATION_VALUES = ImmutableMap.of(
+            ORIENTATION_PORTRAIT, "port",
+            ORIENTATION_LANDSCAPE, "land");
+    private static final int SCREENLAYOUT_LAYOUTDIR_MASK = 0xC0;
+    private static final int SCREENLAYOUT_LAYOUTDIR_LTR = 0x40;
+    private static final int SCREENLAYOUT_LAYOUTDIR_RTL = 0x80;
+    private static final Map<Integer, String> SCREENLAYOUT_LAYOUTDIR_VALUES = ImmutableMap.of(
+            SCREENLAYOUT_LAYOUTDIR_LTR, "ldltr",
+            SCREENLAYOUT_LAYOUTDIR_RTL, "ldrtl");
+    private static final int SCREENLAYOUT_LONG_MASK = 0x30;
+    private static final int SCREENLAYOUT_LONG_NO = 0x10;
+    private static final int SCREENLAYOUT_LONG_YES = 0x20;
+    private static final Map<Integer, String> SCREENLAYOUT_LONG_VALUES = ImmutableMap.of(
+            SCREENLAYOUT_LONG_NO, "notlong",
+            SCREENLAYOUT_LONG_YES, "long");
+    private static final int SCREENLAYOUT_ROUND_MASK = 0x03;
+    private static final int SCREENLAYOUT_ROUND_NO = 0x01;
+    private static final int SCREENLAYOUT_ROUND_YES = 0x02;
+    private static final Map<Integer, String> SCREENLAYOUT_ROUND_VALUES = ImmutableMap.of(
+            SCREENLAYOUT_ROUND_NO, "notround",
+            SCREENLAYOUT_ROUND_YES, "round");
+    private static final int SCREENLAYOUT_SIZE_MASK = 0x0F;
+    private static final int SCREENLAYOUT_SIZE_SMALL = 0x01;
+    private static final int SCREENLAYOUT_SIZE_NORMAL = 0x02;
+    private static final int SCREENLAYOUT_SIZE_LARGE = 0x03;
+    private static final int SCREENLAYOUT_SIZE_XLARGE = 0x04;
+    private static final Map<Integer, String> SCREENLAYOUT_SIZE_VALUES = ImmutableMap.of(
+            SCREENLAYOUT_SIZE_SMALL, "small",
+            SCREENLAYOUT_SIZE_NORMAL, "normal",
+            SCREENLAYOUT_SIZE_LARGE, "large",
+            SCREENLAYOUT_SIZE_XLARGE, "xlarge");
+    private static final int TOUCHSCREEN_NOTOUCH = 1;
+    private static final int TOUCHSCREEN_FINGER = 3;
+    private static final Map<Integer, String> TOUCHSCREEN_VALUES = ImmutableMap.of(
+            TOUCHSCREEN_NOTOUCH, "notouch",
+            TOUCHSCREEN_FINGER, "finger");
+    private static final int UI_MODE_NIGHT_MASK = 0x30;
+    private static final int UI_MODE_NIGHT_NO = 0x10;
+    private static final int UI_MODE_NIGHT_YES = 0x20;
+    private static final Map<Integer, String> UI_MODE_NIGHT_VALUES = ImmutableMap.of(
+            UI_MODE_NIGHT_NO, "notnight",
+            UI_MODE_NIGHT_YES, "night");
+    private static final int UI_MODE_TYPE_MASK = 0x0F;
+    private static final int UI_MODE_TYPE_DESK = 0x02;
+    private static final int UI_MODE_TYPE_CAR = 0x03;
+    private static final int UI_MODE_TYPE_TELEVISION = 0x04;
+    private static final int UI_MODE_TYPE_APPLIANCE = 0x05;
+    private static final int UI_MODE_TYPE_WATCH = 0x06;
+    private static final int UI_MODE_TYPE_VR_HEADSET = 0x07;
+    // start - miui
+    private static final int UI_MODE_TYPE_GODZILLAUI = 0x0b;
+    private static final int UI_MODE_TYPE_SMALLUI = 0x0c;
+    private static final int UI_MODE_TYPE_MEDIUMUI = 0x0d;
+    private static final int UI_MODE_TYPE_LARGEUI = 0x0e;
+    private static final int UI_MODE_TYPE_HUGEUI = 0x0f;
+    private static final Map<Integer, String> UI_MODE_TYPE_VALUES =
+            ImmutableMap.<Integer, String>builder()
+                    .put(UI_MODE_TYPE_DESK, "desk")
+                    .put(UI_MODE_TYPE_CAR, "car")
+                    .put(UI_MODE_TYPE_TELEVISION, "television")
+                    .put(UI_MODE_TYPE_APPLIANCE, "appliance")
+                    .put(UI_MODE_TYPE_WATCH, "watch")
+                    .put(UI_MODE_TYPE_VR_HEADSET, "vrheadset")
+                    .put(UI_MODE_TYPE_GODZILLAUI, "godzillaui")
+                    .put(UI_MODE_TYPE_SMALLUI, "smallui")
+                    .put(UI_MODE_TYPE_MEDIUMUI, "mediumui")
+                    .put(UI_MODE_TYPE_LARGEUI, "largeui")
+                    .put(UI_MODE_TYPE_HUGEUI, "hugeui").build();
+    /**
+     * The minimum size in bytes that this configuration must be to contain screen config info.
+     */
+    private static final int SCREEN_CONFIG_MIN_SIZE = 32;
+    /**
+     * The minimum size in bytes that this configuration must be to contain screen dp info.
+     */
+    private static final int SCREEN_DP_MIN_SIZE = 36;
+    /**
+     * The minimum size in bytes that this configuration must be to contain locale info.
+     */
+    private static final int LOCALE_MIN_SIZE = 48;
+    /**
+     * The minimum size in bytes that this config must be to contain the screenConfig extension.
+     */
+    private static final int SCREEN_CONFIG_EXTENSION_MIN_SIZE = 52;
    private final int size;
    private final int mcc;
    private final int mnc;
@@ -53,9 +195,60 @@ public class BinaryResourceConfiguration implements SerializableResource {
    private final int screenHeightDp;
    private final byte[] localeScript;
    private final byte[] localeVariant;
+    // end - miui
    private final int screenLayout2;
    private final byte[] unknown;

+    private BinaryResourceConfiguration(int size,
+                                        int mcc,
+                                        int mnc,
+                                        byte[] language,
+                                        byte[] region,
+                                        int orientation,
+                                        int touchscreen,
+                                        int density,
+                                        int keyboard,
+                                        int navigation,
+                                        int inputFlags,
+                                        int screenWidth,
+                                        int screenHeight,
+                                        int sdkVersion,
+                                        int minorVersion,
+                                        int screenLayout,
+                                        int uiMode,
+                                        int smallestScreenWidthDp,
+                                        int screenWidthDp,
+                                        int screenHeightDp,
+                                        byte[] localeScript,
+                                        byte[] localeVariant,
+                                        int screenLayout2,
+                                        byte[] unknown) {
+        this.size = size;
+        this.mcc = mcc;
+        this.mnc = mnc;
+        this.language = language;
+        this.region = region;
+        this.orientation = orientation;
+        this.touchscreen = touchscreen;
+        this.density = density;
+        this.keyboard = keyboard;
+        this.navigation = navigation;
+        this.inputFlags = inputFlags;
+        this.screenWidth = screenWidth;
+        this.screenHeight = screenHeight;
+        this.sdkVersion = sdkVersion;
+        this.minorVersion = minorVersion;
+        this.screenLayout = screenLayout;
+        this.uiMode = uiMode;
+        this.smallestScreenWidthDp = smallestScreenWidthDp;
+        this.screenWidthDp = screenWidthDp;
+        this.screenHeightDp = screenHeightDp;
+        this.localeScript = localeScript;
+        this.localeVariant = localeVariant;
+        this.screenLayout2 = screenLayout2;
+        this.unknown = unknown;
+    }
+
    static BinaryResourceConfiguration create(ByteBuffer buffer) {
        int startPosition = buffer.position();  // The starting buffer position to calculate bytes read.
        int size = buffer.getInt();
@@ -121,245 +314,6 @@ public class BinaryResourceConfiguration implements SerializableResource {
                screenHeightDp, localeScript, localeVariant, screenLayout2, unknown);
    }

-    private BinaryResourceConfiguration(int size,
-                                        int mcc,
-                                        int mnc,
-                                        byte[] language,
-                                        byte[] region,
-                                        int orientation,
-                                        int touchscreen,
-                                        int density,
-                                        int keyboard,
-                                        int navigation,
-                                        int inputFlags,
-                                        int screenWidth,
-                                        int screenHeight,
-                                        int sdkVersion,
-                                        int minorVersion,
-                                        int screenLayout,
-                                        int uiMode,
-                                        int smallestScreenWidthDp,
-                                        int screenWidthDp,
-                                        int screenHeightDp,
-                                        byte[] localeScript,
-                                        byte[] localeVariant,
-                                        int screenLayout2,
-                                        byte[] unknown) {
-        this.size = size;
-        this.mcc = mcc;
-        this.mnc = mnc;
-        this.language = language;
-        this.region = region;
-        this.orientation = orientation;
-        this.touchscreen = touchscreen;
-        this.density = density;
-        this.keyboard = keyboard;
-        this.navigation = navigation;
-        this.inputFlags = inputFlags;
-        this.screenWidth = screenWidth;
-        this.screenHeight = screenHeight;
-        this.sdkVersion = sdkVersion;
-        this.minorVersion = minorVersion;
-        this.screenLayout = screenLayout;
-        this.uiMode = uiMode;
-        this.smallestScreenWidthDp = smallestScreenWidthDp;
-        this.screenWidthDp = screenWidthDp;
-        this.screenHeightDp = screenHeightDp;
-        this.localeScript = localeScript;
-        this.localeVariant = localeVariant;
-        this.screenLayout2 = screenLayout2;
-        this.unknown = unknown;
-    }
-
-    /**
-     * The different types of configs that can be present in a {@link BinaryResourceConfiguration}.
-     */
-    public enum Type {
-        MCC,
-        MNC,
-        LANGUAGE_STRING,
-        REGION_STRING,
-        SCREEN_LAYOUT_DIRECTION,
-        SMALLEST_SCREEN_WIDTH_DP,
-        SCREEN_WIDTH_DP,
-        SCREEN_HEIGHT_DP,
-        SCREEN_LAYOUT_SIZE,
-        SCREEN_LAYOUT_LONG,
-        SCREEN_LAYOUT_ROUND,
-        ORIENTATION,
-        UI_MODE_TYPE,
-        UI_MODE_NIGHT,
-        DENSITY_DPI,
-        TOUCHSCREEN,
-        KEYBOARD_HIDDEN,
-        KEYBOARD,
-        NAVIGATION_HIDDEN,
-        NAVIGATION,
-        SDK_VERSION
-    }
-
-    /**
-     * The below constants are from android.content.res.Configuration.
-     */
-    private static final int DENSITY_DPI_UNDEFINED = 0;
-    private static final int DENSITY_DPI_LDPI = 120;
-    private static final int DENSITY_DPI_MDPI = 160;
-    private static final int DENSITY_DPI_TVDPI = 213;
-    private static final int DENSITY_DPI_HDPI = 240;
-    private static final int DENSITY_DPI_XHDPI = 320;
-    private static final int DENSITY_DPI_XXHDPI = 480;
-    private static final int DENSITY_DPI_XXXHDPI = 640;
-    private static final int DENSITY_DPI_ANY = 0xFFFE;
-    private static final int DENSITY_DPI_NONE = 0xFFFF;
-    private static final Map<Integer, String> DENSITY_DPI_VALUES =
-            ImmutableMap.<Integer, String>builder()
-                    .put(DENSITY_DPI_UNDEFINED, "")
-                    .put(DENSITY_DPI_LDPI, "ldpi")
-                    .put(DENSITY_DPI_MDPI, "mdpi")
-                    .put(DENSITY_DPI_TVDPI, "tvdpi")
-                    .put(DENSITY_DPI_HDPI, "hdpi")
-                    .put(DENSITY_DPI_XHDPI, "xhdpi")
-                    .put(DENSITY_DPI_XXHDPI, "xxhdpi")
-                    .put(DENSITY_DPI_XXXHDPI, "xxxhdpi")
-                    .put(DENSITY_DPI_ANY, "anydpi")
-                    .put(DENSITY_DPI_NONE, "nodpi")
-                    .build();
-
-    private static final int KEYBOARD_NOKEYS = 1;
-    private static final int KEYBOARD_QWERTY = 2;
-    private static final int KEYBOARD_12KEY = 3;
-    private static final Map<Integer, String> KEYBOARD_VALUES = ImmutableMap.of(
-            KEYBOARD_NOKEYS, "nokeys",
-            KEYBOARD_QWERTY, "qwerty",
-            KEYBOARD_12KEY, "12key");
-
-    private static final int KEYBOARDHIDDEN_MASK = 0x03;
-    private static final int KEYBOARDHIDDEN_NO = 1;
-    private static final int KEYBOARDHIDDEN_YES = 2;
-    private static final int KEYBOARDHIDDEN_SOFT = 3;
-    private static final Map<Integer, String> KEYBOARDHIDDEN_VALUES = ImmutableMap.of(
-            KEYBOARDHIDDEN_NO, "keysexposed",
-            KEYBOARDHIDDEN_YES, "keyshidden",
-            KEYBOARDHIDDEN_SOFT, "keyssoft");
-
-    private static final int NAVIGATION_NONAV = 1;
-    private static final int NAVIGATION_DPAD = 2;
-    private static final int NAVIGATION_TRACKBALL = 3;
-    private static final int NAVIGATION_WHEEL = 4;
-    private static final Map<Integer, String> NAVIGATION_VALUES = ImmutableMap.of(
-            NAVIGATION_NONAV, "nonav",
-            NAVIGATION_DPAD, "dpad",
-            NAVIGATION_TRACKBALL, "trackball",
-            NAVIGATION_WHEEL, "wheel");
-
-    private static final int NAVIGATIONHIDDEN_MASK = 0x0C;
-    private static final int NAVIGATIONHIDDEN_NO = 0x04;
-    private static final int NAVIGATIONHIDDEN_YES = 0x08;
-    private static final Map<Integer, String> NAVIGATIONHIDDEN_VALUES = ImmutableMap.of(
-            NAVIGATIONHIDDEN_NO, "navexposed",
-            NAVIGATIONHIDDEN_YES, "navhidden");
-
-    private static final int ORIENTATION_PORTRAIT = 0x01;
-    private static final int ORIENTATION_LANDSCAPE = 0x02;
-    private static final Map<Integer, String> ORIENTATION_VALUES = ImmutableMap.of(
-            ORIENTATION_PORTRAIT, "port",
-            ORIENTATION_LANDSCAPE, "land");
-
-    private static final int SCREENLAYOUT_LAYOUTDIR_MASK = 0xC0;
-    private static final int SCREENLAYOUT_LAYOUTDIR_LTR = 0x40;
-    private static final int SCREENLAYOUT_LAYOUTDIR_RTL = 0x80;
-    private static final Map<Integer, String> SCREENLAYOUT_LAYOUTDIR_VALUES = ImmutableMap.of(
-            SCREENLAYOUT_LAYOUTDIR_LTR, "ldltr",
-            SCREENLAYOUT_LAYOUTDIR_RTL, "ldrtl");
-
-    private static final int SCREENLAYOUT_LONG_MASK = 0x30;
-    private static final int SCREENLAYOUT_LONG_NO = 0x10;
-    private static final int SCREENLAYOUT_LONG_YES = 0x20;
-    private static final Map<Integer, String> SCREENLAYOUT_LONG_VALUES = ImmutableMap.of(
-            SCREENLAYOUT_LONG_NO, "notlong",
-            SCREENLAYOUT_LONG_YES, "long");
-
-    private static final int SCREENLAYOUT_ROUND_MASK = 0x03;
-    private static final int SCREENLAYOUT_ROUND_NO = 0x01;
-    private static final int SCREENLAYOUT_ROUND_YES = 0x02;
-    private static final Map<Integer, String> SCREENLAYOUT_ROUND_VALUES = ImmutableMap.of(
-            SCREENLAYOUT_ROUND_NO, "notround",
-            SCREENLAYOUT_ROUND_YES, "round");
-
-    private static final int SCREENLAYOUT_SIZE_MASK = 0x0F;
-    private static final int SCREENLAYOUT_SIZE_SMALL = 0x01;
-    private static final int SCREENLAYOUT_SIZE_NORMAL = 0x02;
-    private static final int SCREENLAYOUT_SIZE_LARGE = 0x03;
-    private static final int SCREENLAYOUT_SIZE_XLARGE = 0x04;
-    private static final Map<Integer, String> SCREENLAYOUT_SIZE_VALUES = ImmutableMap.of(
-            SCREENLAYOUT_SIZE_SMALL, "small",
-            SCREENLAYOUT_SIZE_NORMAL, "normal",
-            SCREENLAYOUT_SIZE_LARGE, "large",
-            SCREENLAYOUT_SIZE_XLARGE, "xlarge");
-
-    private static final int TOUCHSCREEN_NOTOUCH = 1;
-    private static final int TOUCHSCREEN_FINGER = 3;
-    private static final Map<Integer, String> TOUCHSCREEN_VALUES = ImmutableMap.of(
-            TOUCHSCREEN_NOTOUCH, "notouch",
-            TOUCHSCREEN_FINGER, "finger");
-
-    private static final int UI_MODE_NIGHT_MASK = 0x30;
-    private static final int UI_MODE_NIGHT_NO = 0x10;
-    private static final int UI_MODE_NIGHT_YES = 0x20;
-    private static final Map<Integer, String> UI_MODE_NIGHT_VALUES = ImmutableMap.of(
-            UI_MODE_NIGHT_NO, "notnight",
-            UI_MODE_NIGHT_YES, "night");
-
-    private static final int UI_MODE_TYPE_MASK = 0x0F;
-    private static final int UI_MODE_TYPE_DESK = 0x02;
-    private static final int UI_MODE_TYPE_CAR = 0x03;
-    private static final int UI_MODE_TYPE_TELEVISION = 0x04;
-    private static final int UI_MODE_TYPE_APPLIANCE = 0x05;
-    private static final int UI_MODE_TYPE_WATCH = 0x06;
-    private static final int UI_MODE_TYPE_VR_HEADSET = 0x07;
-
-    // start - miui
-    private static final int UI_MODE_TYPE_GODZILLAUI = 0x0b;
-    private static final int UI_MODE_TYPE_SMALLUI = 0x0c;
-    private static final int UI_MODE_TYPE_MEDIUMUI = 0x0d;
-    private static final int UI_MODE_TYPE_LARGEUI = 0x0e;
-    private static final int UI_MODE_TYPE_HUGEUI = 0x0f;
-    // end - miui
-
-    private static final Map<Integer, String> UI_MODE_TYPE_VALUES =
-            ImmutableMap.<Integer, String>builder()
-                    .put(UI_MODE_TYPE_DESK, "desk")
-                    .put(UI_MODE_TYPE_CAR, "car")
-                    .put(UI_MODE_TYPE_TELEVISION, "television")
-                    .put(UI_MODE_TYPE_APPLIANCE, "appliance")
-                    .put(UI_MODE_TYPE_WATCH, "watch")
-                    .put(UI_MODE_TYPE_VR_HEADSET, "vrheadset")
-                    .put(UI_MODE_TYPE_GODZILLAUI, "godzillaui")
-                    .put(UI_MODE_TYPE_SMALLUI, "smallui")
-                    .put(UI_MODE_TYPE_MEDIUMUI, "mediumui")
-                    .put(UI_MODE_TYPE_LARGEUI, "largeui")
-                    .put(UI_MODE_TYPE_HUGEUI, "hugeui").build();
-
-    /**
-     * The minimum size in bytes that this configuration must be to contain screen config info.
-     */
-    private static final int SCREEN_CONFIG_MIN_SIZE = 32;
-
-    /**
-     * The minimum size in bytes that this configuration must be to contain screen dp info.
-     */
-    private static final int SCREEN_DP_MIN_SIZE = 36;
-
-    /**
-     * The minimum size in bytes that this configuration must be to contain locale info.
-     */
-    private static final int LOCALE_MIN_SIZE = 48;
-
-    /**
-     * The minimum size in bytes that this config must be to contain the screenConfig extension.
-     */
-    private static final int SCREEN_CONFIG_EXTENSION_MIN_SIZE = 52;
-
    /**
     * The number of bytes that this resource configuration takes up.
     */
@@ -708,7 +662,7 @@ public class BinaryResourceConfiguration implements SerializableResource {
        Map<Type, String> result = new LinkedHashMap<>();  // Preserve order for #toString().
        result.put(Type.MCC, mcc() != 0 ? "mcc" + mcc() : "");
        result.put(Type.MNC, mnc() != 0 ? "mnc" + mnc() : "");
-        result.put(Type.LANGUAGE_STRING, !languageString().isEmpty() ? "" + languageString() : "");
+        result.put(Type.LANGUAGE_STRING, !languageString().isEmpty() ? languageString() : "");
        result.put(Type.REGION_STRING, !regionString().isEmpty() ? "r" + regionString() : "");
        result.put(Type.SCREEN_LAYOUT_DIRECTION,
                getOrDefault(SCREENLAYOUT_LAYOUTDIR_VALUES, screenLayoutDirection(), ""));
@@ -742,4 +696,31 @@ public class BinaryResourceConfiguration implements SerializableResource {
        V value = map.get(key);
        return value != null ? value : defaultValue;
    }
+
+    /**
+     * The different types of configs that can be present in a {@link BinaryResourceConfiguration}.
+     */
+    public enum Type {
+        MCC,
+        MNC,
+        LANGUAGE_STRING,
+        REGION_STRING,
+        SCREEN_LAYOUT_DIRECTION,
+        SMALLEST_SCREEN_WIDTH_DP,
+        SCREEN_WIDTH_DP,
+        SCREEN_HEIGHT_DP,
+        SCREEN_LAYOUT_SIZE,
+        SCREEN_LAYOUT_LONG,
+        SCREEN_LAYOUT_ROUND,
+        ORIENTATION,
+        UI_MODE_TYPE,
+        UI_MODE_NIGHT,
+        DENSITY_DPI,
+        TOUCHSCREEN,
+        KEYBOARD_HIDDEN,
+        KEYBOARD,
+        NAVIGATION_HIDDEN,
+        NAVIGATION,
+        SDK_VERSION
+    }
 }
@@ -49,6 +49,12 @@ public class BinaryResourceIdentifier {
    private final int typeId;
    private final int entryId;

+    private BinaryResourceIdentifier(int packageId, int typeId, int entryId) {
+        this.packageId = packageId;
+        this.typeId = typeId;
+        this.entryId = entryId;
+    }
+
    /**
     * Returns a {@link BinaryResourceIdentifier} from a {@code resourceId} of the form 0xpptteeee.
     */
@@ -69,12 +75,6 @@ public class BinaryResourceIdentifier {
        return new BinaryResourceIdentifier(packageId, typeId, entryId);
    }

-    private BinaryResourceIdentifier(int packageId, int typeId, int entryId) {
-        this.packageId = packageId;
-        this.typeId = typeId;
-        this.entryId = entryId;
-    }
-
    /**
     * The (1-based) id of the {@link PackageChunk} containing this resource.
     */
@@ -31,24 +31,6 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 */
 public final class BinaryResourceString {

-    /**
-     * Type of {@link BinaryResourceString} to encode / decode.
-     */
-    public enum Type {
-        UTF8(UTF_8),
-        UTF16(UTF_16LE);
-
-        private final Charset charset;
-
-        Type(Charset charset) {
-            this.charset = charset;
-        }
-
-        public Charset charset() {
-            return charset;
-        }
-    }
-
    private BinaryResourceString() {
    } // Private constructor

@@ -166,4 +148,22 @@ public final class BinaryResourceString {
        }
        return length;
    }
+
+    /**
+     * Type of {@link BinaryResourceString} to encode / decode.
+     */
+    public enum Type {
+        UTF8(UTF_8),
+        UTF16(UTF_16LE);
+
+        private final Charset charset;
+
+        Type(Charset charset) {
+            this.charset = charset;
+        }
+
+        public Charset charset() {
+            return charset;
+        }
+    }
 }
@@ -31,6 +31,78 @@ import java.util.Objects;
 */
 public class BinaryResourceValue implements SerializableResource {

+    /**
+     * The serialized size in bytes of a {@link BinaryResourceValue}.
+     */
+    public static final int SIZE = 8;
+    public int size;
+    public Type type;
+    public int data;
+    public BinaryResourceValue(int size, Type type, int data) {
+        this.size = size;
+        this.type = type;
+        this.data = data;
+    }
+
+    public static BinaryResourceValue create(ByteBuffer buffer) {
+        int size = (buffer.getShort() & 0xFFFF);
+        buffer.get();  // Unused
+        Type type = Type.fromCode(buffer.get());
+        int data = buffer.getInt();
+        return new BinaryResourceValue(size, type, data);
+    }
+
+    /**
+     * The length in bytes of this value.
+     */
+    public int size() {
+        return size;
+    }
+
+    /**
+     * The raw data type of this value.
+     */
+    public Type type() {
+        return type;
+    }
+
+    /**
+     * The actual 4-byte value; interpretation of the value depends on {@code dataType}.
+     */
+    public int data() {
+        return data;
+    }
+
+    @Override
+    public byte[] toByteArray() {
+        return toByteArray(false);
+    }
+
+    @Override
+    public byte[] toByteArray(boolean shrink) {
+        ByteBuffer buffer = ByteBuffer.allocate(SIZE).order(ByteOrder.LITTLE_ENDIAN);
+        buffer.putShort((short) size());
+        buffer.put((byte) 0);  // Unused
+        buffer.put(type().code());
+        buffer.putInt(data());
+        return buffer.array();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        BinaryResourceValue that = (BinaryResourceValue) o;
+        return size == that.size &&
+                data == that.data &&
+                type == that.type;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(size, type, data);
+    }
+
    /**
     * Resource type codes.
     */
@@ -100,8 +172,6 @@ public class BinaryResourceValue implements SerializableResource {
         */
        INT_COLOR_RGB4(0x1f);

-        private final byte code;
-
        private static final Map<Byte, Type> FROM_BYTE;

        static {
@@ -112,90 +182,18 @@ public class BinaryResourceValue implements SerializableResource {
            FROM_BYTE = builder.build();
        }

+        private final byte code;
+
        Type(int code) {
            this.code = UnsignedBytes.checkedCast(code);
        }

-        public byte code() {
-            return code;
-        }
-
        public static Type fromCode(byte code) {
            return Preconditions.checkNotNull(FROM_BYTE.get(code), "Unknown resource type: %s", code);
        }
-    }

-    /**
-     * The serialized size in bytes of a {@link BinaryResourceValue}.
-     */
-    public static final int SIZE = 8;
-
-    public int size;
-    public Type type;
-    public int data;
-
-    public static BinaryResourceValue create(ByteBuffer buffer) {
-        int size = (buffer.getShort() & 0xFFFF);
-        buffer.get();  // Unused
-        Type type = Type.fromCode(buffer.get());
-        int data = buffer.getInt();
-        return new BinaryResourceValue(size, type, data);
-    }
-
-    public BinaryResourceValue(int size, Type type, int data) {
-        this.size = size;
-        this.type = type;
-        this.data = data;
-    }
-
-    /**
-     * The length in bytes of this value.
-     */
-    public int size() {
-        return size;
-    }
-
-    /**
-     * The raw data type of this value.
-     */
-    public Type type() {
-        return type;
-    }
-
-    /**
-     * The actual 4-byte value; interpretation of the value depends on {@code dataType}.
-     */
-    public int data() {
-        return data;
-    }
-
-    @Override
-    public byte[] toByteArray() {
-        return toByteArray(false);
-    }
-
-    @Override
-    public byte[] toByteArray(boolean shrink) {
-        ByteBuffer buffer = ByteBuffer.allocate(SIZE).order(ByteOrder.LITTLE_ENDIAN);
-        buffer.putShort((short) size());
-        buffer.put((byte) 0);  // Unused
-        buffer.put(type().code());
-        buffer.putInt(data());
-        return buffer.array();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        BinaryResourceValue that = (BinaryResourceValue) o;
-        return size == that.size &&
-                data == that.data &&
-                type == that.type;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(size, type, data);
+        public byte code() {
+            return code;
+        }
    }
 }
@@ -35,86 +35,36 @@ import java.util.Map;
 */
 public abstract class Chunk implements SerializableResource {

-    /**
-     * Types of chunks that can exist.
-     */
-    public enum Type {
-        NULL(0x0000),
-        STRING_POOL(0x0001),
-        TABLE(0x0002),
-        XML(0x0003),
-        XML_START_NAMESPACE(0x0100),
-        XML_END_NAMESPACE(0x0101),
-        XML_START_ELEMENT(0x0102),
-        XML_END_ELEMENT(0x0103),
-        XML_CDATA(0x0104),
-        XML_RESOURCE_MAP(0x0180),
-        TABLE_PACKAGE(0x0200),
-        TABLE_TYPE(0x0201),
-        TABLE_TYPE_SPEC(0x0202),
-        TABLE_LIBRARY(0x0203);
-
-        private final short code;
-
-        private static final Map<Short, Type> FROM_SHORT;
-
-        static {
-            Builder<Short, Type> builder = ImmutableMap.builder();
-            for (Type type : values()) {
-                builder.put(type.code(), type);
-            }
-            FROM_SHORT = builder.build();
-        }
-
-        Type(int code) {
-            this.code = Shorts.checkedCast(code);
-        }
-
-        public short code() {
-            return code;
-        }
-
-        public static Type fromCode(short code) {
-            return Preconditions.checkNotNull(FROM_SHORT.get(code), "Unknown chunk type: %s", code);
-        }
-    }
-
    /**
     * The byte boundary to pad chunks on.
     */
    public static final int PAD_BOUNDARY = 4;
-
    /**
     * The number of bytes in every chunk that describes chunk type, header size, and chunk size.
     */
    public static final int METADATA_SIZE = 8;
-
    /**
     * The offset in bytes, from the start of the chunk, where the chunk size can be found.
     */
    private static final int CHUNK_SIZE_OFFSET = 4;
-
+    /**
+     * Size of the chunk header in bytes.
+     */
+    protected final int headerSize;
+    /**
+     * headerSize + dataSize. The total size of this chunk.
+     */
+    protected final int chunkSize;
+    /**
+     * Offset of this chunk from the start of the file.
+     */
+    protected final int offset;
    /**
     * The parent to this chunk, if any.
     */
    @Nullable
    private final Chunk parent;

-    /**
-     * Size of the chunk header in bytes.
-     */
-    protected final int headerSize;
-
-    /**
-     * headerSize + dataSize. The total size of this chunk.
-     */
-    protected final int chunkSize;
-
-    /**
-     * Offset of this chunk from the start of the file.
-     */
-    protected final int offset;
-
    protected Chunk(ByteBuffer buffer, @Nullable Chunk parent) {
        this.parent = parent;
        offset = buffer.position() - 2;
@@ -122,6 +72,74 @@ public abstract class Chunk implements SerializableResource {
        chunkSize = buffer.getInt();
    }

+    /**
+     * Creates a new chunk whose contents start at {@code buffer}'s current position.
+     *
+     * @param buffer A buffer positioned at the start of a chunk.
+     * @return new chunk
+     */
+    public static Chunk newInstance(ByteBuffer buffer) {
+        return newInstance(buffer, null);
+    }
+
+    /**
+     * Creates a new chunk whose contents start at {@code buffer}'s current position.
+     *
+     * @param buffer A buffer positioned at the start of a chunk.
+     * @param parent The parent to this chunk (or null if there's no parent).
+     * @return new chunk
+     */
+    public static Chunk newInstance(ByteBuffer buffer, @Nullable Chunk parent) {
+        Chunk result;
+        Type type = Type.fromCode(buffer.getShort());
+        switch (type) {
+            case STRING_POOL:
+                result = new StringPoolChunk(buffer, parent);
+                break;
+            case TABLE:
+                result = new ResourceTableChunk(buffer, parent);
+                break;
+            case XML:
+                result = new XmlChunk(buffer, parent);
+                break;
+            case XML_START_NAMESPACE:
+                result = new XmlNamespaceStartChunk(buffer, parent);
+                break;
+            case XML_END_NAMESPACE:
+                result = new XmlNamespaceEndChunk(buffer, parent);
+                break;
+            case XML_START_ELEMENT:
+                result = new XmlStartElementChunk(buffer, parent);
+                break;
+            case XML_END_ELEMENT:
+                result = new XmlEndElementChunk(buffer, parent);
+                break;
+            case XML_CDATA:
+                result = new XmlCdataChunk(buffer, parent);
+                break;
+            case XML_RESOURCE_MAP:
+                result = new XmlResourceMapChunk(buffer, parent);
+                break;
+            case TABLE_PACKAGE:
+                result = new PackageChunk(buffer, parent);
+                break;
+            case TABLE_TYPE:
+                result = new TypeChunk(buffer, parent);
+                break;
+            case TABLE_TYPE_SPEC:
+                result = new TypeSpecChunk(buffer, parent);
+                break;
+            case TABLE_LIBRARY:
+                result = new LibraryChunk(buffer, parent);
+                break;
+            default:
+                result = new UnknownChunk(buffer, parent);
+        }
+        result.init(buffer);
+        result.seekToEndOfChunk(buffer);
+        return result;
+    }
+
    /**
     * Finishes initialization of a chunk. This should be called immediately after the constructor.
     * This is separate from the constructor so that the header of a chunk can be fully initialized
@@ -256,70 +274,46 @@ public abstract class Chunk implements SerializableResource {
    }

    /**
-     * Creates a new chunk whose contents start at {@code buffer}'s current position.
-     *
-     * @param buffer A buffer positioned at the start of a chunk.
-     * @return new chunk
+     * Types of chunks that can exist.
     */
-    public static Chunk newInstance(ByteBuffer buffer) {
-        return newInstance(buffer, null);
-    }
+    public enum Type {
+        NULL(0x0000),
+        STRING_POOL(0x0001),
+        TABLE(0x0002),
+        XML(0x0003),
+        XML_START_NAMESPACE(0x0100),
+        XML_END_NAMESPACE(0x0101),
+        XML_START_ELEMENT(0x0102),
+        XML_END_ELEMENT(0x0103),
+        XML_CDATA(0x0104),
+        XML_RESOURCE_MAP(0x0180),
+        TABLE_PACKAGE(0x0200),
+        TABLE_TYPE(0x0201),
+        TABLE_TYPE_SPEC(0x0202),
+        TABLE_LIBRARY(0x0203);

-    /**
-     * Creates a new chunk whose contents start at {@code buffer}'s current position.
-     *
-     * @param buffer A buffer positioned at the start of a chunk.
-     * @param parent The parent to this chunk (or null if there's no parent).
-     * @return new chunk
-     */
-    public static Chunk newInstance(ByteBuffer buffer, @Nullable Chunk parent) {
-        Chunk result;
-        Type type = Type.fromCode(buffer.getShort());
-        switch (type) {
-            case STRING_POOL:
-                result = new StringPoolChunk(buffer, parent);
-                break;
-            case TABLE:
-                result = new ResourceTableChunk(buffer, parent);
-                break;
-            case XML:
-                result = new XmlChunk(buffer, parent);
-                break;
-            case XML_START_NAMESPACE:
-                result = new XmlNamespaceStartChunk(buffer, parent);
-                break;
-            case XML_END_NAMESPACE:
-                result = new XmlNamespaceEndChunk(buffer, parent);
-                break;
-            case XML_START_ELEMENT:
-                result = new XmlStartElementChunk(buffer, parent);
-                break;
-            case XML_END_ELEMENT:
-                result = new XmlEndElementChunk(buffer, parent);
-                break;
-            case XML_CDATA:
-                result = new XmlCdataChunk(buffer, parent);
-                break;
-            case XML_RESOURCE_MAP:
-                result = new XmlResourceMapChunk(buffer, parent);
-                break;
-            case TABLE_PACKAGE:
-                result = new PackageChunk(buffer, parent);
-                break;
-            case TABLE_TYPE:
-                result = new TypeChunk(buffer, parent);
-                break;
-            case TABLE_TYPE_SPEC:
-                result = new TypeSpecChunk(buffer, parent);
-                break;
-            case TABLE_LIBRARY:
-                result = new LibraryChunk(buffer, parent);
-                break;
-            default:
-                result = new UnknownChunk(buffer, parent);
+        private static final Map<Short, Type> FROM_SHORT;
+
+        static {
+            Builder<Short, Type> builder = ImmutableMap.builder();
+            for (Type type : values()) {
+                builder.put(type.code(), type);
+            }
+            FROM_SHORT = builder.build();
+        }
+
+        private final short code;
+
+        Type(int code) {
+            this.code = Shorts.checkedCast(code);
+        }
+
+        public static Type fromCode(short code) {
+            return Preconditions.checkNotNull(FROM_SHORT.get(code), "Unknown chunk type: %s", code);
+        }
+
+        public short code() {
+            return code;
        }
-        result.init(buffer);
-        result.seekToEndOfChunk(buffer);
-        return result;
    }
 }
@@ -43,7 +43,7 @@ public final class LibraryChunk extends Chunk {
     */
    private final List<Entry> entries = new ArrayList<>();

-    protected LibraryChunk(ByteBuffer buffer, @Nullable Chunk parent) {
+    LibraryChunk(ByteBuffer buffer, @Nullable Chunk parent) {
        super(buffer, parent);
        entryCount = buffer.getInt();
    }
@@ -98,17 +98,17 @@ public final class LibraryChunk extends Chunk {
        private final int packageId;
        private final String packageName;

+        private Entry(int packageId, String packageName) {
+            this.packageId = packageId;
+            this.packageName = packageName;
+        }
+
        static Entry create(ByteBuffer buffer, int offset) {
            int packageId = buffer.getInt(offset);
            String packageName = PackageUtils.readPackageName(buffer, offset + 4);
            return new Entry(packageId, packageName);
        }

-        private Entry(int packageId, String packageName) {
-            this.packageId = packageId;
-            this.packageName = packageName;
-        }
-
        /**
         * The id assigned to the shared library at build time.
         */
@@ -43,58 +43,48 @@ public final class PackageChunk extends ChunkWithChunks {
     * Offset in bytes, from the start of the chunk, where {@code keyStringsOffset} can be found.
     */
    private static final int KEY_OFFSET_OFFSET = 276;
-
-    /**
-     * The package id if this is a base package, or 0 if not a base package.
-     */
-    private int id;
-
-    /**
-     * The name of the package.
-     */
-    private String packageName;
-
    /**
     * The offset (from {@code offset}) in the original buffer where type strings start.
     */
    private final int typeStringsOffset;
-
    /**
     * The index into the type string pool of the last public type.
     */
    private final int lastPublicType;
-
    /**
     * An offset to the string pool that contains the key strings for this package.
     */
    private final int keyStringsOffset;
-
    /**
     * The index into the key string pool of the last public key.
     */
    private final int lastPublicKey;
-
    /**
     * An offset to the type ID(s). This is undocumented in the original code.
     */
    private final int typeIdOffset;
-
    /**
     * Contains a mapping of a type index to its {@link TypeSpecChunk}.
     */
    private final Map<Integer, TypeSpecChunk> typeSpecs = new HashMap<>();
-
    /**
     * Contains a mapping of a type index to all of the {@link TypeChunk} with that index.
     */
    private final Multimap<Integer, TypeChunk> types = ArrayListMultimap.create();
-
+    /**
+     * The package id if this is a base package, or 0 if not a base package.
+     */
+    private int id;
+    /**
+     * The name of the package.
+     */
+    private String packageName;
    /**
     * May contain a library chunk for mapping dynamic references to resolved references.
     */
    private Optional<LibraryChunk> libraryChunk = Optional.empty();

-    protected PackageChunk(ByteBuffer buffer, @Nullable Chunk parent) {
+    PackageChunk(ByteBuffer buffer, @Nullable Chunk parent) {
        super(buffer, parent);
        id = buffer.getInt();
        packageName = PackageUtils.readPackageName(buffer, buffer.position());
@@ -36,17 +36,16 @@ import java.util.Map;
 */
 public final class ResourceTableChunk extends ChunkWithChunks {

+    /**
+     * The packages contained in this resource table.
+     */
+    private final Map<String, PackageChunk> packages = new HashMap<>();
    /**
     * A string pool containing all string resource values in the entire resource table.
     */
    private StringPoolChunk stringPool;

-    /**
-     * The packages contained in this resource table.
-     */
-    private final Map<String, PackageChunk> packages = new HashMap<>();
-
-    protected ResourceTableChunk(ByteBuffer buffer, @Nullable Chunk parent) {
+    ResourceTableChunk(ByteBuffer buffer, @Nullable Chunk parent) {
        super(buffer, parent);
        // packageCount. We ignore this, because we already know how many chunks we have.
        Preconditions.checkState(buffer.getInt() >= 1, "ResourceTableChunk package count was < 1.");
@@ -89,7 +89,7 @@ public final class StringPoolChunk extends Chunk {
     */
    private boolean isOriginalDeduped = false;

-    protected StringPoolChunk(ByteBuffer buffer, @Nullable Chunk parent) {
+    StringPoolChunk(ByteBuffer buffer, @Nullable Chunk parent) {
        super(buffer, parent);
        stringCount = buffer.getInt();
        styleCount = buffer.getInt();
@@ -310,6 +310,10 @@ public final class StringPoolChunk extends Chunk {
        static final int RES_STRING_POOL_SPAN_END = 0xFFFFFFFF;
        private final List<StringPoolSpan> spans;

+        private StringPoolStyle(List<StringPoolSpan> spans) {
+            this.spans = spans;
+        }
+
        static StringPoolStyle create(ByteBuffer buffer, int offset, StringPoolChunk parent) {
            Builder<StringPoolSpan> spans = ImmutableList.builder();
            int nameIndex = buffer.getInt(offset);
@@ -321,10 +325,6 @@ public final class StringPoolChunk extends Chunk {
            return new StringPoolStyle(spans.build());
        }

-        private StringPoolStyle(List<StringPoolSpan> spans) {
-            this.spans = spans;
-        }
-
        @Override
        public byte[] toByteArray() throws IOException {
            return toByteArray(false);
@@ -384,13 +384,6 @@ public final class StringPoolChunk extends Chunk {
        private final int stop;
        private final StringPoolChunk parent;

-        static StringPoolSpan create(ByteBuffer buffer, int offset, StringPoolChunk parent) {
-            int nameIndex = buffer.getInt(offset);
-            int start = buffer.getInt(offset + 4);
-            int stop = buffer.getInt(offset + 8);
-            return new StringPoolSpan(nameIndex, start, stop, parent);
-        }
-
        private StringPoolSpan(int nameIndex, int start, int stop, StringPoolChunk parent) {
            this.nameIndex = nameIndex;
            this.start = start;
@@ -398,6 +391,13 @@ public final class StringPoolChunk extends Chunk {
            this.parent = parent;
        }

+        static StringPoolSpan create(ByteBuffer buffer, int offset, StringPoolChunk parent) {
+            int nameIndex = buffer.getInt(offset);
+            int start = buffer.getInt(offset + 4);
+            int stop = buffer.getInt(offset + 8);
+            return new StringPoolSpan(nameIndex, start, stop, parent);
+        }
+
        @Override
        public final byte[] toByteArray() {
            return toByteArray(false);
@@ -52,18 +52,16 @@ public final class TypeChunk extends Chunk {
     * The offset (from {@code offset}) in the original buffer where {@code entries} start.
     */
    private final int entriesStart;
-
+    /**
+     * A sparse list of resource entries defined by this chunk.
+     */
+    private final Map<Integer, Entry> entries = new TreeMap<>();
    /**
     * The resource configuration that these resource entries correspond to.
     */
    private BinaryResourceConfiguration configuration;

-    /**
-     * A sparse list of resource entries defined by this chunk.
-     */
-    private final Map<Integer, Entry> entries = new TreeMap<>();
-
-    protected TypeChunk(ByteBuffer buffer, @Nullable Chunk parent) {
+    TypeChunk(ByteBuffer buffer, @Nullable Chunk parent) {
        super(buffer, parent);
        id = UnsignedBytes.toInt(buffer.get());
        buffer.position(buffer.position() + 3);  // Skip 3 bytes for packing
@@ -176,13 +174,13 @@ public final class TypeChunk extends Chunk {
        }
    }

-    protected String getString(int index) {
+    private String getString(int index) {
        ResourceTableChunk resourceTable = getResourceTableChunk();
        Preconditions.checkNotNull(resourceTable, "%s has no resource table.", getClass());
        return resourceTable.getStringPool().getString(index);
    }

-    protected String getKeyName(int index) {
+    private String getKeyName(int index) {
        PackageChunk packageChunk = getPackageChunk();
        Preconditions.checkNotNull(packageChunk, "%s has no parent package.", getClass());
        StringPoolChunk keyPool = packageChunk.getKeyStringPool();
@@ -190,7 +188,7 @@ public final class TypeChunk extends Chunk {
        return keyPool.getString(index);
    }

-    protected void updateKey(int index, String value) {
+    private void updateKey(int index, String value) {
        PackageChunk packageChunk = getPackageChunk();
        Preconditions.checkNotNull(packageChunk, "%s has no parent package.", getClass());
        StringPoolChunk keyPool = packageChunk.getKeyStringPool();
@@ -293,10 +291,10 @@ public final class TypeChunk extends Chunk {
        private final int headerSize;
        private final int flags;
        private final int keyIndex;
-        private BinaryResourceValue value;
-        private Map<Integer, BinaryResourceValue> values;
        private final int parentEntry;
        private final TypeChunk parent;
+        private BinaryResourceValue value;
+        private final Map<Integer, BinaryResourceValue> values;

        private Entry(int headerSize,
                      int flags,
@@ -314,6 +312,52 @@ public final class TypeChunk extends Chunk {
            this.parent = parent;
        }

+        /**
+         * Creates a new {@link Entry} whose contents start at the 0-based position in
+         * {@code buffer} given by a 4-byte value read from {@code buffer} and then added to
+         * {@code baseOffset}. If the value read from {@code buffer} is equal to {@link #NO_ENTRY}, then
+         * null is returned as there is no resource at that position.
+         *
+         * <p>Otherwise, this position is parsed and returned as an {@link Entry}.
+         *
+         * @param buffer     A buffer positioned at an offset to an {@link Entry}.
+         * @param baseOffset Offset that must be added to the value at {@code buffer}'s position.
+         * @param parent     The {@link TypeChunk} that this resource entry belongs to.
+         * @return New {@link Entry} or null if there is no resource at this location.
+         */
+        @Nullable
+        public static Entry create(ByteBuffer buffer, int baseOffset, TypeChunk parent) {
+            int offset = buffer.getInt();
+            if (offset == NO_ENTRY) {
+                return null;
+            }
+            int position = buffer.position();
+            buffer.position(baseOffset + offset);  // Set buffer position to resource entry start
+            Entry result = newInstance(buffer, parent);
+            buffer.position(position);  // Restore buffer position
+            return result;
+        }
+
+        @Nullable
+        private static Entry newInstance(ByteBuffer buffer, TypeChunk parent) {
+            int headerSize = buffer.getShort() & 0xFFFF;
+            int flags = buffer.getShort() & 0xFFFF;
+            int keyIndex = buffer.getInt();
+            BinaryResourceValue value = null;
+            Map<Integer, BinaryResourceValue> values = new LinkedHashMap<>();
+            int parentEntry = 0;
+            if ((flags & FLAG_COMPLEX) != 0) {
+                parentEntry = buffer.getInt();
+                int valueCount = buffer.getInt();
+                for (int i = 0; i < valueCount; ++i) {
+                    values.put(buffer.getInt(), BinaryResourceValue.create(buffer));
+                }
+            } else {
+                value = BinaryResourceValue.create(buffer);
+            }
+            return new Entry(headerSize, flags, keyIndex, value, values, parentEntry, parent);
+        }
+
        /**
         * Number of bytes in the header of the {@link Entry}.
         */
@@ -422,52 +466,6 @@ public final class TypeChunk extends Chunk {
            return (flags() & FLAG_COMPLEX) != 0;
        }

-        /**
-         * Creates a new {@link Entry} whose contents start at the 0-based position in
-         * {@code buffer} given by a 4-byte value read from {@code buffer} and then added to
-         * {@code baseOffset}. If the value read from {@code buffer} is equal to {@link #NO_ENTRY}, then
-         * null is returned as there is no resource at that position.
-         *
-         * <p>Otherwise, this position is parsed and returned as an {@link Entry}.
-         *
-         * @param buffer     A buffer positioned at an offset to an {@link Entry}.
-         * @param baseOffset Offset that must be added to the value at {@code buffer}'s position.
-         * @param parent     The {@link TypeChunk} that this resource entry belongs to.
-         * @return New {@link Entry} or null if there is no resource at this location.
-         */
-        @Nullable
-        public static Entry create(ByteBuffer buffer, int baseOffset, TypeChunk parent) {
-            int offset = buffer.getInt();
-            if (offset == NO_ENTRY) {
-                return null;
-            }
-            int position = buffer.position();
-            buffer.position(baseOffset + offset);  // Set buffer position to resource entry start
-            Entry result = newInstance(buffer, parent);
-            buffer.position(position);  // Restore buffer position
-            return result;
-        }
-
-        @Nullable
-        private static Entry newInstance(ByteBuffer buffer, TypeChunk parent) {
-            int headerSize = buffer.getShort() & 0xFFFF;
-            int flags = buffer.getShort() & 0xFFFF;
-            int keyIndex = buffer.getInt();
-            BinaryResourceValue value = null;
-            Map<Integer, BinaryResourceValue> values = new LinkedHashMap<>();
-            int parentEntry = 0;
-            if ((flags & FLAG_COMPLEX) != 0) {
-                parentEntry = buffer.getInt();
-                int valueCount = buffer.getInt();
-                for (int i = 0; i < valueCount; ++i) {
-                    values.put(buffer.getInt(), BinaryResourceValue.create(buffer));
-                }
-            } else {
-                value = BinaryResourceValue.create(buffer);
-            }
-            return new Entry(headerSize, flags, keyIndex, value, values, parentEntry, parent);
-        }
-
        @Override
        public final byte[] toByteArray() {
            return toByteArray(false);
@@ -39,7 +39,7 @@ public final class TypeSpecChunk extends Chunk {
     */
    private final int[] resources;

-    protected TypeSpecChunk(ByteBuffer buffer, @Nullable Chunk parent) {
+    TypeSpecChunk(ByteBuffer buffer, @Nullable Chunk parent) {
        super(buffer, parent);
        id = UnsignedBytes.toInt(buffer.get());
        buffer.position(buffer.position() + 3);  // Skip 3 bytes for packing
@@ -34,7 +34,7 @@ public final class UnknownChunk extends Chunk {

    private final byte[] payload;

-    protected UnknownChunk(ByteBuffer buffer, @Nullable Chunk parent) {
+    UnknownChunk(ByteBuffer buffer, @Nullable Chunk parent) {
        super(buffer, parent);

        type = Type.fromCode(buffer.getShort(offset));
@@ -36,6 +36,18 @@ public class XmlAttribute implements SerializableResource {
    private final BinaryResourceValue typedValue;
    private final XmlNodeChunk parent;

+    private XmlAttribute(int namespaceIndex,
+                         int nameIndex,
+                         int rawValueIndex,
+                         BinaryResourceValue typedValue,
+                         XmlNodeChunk parent) {
+        this.namespaceIndex = namespaceIndex;
+        this.nameIndex = nameIndex;
+        this.rawValueIndex = rawValueIndex;
+        this.typedValue = typedValue;
+        this.parent = parent;
+    }
+
    /**
     * Creates a new {@link XmlAttribute} based on the bytes at the current {@code buffer} position.
     *
@@ -50,18 +62,6 @@ public class XmlAttribute implements SerializableResource {
        return new XmlAttribute(namespace, name, rawValue, typedValue, parent);
    }

-    private XmlAttribute(int namespaceIndex,
-                         int nameIndex,
-                         int rawValueIndex,
-                         BinaryResourceValue typedValue,
-                         XmlNodeChunk parent) {
-        this.namespaceIndex = namespaceIndex;
-        this.nameIndex = nameIndex;
-        this.rawValueIndex = rawValueIndex;
-        this.typedValue = typedValue;
-        this.parent = parent;
-    }
-
    /**
     * A string reference to the namespace URI, or -1 if not present.
     */
@@ -37,7 +37,7 @@ public final class XmlCdataChunk extends XmlNodeChunk {
     */
    private final BinaryResourceValue binaryResourceValue;

-    protected XmlCdataChunk(ByteBuffer buffer, @Nullable Chunk parent) {
+    XmlCdataChunk(ByteBuffer buffer, @Nullable Chunk parent) {
        super(buffer, parent);
        rawValue = buffer.getInt();
        binaryResourceValue = BinaryResourceValue.create(buffer);
@@ -28,7 +28,7 @@ import java.nio.ByteBuffer;
 */
 public final class XmlChunk extends ChunkWithChunks {

-    protected XmlChunk(ByteBuffer buffer, @Nullable Chunk parent) {
+    XmlChunk(ByteBuffer buffer, @Nullable Chunk parent) {
        super(buffer, parent);
    }

@@ -37,7 +37,7 @@ public final class XmlEndElementChunk extends XmlNodeChunk {
     */
    private final int name;

-    protected XmlEndElementChunk(ByteBuffer buffer, @Nullable Chunk parent) {
+    XmlEndElementChunk(ByteBuffer buffer, @Nullable Chunk parent) {
        super(buffer, parent);
        namespace = buffer.getInt();
        name = buffer.getInt();
@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
 */
 public final class XmlNamespaceEndChunk extends XmlNamespaceChunk {

-    protected XmlNamespaceEndChunk(ByteBuffer buffer, @Nullable Chunk parent) {
+    XmlNamespaceEndChunk(ByteBuffer buffer, @Nullable Chunk parent) {
        super(buffer, parent);
    }

@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
 */
 public final class XmlNamespaceStartChunk extends XmlNamespaceChunk {

-    protected XmlNamespaceStartChunk(ByteBuffer buffer, @Nullable Chunk parent) {
+    XmlNamespaceStartChunk(ByteBuffer buffer, @Nullable Chunk parent) {
        super(buffer, parent);
    }

@@ -71,7 +71,7 @@ public final class XmlStartElementChunk extends XmlNodeChunk {
     */
    private final List<XmlAttribute> attributes = new ArrayList<>();

-    protected XmlStartElementChunk(ByteBuffer buffer, @Nullable Chunk parent) {
+    XmlStartElementChunk(ByteBuffer buffer, @Nullable Chunk parent) {
        super(buffer, parent);
        namespace = buffer.getInt();
        name = buffer.getInt();
@@ -25,7 +25,7 @@ public class AudioGetLyrics extends ApiRequest<AudioGetLyrics.a> {
    public a a(@NonNull JSONObject jSONObject) {
        var aVar = new a();

-        if (Preferences.getBoolValue("useGenius", false)) {
+        if (Preferences.getBoolValue("useGenius", false) && !Preferences.serverFeaturesDisable()) {
            aVar.a = Genius.getTextMusic(musicTrack);
            return aVar;
        }
@@ -7,16 +7,6 @@ import org.json.JSONException;
 import org.json.JSONObject;

 public class GiftGetByStickerId extends ApiRequest<GiftGetByStickerId.a> {
-    public static class a {
-        public final int a;
-        public final CatalogedGift b;
-
-        public a(int i, CatalogedGift catalogedGift) {
-            this.a = i;
-            this.b = catalogedGift;
-        }
-    }
-
    public GiftGetByStickerId(Context context, int i) {
        super("execute.getGiftByStickerId");
        b("sticker_id", i);
@@ -30,4 +20,14 @@ public class GiftGetByStickerId extends ApiRequest<GiftGetByStickerId.a> {
        return new a(jSONObject2.optInt("balance"),
                new CatalogedGift(jSONObject2.getJSONObject("gift")));
    }
+
+    public static class a {
+        public final int a;
+        public final CatalogedGift b;
+
+        public a(int i, CatalogedGift catalogedGift) {
+            this.a = i;
+            this.b = catalogedGift;
+        }
+    }
 }
@@ -27,6 +27,15 @@ public class RecoloredDrawable extends Drawable implements Drawable.Callback {
        onStateChange(new int[0]);
    }

+    public RecoloredDrawable(Drawable drawable, int i) {
+        this(drawable, new ColorStateList(new int[][]{new int[0]}, new int[]{i}));
+    }
+
+    public RecoloredDrawable() {
+        this.c = 255;
+        this.d = 255;
+    }
+
    public void a(int i) {
        a(new ColorStateList(new int[][]{new int[0]}, new int[]{i}));
    }
@@ -120,13 +129,4 @@ public class RecoloredDrawable extends Drawable implements Drawable.Callback {
    public Drawable a() {
        return this.drawable;
    }
-
-    public RecoloredDrawable(Drawable drawable, int i) {
-        this(drawable, new ColorStateList(new int[][]{new int[0]}, new int[]{i}));
-    }
-
-    public RecoloredDrawable() {
-        this.c = 255;
-        this.d = 255;
-    }
 }
@@ -21,6 +21,13 @@ public final class VerifyInfoHelper {
    public static final VerifyInfoHelper h;
    public static int devIcon = R.drawable.ic_favorite_16;

+    static {
+        h = new VerifyInfoHelper();
+    }
+
+    private VerifyInfoHelper() {
+    }
+
    public static Integer enumSwitchMapping(VerifyInfoHelper.ColorTheme color) {
        return switch (color) {
            case normal -> 1;
@@ -30,18 +37,47 @@ public final class VerifyInfoHelper {
        };
    }

-    public enum ColorTheme {
-        white,
-        normal,
-        light,
-        ultraLight
+    public static Drawable b(VerifyInfoHelper verifyInfoHelper, boolean z, boolean z2, boolean dev, Context context, ColorTheme colorTheme, int i, Object obj) {
+        if ((i & 8) != 0) {
+            colorTheme = ColorTheme.normal;
+        }
+        return verifyInfoHelper.b(z, z2, dev, context, colorTheme);
    }

-    static {
-        h = new VerifyInfoHelper();
+    public static Drawable b(VerifyInfoHelper verifyInfoHelper, VerifyInfo verifyInfo, Context context, ColorTheme colorTheme, int i, Object obj) {
+        return b(verifyInfoHelper, verifyInfo.u1(), verifyInfo.t1(), verifyInfo.dev(), context, colorTheme, i, obj);
    }

-    private VerifyInfoHelper() {
+    public static Drawable b(VerifyInfoHelper verifyInfoHelper, boolean z, boolean z2, Context context, ColorTheme colorTheme, int i, Object obj) {
+        return b(verifyInfoHelper, z, z2, false, context, colorTheme, i, obj);
+    }
+
+    public static Drawable a(VerifyInfoHelper verifyInfoHelper, VerifyInfo verifyInfo, Context context, ColorTheme colorTheme, int i, Object obj) {
+        if ((i & 4) != 0) {
+            colorTheme = ColorTheme.normal;
+        }
+        return verifyInfoHelper.b(verifyInfo, context, colorTheme);
+    }
+
+    public static Drawable a(VerifyInfoHelper verifyInfoHelper, boolean z, boolean z2, boolean dev, Context context, ColorTheme colorTheme, int i, Object obj) {
+        if ((i & 8) != 0) {
+            colorTheme = ColorTheme.normal;
+        }
+        return verifyInfoHelper.a(z, z2, dev, context, colorTheme);
+    }
+
+    public static Drawable a(VerifyInfoHelper verifyInfoHelper, boolean z, boolean z2, Context context, ColorTheme colorTheme, int i, Object obj) {
+        return a(verifyInfoHelper, z, z2, false, context, colorTheme, i, obj);
+    }
+
+    public static void a(VerifyInfoHelper verifyInfoHelper, TextView textView, VerifyInfo verifyInfo, boolean z, ColorTheme colorTheme, int i, Object obj) {
+        if ((i & 4) != 0) {
+            z = false;
+        }
+        if ((i & 8) != 0) {
+            colorTheme = ColorTheme.normal;
+        }
+        verifyInfoHelper.a(textView, verifyInfo, z, colorTheme);
    }

    private int a() {
@@ -89,7 +125,6 @@ public final class VerifyInfoHelper {
        return b(this, z, z2, false, context, null, 8, null);
    }

-
    public int b(ColorTheme colorTheme) {
        return a(colorTheme);
    }
@@ -104,7 +139,6 @@ public final class VerifyInfoHelper {
        };
    }

-
    public Drawable b(Context context, VerifyInfo verifyInfo) {
        if (verifyInfo.dev()) {
            return new RecoloredDrawable(ContextCompat.getDrawable(context, devIcon), c(ColorTheme.normal));
@@ -123,21 +157,6 @@ public final class VerifyInfoHelper {
        return b(verifyInfo.u1(), verifyInfo.t1(), verifyInfo.dev(), context, colorTheme);
    }

-    public static Drawable b(VerifyInfoHelper verifyInfoHelper, boolean z, boolean z2, boolean dev, Context context, ColorTheme colorTheme, int i, Object obj) {
-        if ((i & 8) != 0) {
-            colorTheme = ColorTheme.normal;
-        }
-        return verifyInfoHelper.b(z, z2, dev, context, colorTheme);
-    }
-
-    public static Drawable b(VerifyInfoHelper verifyInfoHelper, VerifyInfo verifyInfo, Context context, ColorTheme colorTheme, int i, Object obj) {
-        return b(verifyInfoHelper, verifyInfo.u1(), verifyInfo.t1(), verifyInfo.dev(), context, colorTheme, i, obj);
-    }
-
-    public static Drawable b(VerifyInfoHelper verifyInfoHelper, boolean z, boolean z2, Context context, ColorTheme colorTheme, int i, Object obj) {
-        return b(verifyInfoHelper, z, z2, false, context, colorTheme, i, obj);
-    }
-
    public Drawable a(Context context, VerifyInfo verifyInfo) {
        if (verifyInfo.dev()) {
            return new RecoloredDrawable(ContextCompat.getDrawable(context, devIcon), c(ColorTheme.normal));
@@ -181,28 +200,10 @@ public final class VerifyInfoHelper {
        return new RecoloredDrawable(ContextCompat.getDrawable(context, i), c2);
    }

-    public static Drawable a(VerifyInfoHelper verifyInfoHelper, VerifyInfo verifyInfo, Context context, ColorTheme colorTheme, int i, Object obj) {
-        if ((i & 4) != 0) {
-            colorTheme = ColorTheme.normal;
-        }
-        return verifyInfoHelper.b(verifyInfo, context, colorTheme);
-    }
-
    public Drawable a(VerifyInfo verifyInfo, Context context, ColorTheme colorTheme) {
        return a(verifyInfo.u1(), verifyInfo.t1(), verifyInfo.dev(), context, colorTheme);
    }

-    public static Drawable a(VerifyInfoHelper verifyInfoHelper, boolean z, boolean z2, boolean dev, Context context, ColorTheme colorTheme, int i, Object obj) {
-        if ((i & 8) != 0) {
-            colorTheme = ColorTheme.normal;
-        }
-        return verifyInfoHelper.a(z, z2, dev, context, colorTheme);
-    }
-
-    public static Drawable a(VerifyInfoHelper verifyInfoHelper, boolean z, boolean z2, Context context, ColorTheme colorTheme, int i, Object obj) {
-        return a(verifyInfoHelper, z, z2, false, context, colorTheme, i, obj);
-    }
-
    public Drawable a(boolean z, boolean z2, Context context, ColorTheme colorTheme) {
        return a(z, z2, false, context, colorTheme);
    }
@@ -230,16 +231,6 @@ public final class VerifyInfoHelper {
        return new RecoloredDrawable(ContextCompat.getDrawable(context, i), c2);
    }

-    public static void a(VerifyInfoHelper verifyInfoHelper, TextView textView, VerifyInfo verifyInfo, boolean z, ColorTheme colorTheme, int i, Object obj) {
-        if ((i & 4) != 0) {
-            z = false;
-        }
-        if ((i & 8) != 0) {
-            colorTheme = ColorTheme.normal;
-        }
-        verifyInfoHelper.a(textView, verifyInfo, z, colorTheme);
-    }
-
    public void a(TextView textView, VerifyInfo verifyInfo, boolean z, ColorTheme colorTheme) {
        Drawable drawable;
        Context context = textView.getContext();
@@ -267,4 +258,11 @@ public final class VerifyInfoHelper {
        }
        ViewExtKt.p(imageView);
    }
+
+    public enum ColorTheme {
+        white,
+        normal,
+        light,
+        ultraLight
+    }
 }
@@ -31,30 +31,6 @@ public final class DialogGetMentionSuggestionCmd extends BaseImEngineCmd<Suggest
    private final boolean e;
    private final Object f;

-    public static final class a<T> implements Comparator<Member> {
-        List a;
-
-        a(List list) {
-            this.a = list;
-        }
-
-        @Override // java.util.Comparator
-        /* renamed from: a */
-        public int compare(Member member, Member member2) {
-            int indexOf = this.a.indexOf(member);
-            int indexOf2 = this.a.indexOf(member2);
-            int i = indexOf;
-            if (indexOf < 0) {
-                i = Integer.MAX_VALUE;
-            }
-            int i2 = indexOf2;
-            if (indexOf2 < 0) {
-                i2 = Integer.MAX_VALUE;
-            }
-            return Intrinsics.a(i, i2);
-        }
-    }
-
    public DialogGetMentionSuggestionCmd(int i, String str, Source source, boolean z, Object obj) {
        this.f2365b = i;
        this.c = str;
@@ -150,7 +126,7 @@ public final class DialogGetMentionSuggestionCmd extends BaseImEngineCmd<Suggest
        Collection<Member> a2;
        Source source;
        if (ImDialogsUtils.d(this.f2365b) != PeerType.CHAT) {
-            return new Suggestion((EntityValue) null, (ProfilesInfo) null);
+            return new Suggestion(null, null);
        }
        Member Z = imEnvironment.Z();
        int d = imEnvironment.a0().n().d();
@@ -235,4 +211,28 @@ public final class DialogGetMentionSuggestionCmd extends BaseImEngineCmd<Suggest
    public String toString() {
        return "DialogGetMentionSuggestionCmd(dialogId=" + this.f2365b + ", query=" + this.c + ", source=" + this.d + ", isAwaitNetwork=" + this.e + ", changerTag=" + this.f + ")";
    }
+
+    public static final class a<T> implements Comparator<Member> {
+        List a;
+
+        a(List list) {
+            this.a = list;
+        }
+
+        @Override // java.util.Comparator
+        /* renamed from: a */
+        public int compare(Member member, Member member2) {
+            int indexOf = this.a.indexOf(member);
+            int indexOf2 = this.a.indexOf(member2);
+            int i = indexOf;
+            if (indexOf < 0) {
+                i = Integer.MAX_VALUE;
+            }
+            int i2 = indexOf2;
+            if (indexOf2 < 0) {
+                i2 = Integer.MAX_VALUE;
+            }
+            return Intrinsics.a(i, i2);
+        }
+    }
 }
@@ -19,7 +19,7 @@ import java.util.List;
 public final class DialogActionsHelper {
    public static final DialogActionsHelper a = new DialogActionsHelper();

-    public final List<DialogAction> a(ImConfig imConfig, Dialog dialog, ProfilesSimpleInfo profilesSimpleInfo) {
+    public List<DialogAction> a(ImConfig imConfig, Dialog dialog, ProfilesSimpleInfo profilesSimpleInfo) {
        if (dialog != null && profilesSimpleInfo != null) {
            long b2 = TimeProvider.f.b();
            ChatSettings z1 = dialog.z1();
@@ -84,7 +84,7 @@ public final class DialogActionsHelper {
        return new ArrayList<>();
    }

-    public final List<DialogAction> a(Dialog dialog, ProfilesSimpleInfo profilesSimpleInfo) {
+    public List<DialogAction> a(Dialog dialog, ProfilesSimpleInfo profilesSimpleInfo) {
        long b2 = TimeProvider.f.b();
        Profile profile = profilesSimpleInfo.get(dialog.getId());

@@ -138,7 +138,7 @@ public final class DialogActionsHelper {
        return arrayList;
    }

-    public final boolean a(Dialog dialog) {
+    public boolean a(Dialog dialog) {
        if (dialog.V1() || !dialog.y1()) {
            return false;
        }
@@ -16,11 +16,11 @@ import java.util.List;
 public final class MsgActionHelper {
    public static final MsgActionHelper a = new MsgActionHelper();

-    public final List<MsgAction> a(ImEngine imEngine, Dialog dialog, Collection<? extends Msg> collection) {
+    public List<MsgAction> a(ImEngine imEngine, Dialog dialog, Collection<? extends Msg> collection) {
        return a(imEngine != null ? imEngine.g() : null, dialog, collection);
    }

-    public final List<MsgAction> a(ImConfig imConfig, Dialog dialog, Collection<? extends Msg> collection) {
+    public List<MsgAction> a(ImConfig imConfig, Dialog dialog, Collection<? extends Msg> collection) {
        if (imConfig != null && dialog != null && collection != null) {
            MsgPermissionHelper.a aVar = new MsgPermissionHelper.a(imConfig, dialog, collection);
            ArrayList<MsgAction> arrayList = new ArrayList<>();
@@ -74,11 +74,7 @@ public class VhBindArgs {

    private boolean L() {
        boolean var1;
-        if (this.K() <= this.m && !TimeProvider.f.c()) {
-            var1 = false;
-        } else {
-            var1 = true;
-        }
+        var1 = this.K() > this.m || TimeProvider.f.c();

        return var1;
    }
@@ -109,11 +105,7 @@ public class VhBindArgs {
    public boolean B() {
        AdapterEntry var1 = this.a;
        boolean var2;
-        if (var1 != null && var1.c()) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 != null && var1.c();

        return var2;
    }
@@ -121,11 +113,7 @@ public class VhBindArgs {
    public boolean C() {
        AdapterEntry var1 = this.a;
        boolean var2;
-        if (var1 != null && var1.c() && this.a.c.getLocalId() == this.b.c.getLocalId()) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 != null && var1.c() && this.a.c.getLocalId() == this.b.c.getLocalId();

        return var2;
    }
@@ -133,11 +121,7 @@ public class VhBindArgs {
    public boolean D() {
        AdapterEntry var1 = this.a;
        boolean var2;
-        if (var1 != null && var1.a == 83) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 != null && var1.a == 83;

        return var2;
    }
@@ -145,11 +129,7 @@ public class VhBindArgs {
    public boolean E() {
        Msg var1 = this.b.c;
        boolean var2;
-        if (var1 instanceof MsgFromUser && ((MsgFromUser) var1).i2()) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 instanceof MsgFromUser && ((MsgFromUser) var1).i2();

        return var2;
    }
@@ -157,11 +137,7 @@ public class VhBindArgs {
    public boolean F() {
        Msg var1 = this.b.c;
        boolean var2;
-        if (var1 instanceof MsgFromUser && ((MsgFromUser) var1).F0()) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 instanceof MsgFromUser && ((MsgFromUser) var1).F0();

        return var2;
    }
@@ -169,11 +145,7 @@ public class VhBindArgs {
    public boolean G() {
        AdapterEntry var1 = this.b;
        boolean var2;
-        if (var1 != null && var1.a == 51) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 != null && var1.a == 51;

        return var2;
    }
@@ -186,11 +158,7 @@ public class VhBindArgs {
        long var1 = this.K();
        long var3 = this.m;
        boolean var5;
-        if (var1 > var3 && var1 < var3 * 2L) {
-            var5 = true;
-        } else {
-            var5 = false;
-        }
+        var5 = var1 > var3 && var1 < var3 * 2L;

        return var5;
    }
@@ -206,18 +174,10 @@ public class VhBindArgs {
            MsgFromUser var7 = (MsgFromUser) var1;
            Msg var3 = this.a.c;
            boolean var4;
-            if (var3 != null && var3.d() == MsgSyncState.DONE) {
-                var4 = true;
-            } else {
-                var4 = false;
-            }
+            var4 = var3 != null && var3.d() == MsgSyncState.DONE;

            boolean var5;
-            if (this.o == ImBgSyncState.CONNECTED) {
-                var5 = true;
-            } else {
-                var5 = false;
-            }
+            var5 = this.o == ImBgSyncState.CONNECTED;

            boolean var6 = var2;
            if (!var7.H0()) {
@@ -242,7 +202,7 @@ public class VhBindArgs {
        byte var2 = 0;
        int var3 = var2;
        if (var1) {
-            AttachAudioMsg var4 = (AttachAudioMsg) ((MsgFromUser) this.b.c).c(AttachAudioMsg.class, false);
+            AttachAudioMsg var4 = ((MsgFromUser) this.b.c).c(AttachAudioMsg.class, false);
            var3 = var2;
            if (var4 != null) {
                var3 = var4.f();
@@ -267,11 +227,7 @@ public class VhBindArgs {
    public boolean c() {
        Msg var1 = this.b.c;
        boolean var2;
-        if (var1 instanceof MsgFromUser && ((MsgFromUser) var1).I0()) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 instanceof MsgFromUser && ((MsgFromUser) var1).I0();

        return var2;
    }
@@ -279,22 +235,14 @@ public class VhBindArgs {
    public boolean d() {
        Msg var1 = this.b.c;
        boolean var2;
-        if (var1 instanceof WithUserContent && ((WithUserContent) var1).D0() != null) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 instanceof WithUserContent && ((WithUserContent) var1).D0() != null;

        return var2;
    }

    public boolean e() {
        boolean var1;
-        if (this.b.i > 0) {
-            var1 = true;
-        } else {
-            var1 = false;
-        }
+        var1 = this.b.i > 0;

        return var1;
    }
@@ -317,11 +265,7 @@ public class VhBindArgs {
    public boolean g() {
        Msg var1 = this.b.c;
        boolean var2;
-        if (var1 instanceof MsgFromUser && ((MsgFromUser) var1).G0()) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 instanceof MsgFromUser && ((MsgFromUser) var1).G0();

        return var2;
    }
@@ -329,33 +273,21 @@ public class VhBindArgs {
    public boolean h() {
        Msg var1 = this.b.c;
        boolean var2;
-        if (var1 instanceof MsgFromUser && ((MsgFromUser) var1).Z1()) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 instanceof MsgFromUser && ((MsgFromUser) var1).Z1();

        return var2;
    }

    public boolean i() {
        boolean var1;
-        if (this.j && !this.u() && !this.l()) {
-            var1 = true;
-        } else {
-            var1 = false;
-        }
+        var1 = this.j && !this.u() && !this.l();

        return var1;
    }

    public boolean j() {
        boolean var1;
-        if (!this.j || this.u() || this.B() && this.A() && !this.a.c.H1()) {
-            var1 = false;
-        } else {
-            var1 = true;
-        }
+        var1 = this.j && !this.u() && (!this.B() || !this.A() || this.a.c.H1());

        return var1;
    }
@@ -363,11 +295,7 @@ public class VhBindArgs {
    public boolean k() {
        Dialog var1 = this.e;
        boolean var2;
-        if (var1 != null && var1.U1()) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 != null && var1.U1();

        return var2;
    }
@@ -375,11 +303,7 @@ public class VhBindArgs {
    public boolean l() {
        Dialog var1 = this.e;
        boolean var2;
-        if (var1 != null && var1.V1()) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 != null && var1.V1();

        return var2;
    }
@@ -387,11 +311,7 @@ public class VhBindArgs {
    public boolean m() {
        Dialog var1 = this.e;
        boolean var2;
-        if (var1 != null && var1.W1()) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 != null && var1.W1();

        return var2;
    }
@@ -404,11 +324,7 @@ public class VhBindArgs {
    public boolean o() {
        AdapterEntry var1 = this.b;
        boolean var2;
-        if (var1 != null && var1.a == 101) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 != null && var1.a == 101;

        return var2;
    }
@@ -416,11 +332,7 @@ public class VhBindArgs {
    public boolean p() {
        Msg var1 = this.b.c;
        boolean var2;
-        if (var1 != null && var1.G1()) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 != null && var1.G1();

        return var2;
    }
@@ -443,11 +355,7 @@ public class VhBindArgs {
    public boolean r() {
        Msg var1 = this.b.c;
        boolean var2;
-        if (var1 instanceof MsgFromUser && ((MsgFromUser) var1).e2()) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 instanceof MsgFromUser && ((MsgFromUser) var1).e2();

        return var2;
    }
@@ -488,27 +396,19 @@ public class VhBindArgs {
    public boolean v() {
        IntSet var1 = this.r;
        boolean var2;
-        if (var1 != null && var1.a(this.b.c.getLocalId())) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 != null && var1.a(this.b.c.getLocalId());

        return var2;
    }

    public boolean w() {
-        return this.z() ^ true;
+        return !this.z();
    }

    public boolean x() {
        AdapterEntry var1 = this.c;
        boolean var2;
-        if (var1 != null && var1.a == 100) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 != null && var1.a == 100;

        return var2;
    }
@@ -516,11 +416,7 @@ public class VhBindArgs {
    public boolean y() {
        AdapterEntry var1 = this.c;
        boolean var2;
-        if (var1 != null && var1.a == 96) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 != null && var1.a == 96;

        return var2;
    }
@@ -528,11 +424,7 @@ public class VhBindArgs {
    public boolean z() {
        AdapterEntry var1 = this.c;
        boolean var2;
-        if (var1 != null && var1.c() && this.c.c.getLocalId() == this.b.c.getLocalId()) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = var1 != null && var1.c() && this.c.c.getLocalId() == this.b.c.getLocalId();

        return var2;
    }
@@ -46,7 +46,7 @@ public final class MsgPartCallHolder extends MsgPartHolderBase<AttachCall> {
        this.G = new StringBuilder();
    }

-    private final void a(Msg var1) {
+    private void a(Msg var1) {
        this.G.setLength(0);
        MsgTimeFormatter var2 = this.F;
        Context var3 = this.C;
@@ -55,7 +55,7 @@ public final class MsgPartCallHolder extends MsgPartHolderBase<AttachCall> {
        this.H.setTimeText(this.G);
    }

-    private final void a(boolean var1) {
+    private void a(boolean var1) {
        MsgPartIconTwoRowView var2 = this.H;
        int var3;
        if (var1) {
@@ -67,7 +67,7 @@ public final class MsgPartCallHolder extends MsgPartHolderBase<AttachCall> {
        var2.setIcon(var3);
    }

-    private final void a(boolean var1, AttachCall var2) {
+    private void a(boolean var1, AttachCall var2) {
        boolean var3 = !var1;
        if (var2.h() == CallState.ERROR) {
            this.H.setSubtitleText(m.vkim_msg_list_call_error);
@@ -49,6 +49,7 @@ import com.vk.im.ui.views.msg.bubble.MsgBubbleView;
 import com.vk.im.ui.views.sticker.StickerAnimationState;
 import kotlin.Unit;
 import kotlin.jvm.b.Functions;
+import ru.vtosters.lite.themes.ThemesHacks;

 public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {
    public static final int h0 = Screen.a(124);
@@ -56,46 +57,6 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {
    private static final int[][] j0;
    private static final int[][] k0;
    private static final int[][] l0;
-    private final MsgPartHolderBase B;
-    private final MsgPartHolderBindArgs C = new MsgPartHolderBindArgs();
-    private final Rect D = new Rect();
-    private final Rect E = new Rect();
-    private final Rect F = new Rect();
-    private final Rect G = new Rect();
-    private ColorDrawable H;
-    private final int I;
-    private final int J;
-    private final int K;
-    private final int L;
-    private final int M;
-    private Drawable N;
-    private Drawable O;
-    private BombView P;
-    private BombView.d Q;
-    private int R;
-    private int S;
-    private final DisplayNameFormatter T = new DisplayNameFormatter();
-    private final StringBuilder U = new StringBuilder();
-    private final StringBuilder V = new StringBuilder();
-    private final String W;
-    private final String X;
-    private final String Y;
-    private boolean Z;
-    private BubbleColors a0;
-    private final FluidHorizontalLayout b;
-    @ColorInt
-    private int b0;
-    private final AvatarView c;
-    private MsgListAdapterCallback c0;
-    private final Space d;
-    private Msg d0;
-    private final MsgBubbleView e;
-    private Dialog e0;
-    private final MsgStatusView f;
-    private int f0;
-    private final ImageView g;
-    private h g0 = new h();
-    private final Space h;

    static {
        int[] var0 = new int[]{0, 0, 0, 0};
@@ -119,20 +80,61 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {
        l0 = new int[][]{var0, {4, 4, 0, 0, 0, 2, 8, 0}, var1, var2, {4, 0, 0, 0, 0, 2, 8, 0}, {0, 0, 0, 0, 0, 2, 8, 0}, {4, 4, 0, 0, 0, 2, 8, 0}, {0, 0, 0, 0, 0, 0, 0, 0}};
    }

+    private final MsgPartHolderBase B;
+    private final MsgPartHolderBindArgs C = new MsgPartHolderBindArgs();
+    private final Rect D = new Rect();
+    private final Rect E = new Rect();
+    private final Rect F = new Rect();
+    private final Rect G = new Rect();
+    private final int I;
+    private final int J;
+    private final int K;
+    private final int L;
+    private final int M;
+    private final DisplayNameFormatter T = new DisplayNameFormatter();
+    private final StringBuilder U = new StringBuilder();
+    private final StringBuilder V = new StringBuilder();
+    private final String W;
+    private final String X;
+    private final String Y;
+    private final FluidHorizontalLayout b;
+    private final AvatarView c;
+    private final Space d;
+    private final MsgBubbleView e;
+    private final MsgStatusView f;
+    private final ImageView g;
+    private final Space h;
+    private final ColorDrawable H;
+    private Drawable N;
+    private Drawable O;
+    private final BombView P;
+    private final BombView.d Q;
+    private final int R;
+    private final int S;
+    private boolean Z;
+    private BubbleColors a0;
+    @ColorInt
+    private int b0;
+    private MsgListAdapterCallback c0;
+    private Msg d0;
+    private Dialog e0;
+    private int f0;
+    private final h g0 = new h();
+
    public VhMsg(View itemView, MsgPartHolderBase vhBase) {
        super(itemView);
        Context context = itemView.getContext();
        LayoutInflater var4 = LayoutInflater.from(context);
        this.b = (FluidHorizontalLayout) itemView;
-        this.c = (AvatarView) itemView.findViewById(com.vk.im.ui.h.avatar);
-        this.d = (Space) itemView.findViewById(com.vk.im.ui.h.avatar_space);
-        this.e = (MsgBubbleView) itemView.findViewById(com.vk.im.ui.h.bubble);
-        this.f = (MsgStatusView) itemView.findViewById(com.vk.im.ui.h.status);
-        this.g = (ImageView) itemView.findViewById(com.vk.im.ui.h.vkim_channel_share);
-        this.h = (Space) itemView.findViewById(com.vk.im.ui.h.status_space);
-        this.P = (BombView) itemView.findViewById(com.vk.im.ui.h.bomb);
+        this.c = itemView.findViewById(com.vk.im.ui.h.avatar);
+        this.d = itemView.findViewById(com.vk.im.ui.h.avatar_space);
+        this.e = itemView.findViewById(com.vk.im.ui.h.bubble);
+        this.f = itemView.findViewById(com.vk.im.ui.h.status);
+        this.g = itemView.findViewById(com.vk.im.ui.h.vkim_channel_share);
+        this.h = itemView.findViewById(com.vk.im.ui.h.status_space);
+        this.P = itemView.findViewById(com.vk.im.ui.h.bomb);
        this.B = vhBase;
-        this.H = new ColorDrawable(context.getResources().getColor(com.vk.im.ui.d.msg_search_selection));
+        this.H = new ColorDrawable(ThemesHacks.getColors(context, com.vk.im.ui.d.msg_search_selection));
        this.I = ContextExtKt.b(context, com.vk.im.ui.e.msg_bubble_max_width);
        this.J = ContextExtKt.b(context, com.vk.im.ui.e.msg_reply_max_width);
        this.K = ContextExtKt.b(context, com.vk.im.ui.e.msg_sticker_max_width);
@@ -149,49 +151,39 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {
        var6.right = var7.rightMargin;
        var6.top = var7.topMargin;
        var6.bottom = var7.bottomMargin;
-        ViewExtKt.b(this.c, new View.OnClickListener() {
-            public void onClick(View var1) {
-                if (VhMsg.this.c0 != null && VhMsg.this.d0 != null) {
-                    VhMsg.this.c0.a(VhMsg.this.d0.getFrom());
-                }
-
+        ViewExtKt.b(this.c, var1 -> {
+            if (VhMsg.this.c0 != null && VhMsg.this.d0 != null) {
+                VhMsg.this.c0.a(VhMsg.this.d0.getFrom());
            }
-        });
-        this.c.setOnLongClickListener(new View.OnLongClickListener() {
-            public boolean onLongClick(View var1) {
-                if (VhMsg.this.c0 != null && VhMsg.this.d0 != null) {
-                    VhMsg.this.c0.a(VhMsg.this.d0.getFrom());
-                    return true;
-                } else {
-                    return false;
-                }
-            }
-        });
-        ViewExtKt.b(this.g, new View.OnClickListener() {
-            public void onClick(View var1) {
-                if (VhMsg.this.c0 != null && VhMsg.this.d0 != null) {
-                    VhMsg.this.c0.a(VhMsg.this.d0);
-                }

-            }
        });
-        ViewExtKt.b(this.itemView, new View.OnClickListener() {
-            public void onClick(View var1) {
-                if (VhMsg.this.c0 != null && VhMsg.this.d0 != null) {
-                    VhMsg.this.c0.a(VhMsg.this.d0.getLocalId());
-                }
-
-            }
-        });
-        this.itemView.setOnLongClickListener(new View.OnLongClickListener() {
-            public boolean onLongClick(View var1) {
-                if (VhMsg.this.c0 != null && VhMsg.this.d0 != null) {
-                    VhMsg.this.c0.b(VhMsg.this.d0.getLocalId());
-                }
-
+        this.c.setOnLongClickListener(var1 -> {
+            if (VhMsg.this.c0 != null && VhMsg.this.d0 != null) {
+                VhMsg.this.c0.a(VhMsg.this.d0.getFrom());
                return true;
+            } else {
+                return false;
            }
        });
+        ViewExtKt.b(this.g, var1 -> {
+            if (VhMsg.this.c0 != null && VhMsg.this.d0 != null) {
+                VhMsg.this.c0.a(VhMsg.this.d0);
+            }
+
+        });
+        ViewExtKt.b(this.itemView, (View.OnClickListener) var1 -> {
+            if (VhMsg.this.c0 != null && VhMsg.this.d0 != null) {
+                VhMsg.this.c0.a(VhMsg.this.d0.getLocalId());
+            }
+
+        });
+        this.itemView.setOnLongClickListener((View.OnLongClickListener) var1 -> {
+            if (VhMsg.this.c0 != null && VhMsg.this.d0 != null) {
+                VhMsg.this.c0.b(VhMsg.this.d0.getLocalId());
+            }
+
+            return true;
+        });
        this.R = ContextExtKt.i(context, com.vk.im.ui.c.im_msg_part_corner_radius_small);
        this.S = ContextExtKt.i(context, com.vk.im.ui.c.im_msg_part_corner_radius_big);
        this.c0 = null;
@@ -203,6 +195,10 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {
        };
    }

+    public static VhMsg a(LayoutInflater var0, ViewGroup var1, MsgPartHolderBase var2) {
+        return new VhMsg(var0.inflate(j.vkim_msg_list_item_msg_from_user, var1, false), var2);
+    }
+
    private int a(Style var1, Style var2, boolean var3) {
        int var4;
        if (var3) {
@@ -283,20 +279,15 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {
                case 103:
                    return VhMsg.Style.EMPTY;
                default:
-                    StringBuilder var3 = new StringBuilder();
-                    var3.append("Unknown viewType: ");
-                    var3.append(var1);
-                    throw new IllegalArgumentException(var3.toString());
+                    String var3 = "Unknown viewType: " +
+                            var1;
+                    throw new IllegalArgumentException(var3);
            }
        }

        return VhMsg.Style.TWO_LINE;
    }

-    public static VhMsg a(LayoutInflater var0, ViewGroup var1, MsgPartHolderBase var2) {
-        return new VhMsg(var0.inflate(j.vkim_msg_list_item_msg_from_user, var1, false), var2);
-    }
-
    private void a(VhBindArgs args, Rect rect) {
        Style var3 = this.a(args.b);
        boolean var4 = args.b.f();
@@ -411,11 +402,7 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {
                    Msg var10 = var5.c;
                    var9 = var6;
                    if (var10 != null) {
-                        if (var10.v1() == args.g.t1()) {
-                            var9 = true;
-                        } else {
-                            var9 = false;
-                        }
+                        var9 = var10.v1() == args.g.t1();

                        if (var10.O1()) {
                            int var12 = var10.d().ordinal();
@@ -433,11 +420,7 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {
                                    b = args.I();
                                }
                            } else {
-                                if (var10.C1() <= args.i) {
-                                    var6 = true;
-                                } else {
-                                    var6 = false;
-                                }
+                                var6 = var10.C1() <= args.i;

                                if (!var6 && !var9) {
                                    var11 = MsgStatus.UNREAD;
@@ -575,18 +558,14 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {
        partArgs.o = args.n;
        partArgs.s = args.v();
        partArgs.t = args.q;
-        partArgs.u = var4.b() ^ true;
+        partArgs.u = !var4.b();
        boolean var5;
-        if (var3.i > 0) {
-            var5 = true;
-        } else {
-            var5 = false;
-        }
+        var5 = var3.i > 0;

        partArgs.v = var5;
        partArgs.w = args.k;
        partArgs.x = args.l;
-        partArgs.y = this.Z ^ true;
+        partArgs.y = !this.Z;
        partArgs.z = args.s;
        partArgs.A = args.t;
        partArgs.l = this.b0;
@@ -671,7 +650,7 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {
    private void f(VhBindArgs args) {
        Msg var2 = args.b.c;
        if (var2 != null) {
-            this.P.setStateListener((BombView.d) null);
+            this.P.setStateListener(null);
            if (var2.M1() && !var2.E1()) {
                this.P.setVisibility(View.GONE);
            } else {
@@ -810,24 +789,12 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {
        this.e.setFwdPadding(this.D);
        this.e.setContentPadding(this.E);
        boolean var7;
-        if (args.b.a == 83) {
-            var7 = true;
-        } else {
-            var7 = false;
-        }
+        var7 = args.b.a == 83;

        boolean var5;
-        if (args.a.a == 83) {
-            var5 = true;
-        } else {
-            var5 = false;
-        }
+        var5 = args.a.a == 83;

-        if (!args.F() || !var7 && !var5) {
-            var5 = true;
-        } else {
-            var5 = false;
-        }
+        var5 = !args.F() || !var7 && !var5;

        MsgBubbleView var8 = this.e;
        boolean var6 = var4;
@@ -904,18 +871,10 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {
            return false;
        } else {
            boolean var5;
-            if (var2.a == 50) {
-                var5 = true;
-            } else {
-                var5 = false;
-            }
+            var5 = var2.a == 50;

            boolean var6;
-            if (!args.z() && var2.i == 0) {
-                var6 = true;
-            } else {
-                var6 = false;
-            }
+            var6 = !args.z() && var2.i == 0;

            if (var5 || var6 || args.y() || args.x()) {
                var4 = true;
@@ -934,11 +893,7 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {

    private boolean u(int var1) {
        boolean var2;
-        if (var1 != 2 && var1 != 3) {
-            var2 = false;
-        } else {
-            var2 = true;
-        }
+        var2 = var1 == 2 || var1 == 3;

        return var2;
    }
@@ -960,9 +915,7 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {
            Msg var1 = this.d0;
            if (var1 != null) {
                Dialog var2 = this.e0;
-                if (var2 != null && MsgPermissionHelper.b.a(var2, var1)) {
-                    return true;
-                }
+                return var2 != null && MsgPermissionHelper.b.a(var2, var1);
            }
        }
        return false;
@@ -997,11 +950,7 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {

    public void a(VhBindArgs args) {
        boolean var2;
-        if (VKThemeHelper.l() == VKTheme.VKAPP_LIGHT) {
-            var2 = true;
-        } else {
-            var2 = false;
-        }
+        var2 = VKThemeHelper.l() == VKTheme.VKAPP_LIGHT;

        this.Z = var2;
        AdapterEntry var3 = args.b;
@@ -1062,11 +1011,7 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {

    public boolean f0() {
        boolean var1;
-        if (this.f0 == 100) {
-            var1 = true;
-        } else {
-            var1 = false;
-        }
+        var1 = this.f0 == 100;

        return var1;
    }
@@ -1083,7 +1028,7 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {
        this.B.c(var1);
    }

-    private static enum Style {
+    private enum Style {
        BUTTON(6),
        EMPTY(7),
        FWD_SENDER(4),
@@ -1095,14 +1040,14 @@ public class VhMsg extends VhBase implements SwipeToReplyItemTouchCallback.b {

        public final int index;

-        private Style(int var3) {
+        Style(int var3) {
            this.index = var3;
        }
    }

    private class h implements Functions<Unit> {
-        private int a;
-        private Runnable b;
+        private final int a;
+        private final Runnable b;

        private h() {
            this.a = Screen.a(12);
@@ -26,30 +26,23 @@ import com.vtosters.lite.R;

 public final class MentionsController {
    private final RichEditText a;
-
+    private final ImEngine mImEngine;
+    private final View j;
+    private final b k;
    private boolean state;
    private CoordinatorLayout mCoordinatorLayout;
    private VkBottomSheetBehavior<RecyclerView> mBottomSheetBehavior;
    private boolean e;
-    private DialogMentionComponent mDialogMentionComponent;
-    private MentionsManager mMentionsManager;
-    private final ImEngine mImEngine;
-    private int i;
-    private final View j;
-    private final b k;
-
-    public interface b {
-        boolean c();
-
-        boolean d();
-    }
+    private final DialogMentionComponent mDialogMentionComponent;
+    private final MentionsManager mMentionsManager;
+    private final int i;

    public MentionsController(ImEngine imEngine, int i, View view, b bVar) {
        this.mImEngine = imEngine;
        this.i = i;
        this.j = view;
        this.k = bVar;
-        this.a = (RichEditText) this.j.findViewById(R.id.writebar_edit);
+        this.a = this.j.findViewById(R.id.writebar_edit);
        this.mMentionsManager = new MentionsManager(this.a, new MentionSuggestionsSupplier() {

            @Override
@@ -71,7 +64,7 @@ public final class MentionsController {

            @Override
            public void b() {
-                MentionsController.this.mDialogMentionComponent.a(0, (String) null);
+                MentionsController.this.mDialogMentionComponent.a(0, null);
                MentionsController.this.g();
            }
        });
@@ -92,18 +85,18 @@ public final class MentionsController {
        });
    }

-    public final void g() {
+    public void g() {
        this.e = false;
        j();
    }

-    private final void h() {
+    private void h() {
        if (this.state) {
            return;
        }
        View inflate = ((ViewStub) this.j.findViewById(R.id.mentions_container_stub)).inflate();
-        ViewGroup viewGroup = (ViewGroup) inflate.findViewById(R.id.mentions_container);
-        viewGroup.addView(this.mDialogMentionComponent.a(viewGroup, (Bundle) null));
+        ViewGroup viewGroup = inflate.findViewById(R.id.mentions_container);
+        viewGroup.addView(this.mDialogMentionComponent.a(viewGroup, null));
        this.mCoordinatorLayout = inflate.findViewById(R.id.mentions_cl);
        this.mBottomSheetBehavior = (VkBottomSheetBehavior<RecyclerView>) ((CoordinatorLayout.LayoutParams) viewGroup.getLayoutParams()).getBehavior();
        this.mBottomSheetBehavior.a(new VkBottomSheetBehavior.b() {
@@ -120,12 +113,12 @@ public final class MentionsController {
        this.state = true;
    }

-    public final void i() {
+    public void i() {
        this.e = true;
        j();
    }

-    public final void j() {
+    public void j() {
        if (this.k.d()) {
            Context context = this.j.getContext();
            Activity f = ContextExtKt.f(context);
@@ -139,27 +132,33 @@ public final class MentionsController {
        }
    }

-    public final void a() {
+    public void a() {
        this.mDialogMentionComponent.g();
    }

-    public final void b() {
+    public void b() {
        this.mDialogMentionComponent.h();
    }

-    public final b c() {
+    public b c() {
        return this.k;
    }

-    public final int d() {
+    public int d() {
        return this.i;
    }

-    public final void e() {
+    public void e() {
        this.mDialogMentionComponent.q();
    }

-    public final void f() {
+    public void f() {
        this.mDialogMentionComponent.r();
    }
+
+    public interface b {
+        boolean c();
+
+        boolean d();
+    }
 }
@@ -12,15 +12,15 @@ import android.view.ViewGroup;
 import com.vk.im.ui.o;

 public class StoryBorderView extends View {
-    private boolean B;
    private final Paint a;
+    private final int g;
+    private final int h;
+    private boolean B;
    private LinearGradient f15747b;
    private int f15748c;
    private int f15749d;
    private int f15750e;
    private int f15751f;
-    private final int g;
-    private final int h;

    public StoryBorderView(Context context) {
        this(context, null, 0, 6);
@@ -34,10 +34,32 @@ public class StoryBorderView extends View {
        this(context, (i2 & 2) != 0 ? null : attributeSet, (i2 & 4) != 0 ? 0 : i);
    }

+    public StoryBorderView(Context context, AttributeSet attributeSet, int i) {
+        super(context, attributeSet, i);
+        Paint paint = new Paint();
+        paint.setAntiAlias(true);
+        paint.setStyle(Paint.Style.STROKE);
+        this.a = paint;
+        TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, o.StoryBorderView);
+        setBorderColor(obtainStyledAttributes.getInt(o.StoryBorderView_vkim_borderColor, 0));
+        this.g = obtainStyledAttributes.getInt(o.StoryBorderView_vkim_borderGradientStartColor, 0);
+        this.h = obtainStyledAttributes.getInt(o.StoryBorderView_vkim_borderGradientEndColor, 0);
+        setBorderWidth(obtainStyledAttributes.getDimensionPixelSize(o.StoryBorderView_vkim_borderWidth, 0));
+        obtainStyledAttributes.recycle();
+    }
+
    public int getBorderColor() {
        return this.f15749d;
    }

+    public void setBorderColor(int i) {
+        if (this.f15749d != i) {
+            this.f15749d = i;
+            this.a.setColor(i);
+            invalidate();
+        }
+    }
+
    public int getBorderGradientEndColor() {
        return this.h;
    }
@@ -50,14 +72,33 @@ public class StoryBorderView extends View {
        return this.f15750e;
    }

+    public void setBorderWidth(int i) {
+        if (this.f15750e != i) {
+            this.f15750e = i;
+            this.a.setStrokeWidth(i);
+            invalidate();
+        }
+    }
+
    public int getPadding() {
        return this.f15751f;
    }

+    public void setPadding(int i) {
+        if (this.f15751f != i) {
+            this.f15751f = i;
+            setPadding(i, i, i, i);
+        }
+    }
+
    public int getViewSize() {
        return this.f15748c;
    }

+    public void setViewSize(int i) {
+        this.f15748c = i;
+    }
+
    @Override
    protected void onDraw(Canvas canvas) {
        canvas.drawOval(getPaddingLeft(), getPaddingTop(), getWidth() - getPaddingRight(), getHeight() - getPaddingBottom(), this.a);
@@ -69,22 +110,6 @@ public class StoryBorderView extends View {
        setMeasuredDimension(i3, i3);
    }

-    public void setBorderColor(int i) {
-        if (this.f15749d != i) {
-            this.f15749d = i;
-            this.a.setColor(i);
-            invalidate();
-        }
-    }
-
-    public void setBorderWidth(int i) {
-        if (this.f15750e != i) {
-            this.f15750e = i;
-            this.a.setStrokeWidth(i);
-            invalidate();
-        }
-    }
-
    @Override
    public void setLayoutParams(ViewGroup.LayoutParams layoutParams) {
        super.setLayoutParams(layoutParams);
@@ -108,29 +133,4 @@ public class StoryBorderView extends View {
            invalidate();
        }
    }
-
-    public void setPadding(int i) {
-        if (this.f15751f != i) {
-            this.f15751f = i;
-            setPadding(i, i, i, i);
-        }
-    }
-
-    public void setViewSize(int i) {
-        this.f15748c = i;
-    }
-
-    public StoryBorderView(Context context, AttributeSet attributeSet, int i) {
-        super(context, attributeSet, i);
-        Paint paint = new Paint();
-        paint.setAntiAlias(true);
-        paint.setStyle(Paint.Style.STROKE);
-        this.a = paint;
-        TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, o.StoryBorderView);
-        setBorderColor(obtainStyledAttributes.getInt(o.StoryBorderView_vkim_borderColor, 0));
-        this.g = obtainStyledAttributes.getInt(o.StoryBorderView_vkim_borderGradientStartColor, 0);
-        this.h = obtainStyledAttributes.getInt(o.StoryBorderView_vkim_borderGradientEndColor, 0);
-        setBorderWidth(obtainStyledAttributes.getDimensionPixelSize(o.StoryBorderView_vkim_borderWidth, 0));
-        obtainStyledAttributes.recycle();
-    }
 }
@@ -0,0 +1,336 @@
+package com.vk.libvideo;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import com.vk.bridges.StatisticsBridge1;
+import com.vk.dto.common.VideoFile;
+import com.vk.media.player.PlayerTypes;
+import com.vk.navigation.NavigatorKeys;
+import com.vk.statistic.Statistic;
+import org.json.JSONException;
+import org.json.JSONObject;
+import ru.vtosters.hooks.other.Preferences;
+import ru.vtosters.lite.utils.Metrics;
+
+import java.util.Locale;
+import java.util.Objects;
+
+/* loaded from: classes3.dex */
+public class VideoTracker {
+    private final VideoFile a;
+
+    /* renamed from: b  reason: collision with root package name */
+    private Statistic f15638b;
+
+    /* renamed from: c  reason: collision with root package name */
+    private String f15639c;
+
+    /* renamed from: d  reason: collision with root package name */
+    private String f15640d;
+
+    /* renamed from: e  reason: collision with root package name */
+    private final boolean f15641e;
+
+    /* renamed from: f  reason: collision with root package name */
+    private int f15642f = -1;
+    private final int g;
+    private final int h;
+    private final int i;
+    private final int j;
+    private final int k;
+    private int l;
+    private PlayerType m;
+    private Screen n;
+
+    /* loaded from: classes3.dex */
+    public enum FullscreenTransition {
+        TAP,
+        SCREEN_ROTATION
+    }
+
+    /* loaded from: classes3.dex */
+    public enum PlayerType {
+        INLINE,
+        CAROUSEL,
+        FULLSCREEN
+    }
+
+    /* loaded from: classes3.dex */
+    public enum ResizeAction {
+        BUTTON,
+        GESTURE
+    }
+
+    /* loaded from: classes3.dex */
+    public enum RewindType {
+        SLIDER,
+        DOUBLE_TAP
+    }
+
+    /* loaded from: classes3.dex */
+    public enum Screen {
+        INLINE,
+        CAROUSEL,
+        PORTRAIT,
+        LANDSCAPE
+    }
+
+    public VideoTracker(VideoFile videoFile, @Nullable Statistic statistic, String str, boolean z, @Nullable String str2) {
+        this.a = videoFile;
+        this.f15638b = statistic;
+        int i = videoFile.d;
+        this.g = (int) (i * 0.25f);
+        this.h = (int) (i * 0.5f);
+        this.i = (int) (i * 0.75f);
+        this.j = (int) (i * 0.95f);
+        this.k = i - 1;
+        this.f15639c = str;
+        this.f15641e = z;
+        this.f15640d = str2;
+    }
+
+    private static boolean a(int i, int i2, int i3) {
+        return i3 > i && i3 <= i2;
+    }
+
+    public void a(String str) {
+        this.f15640d = str;
+    }
+
+    public boolean b() {
+        return this.f15638b != null;
+    }
+
+    public void c() {
+        this.f15642f = -1;
+    }
+
+    public void d() {
+        c("video_fullscreen_off");
+    }
+
+    public void e() {
+        c("video_fullscreen_on");
+    }
+
+    public void f() {
+        c("video_pause");
+        c("pause", "pause");
+    }
+
+    public void g() {
+        c("video_resume");
+        c("pause", "resume");
+    }
+
+    public void h() {
+        c("video_volume_off");
+        c("volume", "off");
+    }
+
+    public void i() {
+        c("video_volume_on");
+        c("volume", "on");
+    }
+
+    private void c(String str, String str2) {
+        a(b(str, str2));
+    }
+
+    public String a() {
+        return this.f15640d;
+    }
+
+    public void b(String str) {
+        if (Objects.equals(this.f15639c, str)) {
+            return;
+        }
+        this.f15639c = str;
+    }
+
+    private void c(String str) {
+        if (this.f15638b != null) {
+            StatisticsBridge1.a().a(this.f15638b, str);
+        }
+    }
+
+    public void a(@Nullable Statistic statistic) {
+        this.f15638b = statistic;
+    }
+
+    private Bundle b(String str, String str2) {
+        Bundle bundle = new Bundle();
+        bundle.putString(NotificationCompat.CATEGORY_EVENT, str);
+        bundle.putString("value", str2);
+        bundle.putInt("position", this.f15642f);
+        return bundle;
+    }
+
+    public void a(PlayerType playerType) {
+        if (this.m != playerType) {
+            this.m = playerType;
+        }
+    }
+
+    public void a(int i, int i2) {
+        int i3 = this.f15642f;
+        if (i == i3) {
+            return;
+        }
+        if (a(i3, i, 0)) {
+            a("start", i2);
+            c("video_start");
+        }
+//        if (this.a.d > 0) {
+//            if (a(this.f15642f, i, 3)) {
+//                a("3s", i2);
+//                c("video_play_3s");
+//            }
+//            if (a(this.f15642f, i, 10)) {
+//                a("10s", i2);
+//                c("video_play_10s");
+//            }
+//            if (a(this.f15642f, i, this.g)) {
+//                a("25", i2);
+//                c("video_play_25");
+//            }
+//            if (a(this.f15642f, i, this.h)) {
+//                a("50", i2);
+//                c("video_play_50");
+//            }
+//            if (a(this.f15642f, i, this.i)) {
+//                a("75", i2);
+//                c("video_play_75");
+//            }
+//            if (a(this.f15642f, i, this.j)) {
+//                a("95", i2);
+//                c("video_play_95");
+//            }
+//            if (a(this.f15642f, i, this.k)) {
+//                a("100", i2);
+//                c("video_play_100");
+//            }
+//        }
+        this.f15642f = i;
+    }
+
+    public void a(int i) {
+        a("continue", i);
+        c("video_start");
+    }
+
+    public void a(@NonNull Screen screen) {
+        if (this.n != screen) {
+            this.n = screen;
+            c("screen", screen.toString().toLowerCase());
+        }
+    }
+
+    public void a(@NonNull FullscreenTransition fullscreenTransition) {
+        c("full_screen_transition", fullscreenTransition.toString().toLowerCase());
+    }
+
+    public void a(int i, boolean z) {
+        if (this.l != i) {
+            this.l = i;
+            c(z ? "auto_quality" : "quality", PlayerTypes.c(i));
+        }
+    }
+
+    public void a(@Nullable String str, boolean z) {
+        String str2 = z ? "auto_subtitles" : "subtitles";
+        if (str == null) {
+            str = "off";
+        }
+        c(str2, str);
+    }
+
+    public void a(int i, int i2, @NonNull RewindType rewindType) {
+        Bundle b2 = b("rewind", i <= i2 ? "forward" : "backward");
+        b2.putString("rewind_type", rewindType.toString().toLowerCase());
+        b2.putInt("rewind_start", i);
+        b2.putInt("rewind_end", i2);
+        a(b2);
+    }
+
+    public void a(float f2) {
+        String format;
+        if (f2 == 1.0f) {
+            format = "normal";
+        } else {
+            int i = (int) f2;
+            format = f2 == ((float) i) ? String.format(Locale.US, "%s", i) : String.format(Locale.US, "%.2f", f2);
+        }
+        c("speed", format);
+    }
+
+    public void a(boolean z, @NonNull ResizeAction resizeAction) {
+        Bundle b2 = b("resize", z ? "widen" : "narrow");
+        b2.putString("resize_action", resizeAction.toString().toLowerCase());
+        a(b2);
+    }
+
+    public void a(String str, String str2) {
+        Bundle bundle = new Bundle();
+        bundle.putString("link_type", str);
+        bundle.putString("value", str2);
+        bundle.putString(NotificationCompat.CATEGORY_EVENT, "show_link");
+        a(bundle);
+    }
+
+    private void a(String str, int i) {
+        Bundle bundle = new Bundle();
+        bundle.putString("autoplay", this.f15641e ? "1" : "0");
+        bundle.putString("position", str);
+        if (i >= 0) {
+            bundle.putInt("quality", i - 2);
+        }
+        PlayerType playerType = this.m;
+        if (playerType != null) {
+            bundle.putString("player_type", playerType.toString().toLowerCase());
+        }
+        a("video_play", bundle);
+    }
+
+    private void a(Bundle bundle) {
+        a("video_event", bundle);
+    }
+
+    private void a(String str, Bundle bundle) {
+        bundle.putString("video_id", this.a.a + "_" + this.a.b);
+        bundle.putString(NavigatorKeys.V, this.f15639c);
+        bundle.putString(NavigatorKeys.Z, this.f15639c);
+        if (!TextUtils.isEmpty(this.f15640d)) {
+            bundle.putString("context", this.f15640d);
+        }
+        if (!TextUtils.isEmpty(this.a.l0)) {
+            bundle.putString(NavigatorKeys.l0, this.a.l0);
+        }
+        bundle.putLong("ts", System.currentTimeMillis());
+        StatisticsBridge1.a().a(str, bundle);
+
+        if (Preferences.getBoolValue("sendVideoMetrics", true) && str.equals("video_play")) {
+            try {
+                sendMetrics(str);
+            } catch (JSONException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    public void sendMetrics(String event) throws JSONException {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("e", event);
+        jsonObject.put("source", this.f15639c);
+        jsonObject.put("ref", this.f15639c);
+        jsonObject.put("video_id", this.a.a + "_" + this.a.b);
+        jsonObject.put("position", "start");
+        jsonObject.put("position_sec", 0);
+        jsonObject.put("cur_quality", "auto");
+
+        Metrics.trackEvents(jsonObject, false);
+    }
+}
@@ -24,8 +24,8 @@ public class MediaImageEncoder {
        return compressBitmap(bitmap, file, CompressFormat.JPEG, quality);
    }

-    private static boolean compressBitmapLossless(Bitmap bitmap, File file) {
-        return compressBitmap(bitmap, file, CompressFormat.PNG, 100);
+    public static boolean needToCompress() {
+        return Preferences.getPreferences().getBoolean("compressPhotos", true);
    }

    private static boolean compressBitmapNative(Bitmap bitmap, File file, int quality) {
@@ -37,7 +37,7 @@ public class MediaImageEncoder {
        byte[] jpegData = MediaNative.compressBitmapJpeg(bitmap, quality);

        if (jpegData == null) {
-            return false;
+            return compressBitmapJpeg(bitmap, file, quality);
        }

        try (FileOutputStream fileOutputStream = new FileOutputStream(file)) {
@@ -51,43 +51,21 @@ public class MediaImageEncoder {

    public static boolean encodePicture(Bitmap bitmap, File file, int quality) {
        if (bitmap != null && !bitmap.isRecycled() && bitmap.getWidth() * bitmap.getHeight() != 0) {
-            switch (Preferences.getPreferences().getString("compression", "jpeg")) {
-                case "skip" -> {
-                    return compressBitmapLossless(bitmap, file);
-                }
-                case "jpeg" -> {
-                    return compressBitmapJpeg(bitmap, file, quality);
-                }
-                case "native" -> {
-                    return compressBitmapNative(bitmap, file, quality);
-                }
-            }
-        }
-
-        return false;
-    }
-
-    public static boolean needToSkipCompression() {
-        return Preferences.getPreferences().getString("compression", "jpeg").equals("skip");
-    }
-
-    public static boolean needToCompress() {
-        return !needToSkipCompression();
-    }
-
-    public static boolean encodeJpeg(Bitmap bitmap, File file) {
-        return encodePicture(bitmap, file, 90);
-    }
-
-    public static boolean encodeJpegWithoutCompression(Bitmap bitmap, File file) {
-        return encodePicture(bitmap, file, 95);
-    }
-
-    public static boolean encodeJpeg(Bitmap bitmap, File file, int quality) {
-        if (bitmap != null && !bitmap.isRecycled() && bitmap.getWidth() * bitmap.getHeight() != 0) {
-            return needToCompress() ? compressBitmapNative(bitmap, file, quality) : compressBitmapJpeg(bitmap, file, quality);
+            return compressBitmapNative(bitmap, file, quality);
        } else {
            return false;
        }
    }
-}
+
+    public static boolean encodeJpeg(Bitmap bitmap, File file) {
+        return encodePicture(bitmap, file, Preferences.compress(85));
+    }
+
+    public static boolean encodeJpegWithoutCompression(Bitmap bitmap, File file) {
+        return encodePicture(bitmap, file, 100);
+    }
+
+    public static boolean encodeJpeg(Bitmap bitmap, File file, int quality) {
+        return encodePicture(bitmap, file, Preferences.compress(85));
+    }
+}
@@ -248,7 +248,6 @@ public final class MediaNative {
        if (isMediaLoaded) {
            return;
        }
-        NativeLibLoader.loadLibrary("ffmpeg");
        isMediaLoaded = NativeLibLoader.loadLibrary("vkmedia");
        isMediaLoaded = NativeLibLoader.loadLibrary("vkmediaencoder");
    }
@@ -0,0 +1,256 @@
+package com.vk.music.stats;
+
+import android.content.Intent;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.app.NotificationCompat;
+import com.vk.core.extensions.StringExt;
+import com.vk.music.common.MusicPlaybackLaunchContext;
+import com.vk.music.logger.MusicLogger;
+import com.vk.music.stats.i.MusicPlaybackParams;
+import com.vk.navigation.NavigatorKeys;
+import com.vtosters.lite.data.Analytics;
+import kotlin.jvm.b.Functions2;
+import org.json.JSONException;
+import org.json.JSONObject;
+import ru.vtosters.hooks.other.Preferences;
+import ru.vtosters.lite.utils.Metrics;
+
+import java.util.Objects;
+import java.util.UUID;
+
+public final class VKMusicStatsTracker implements MusicStatsTracker {
+    private String a;
+    private final Functions2<String, Analytics.l> b;
+    private static final a c = new a();
+
+    public VKMusicStatsTracker(Functions2<String, Analytics.l> functions2) {
+        this.b = functions2;
+    }
+
+    private String e(MusicPlaybackParams musicPlaybackParams) {
+        String g = musicPlaybackParams.g();
+        if (g == null) {
+            g = this.a;
+        }
+        if (g == null) {
+            g = "auto";
+        }
+        this.a = g;
+        return g;
+    }
+
+    @Override
+    public void a(boolean z) {
+        MusicStatsTracker.a.a(this, z);
+    }
+
+    @Override
+    public void b(MusicPlaybackParams musicPlaybackParams) {
+        c.a(a(musicPlaybackParams, "music_start_playback"));
+
+        if (Preferences.sendMusicMetrics()) {
+            try {
+                makeMetricsRequest(musicPlaybackParams, "music_start_playback");
+            } catch (JSONException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    @Override
+    public void b(boolean z) {
+    }
+
+    @Override
+    public void c(MusicPlaybackParams musicPlaybackParams) {
+        MusicStatsTracker.a.b(this, musicPlaybackParams);
+    }
+
+    @Override
+    public void d() {
+        MusicStatsTracker.a.a(this);
+    }
+
+    @Override
+    public void a(Intent intent, String str) {
+        MusicStatsTracker.a.a(this, intent, str);
+    }
+
+    @Override
+    public void b(String str, @NonNull String str2) {
+        Analytics.l invoke = this.b.invoke("music_subscription_action");
+        invoke.a("popup", str);
+        invoke.a("action", str2);
+        c.a(invoke);
+    }
+
+    @Override
+    public void c(boolean z) {
+        MusicStatsTracker.a.b(this, z);
+    }
+
+    @Override
+    public void d(MusicPlaybackParams musicPlaybackParams) {
+        if (Objects.equals("pause", this.a)) {
+            a(musicPlaybackParams);
+        }
+    }
+
+    @Override
+    public void a(long j) {
+        MusicStatsTracker.a.a(this, j);
+    }
+
+    @Override
+    public void c() {
+        Analytics.l invoke = this.b.invoke("music_subscription_push");
+        invoke.a("action", "open");
+        c.a(invoke);
+    }
+
+    @Override
+    public void a(String str, MusicStatsRefer musicStatsRefer) {
+        Analytics.l invoke = this.b.invoke("music_subscription_show");
+        invoke.a("popup", str);
+        c.a(invoke);
+    }
+
+    @Override
+    public void b() {
+        Analytics.l invoke = this.b.invoke("music_subscription_push");
+        invoke.a("action", "send");
+        c.a(invoke);
+    }
+
+    @Override
+    public void a(MusicPlaybackParams musicPlaybackParams) {
+        c.a(a(musicPlaybackParams, "music_stop_playback"));
+
+        if (Preferences.sendMusicMetrics()) {
+            try {
+                makeMetricsRequest(musicPlaybackParams, "music_stop_playback");
+            } catch (JSONException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    @Override
+    public void a(PlayerStateChangedParams playerStateChangedParams) {
+        Analytics.l invoke = this.b.invoke("audio_player");
+        invoke.a(NavigatorKeys.t0, playerStateChangedParams.a());
+        invoke.a("prev_state", playerStateChangedParams.c());
+        invoke.a("duration", playerStateChangedParams.b());
+        c.a(invoke);
+    }
+
+    @Override
+    public void b(String str) {
+        Analytics.l invoke = this.b.invoke("music_subscription_free_displayed");
+        invoke.a("popup", str);
+        c.a(invoke);
+    }
+
+    @Override
+    public void a(String str) {
+        Analytics.l invoke = this.b.invoke("playlist_start");
+        invoke.a(NavigatorKeys.e, str);
+        c.a(invoke);
+    }
+
+    private void makeMetricsRequest(MusicPlaybackParams musicPlaybackParams, String str) throws JSONException {
+        JSONObject event = new JSONObject();
+
+        if (str.equals("music_stop_playback")) {
+            event.put("e", str);
+            event.put("audio_id", musicPlaybackParams.c());
+            event.put("duration", musicPlaybackParams.a());
+            event.put("start_time", musicPlaybackParams.i());
+            event.put("shuffle", "false");
+            event.put("reason", "new");
+            event.put("state", "app");
+            event.put("duration", musicPlaybackParams.a());
+        } else {
+            event.put("e", str);
+            event.put("audio_id", musicPlaybackParams.c());
+            event.put("start_time", musicPlaybackParams.i());
+            event.put("shuffle", "false");
+            event.put("reason", "auto");
+            event.put("state", "app");
+
+            if (StringExt.a((CharSequence) musicPlaybackParams.e())) {
+                event.put("prev_audio_id", musicPlaybackParams.e());
+            }
+        }
+
+        Metrics.trackEvents(event, true);
+    }
+
+    private Analytics.l a(MusicPlaybackParams musicPlaybackParams, String str) {
+        Analytics.l invoke = this.b.invoke(str);
+        invoke.a("audio_id", musicPlaybackParams.c());
+        invoke.a("uuid", UUID.randomUUID().hashCode());
+        invoke.a("shuffle", musicPlaybackParams.l());
+        invoke.a("reason", e(musicPlaybackParams));
+        invoke.a("start_time", musicPlaybackParams.i());
+        invoke.a("playback_started_at", musicPlaybackParams.d());
+        invoke.a(NavigatorKeys.l0, musicPlaybackParams.j());
+        if (!Objects.equals("music_start_playback", str)) {
+            invoke.a("duration", musicPlaybackParams.a());
+        }
+        int i = h.$EnumSwitchMapping$0[musicPlaybackParams.b().ordinal()];
+        if (i == 1) {
+            invoke.a("repeat", "one");
+        } else if (i == 2) {
+            invoke.a("repeat", "all");
+        }
+        invoke.a(NavigatorKeys.t0, musicPlaybackParams.m());
+        MusicPlaybackLaunchContext h = musicPlaybackParams.h();
+        invoke.a(NavigatorKeys.V, h.v0());
+        if (h.v1()) {
+            invoke.a("playlist_id", h.u1());
+        }
+        if (h.i(4) || h.i(8)) {
+            invoke.a("expanded", h.i(4));
+        }
+        if (StringExt.a((CharSequence) musicPlaybackParams.e())) {
+            invoke.a("prev_audio_id", musicPlaybackParams.e());
+        }
+        if (StringExt.a((CharSequence) musicPlaybackParams.f())) {
+            invoke.a("prev_playlist_id", musicPlaybackParams.f());
+        }
+        return invoke;
+    }
+
+    @Override
+    public void a(String str, String str2) {
+        boolean a2 = Objects.equals("success", str2);
+        Analytics.l builder = this.b.invoke("music_subscription_purchase_result");
+        builder.a("popup", str);
+        builder.a(NotificationCompat.CATEGORY_STATUS, a2 ? "success" : "fail");
+        if (!a2) {
+            builder.a("reason", str2);
+        }
+        c.a(builder);
+    }
+
+    @Override
+    public void a() {
+        Analytics.l invoke = this.b.invoke("music_subscription");
+        invoke.a("popup", "background_v2");
+        invoke.a("action", "link");
+        c.a(invoke);
+    }
+
+    public static final class a {
+        private a() {
+        }
+
+        @VisibleForTesting
+        public void a(Analytics.l lVar) {
+            MusicLogger.a("MusicStats", "[VK_TRACKER]", lVar);
+            lVar.b();
+        }
+    }
+}
@@ -156,7 +156,7 @@ public class LyricsHolder extends RecyclerHolder<PlayerInfo> implements View.OnC

        @Override // com.vk.api.base.ApiCallback
        public void a(VKApiExecutionException vKApiExecutionException) {
-            if (Preferences.getBoolValue("useGenius", false)) {
+            if (Preferences.getBoolValue("useGenius", false) && !Preferences.serverFeaturesDisable()) {
                var text = Genius.getTextMusic(a);
                var lyrics = new AudioGetLyrics.a();
                lyrics.a = text;
@@ -0,0 +1,106 @@
+package com.vk.newsfeed.holders;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
+import com.vk.core.dialogs.alert.VkAlertDialog;
+import com.vk.core.ui.themes.VKThemeHelper;
+import com.vk.dto.newsfeed.entries.NewsEntry;
+import com.vk.dto.newsfeed.entries.Post;
+import com.vk.dto.newsfeed.entries.PromoPost;
+import com.vk.extensions.ViewExtKt;
+import com.vtosters.lite.R;
+import ru.vtosters.hooks.other.Preferences;
+import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.newsfeed.NewsFeedFiltersUtils;
+import ru.vtosters.sponsorpost.internal.Native;
+import ru.vtosters.sponsorpost.internal.VotesPreferences;
+import ru.vtosters.sponsorpost.internal.VotesService;
+import ru.vtosters.sponsorpost.utils.PostsPreferences;
+
+public final class AdMarkHolder extends BaseNewsEntryHolder<NewsEntry> {
+    private final TextView F;
+
+    @SuppressLint("ResourceType")
+    public AdMarkHolder(ViewGroup viewGroup) {
+        super(R.layout.marked_as_ads, viewGroup);
+        View view = ((RecyclerView.ViewHolder) this).itemView;
+        this.F = ViewExtKt.a(view, R.id.text, (View.OnClickListener) null);
+    }
+
+    @SuppressLint("ResourceType")
+    public void b(NewsEntry newsEntry) { // onBind
+        String disclamer = null;
+        Drawable drawable = null;
+        int height = 0;
+
+        if (newsEntry instanceof Post) {
+            Post post = ((Post) newsEntry);
+            if (post.L1()) {
+                drawable = VKThemeHelper.a(R.drawable.marked_as_ads, R.attr.icon_tertiary);
+                int ownerId = post.b();
+                int postId = post.P1();
+                int date = post.K();
+                String text = post.getText();
+
+                if (PostsPreferences.isPostAd(ownerId, postId)) {
+                    disclamer = "SponsorPost: Реклама";
+                    if (Preferences.isValidSignature() && Native.canVote()) {
+                        this.F.setOnClickListener(listener -> voteDialog(ownerId, postId, date, this.F.getContext()));
+                    }
+                } else if (VotesPreferences.isPostAd(ownerId, postId)) {
+                    disclamer = "SponsorPost: Возможно реклама";
+                    if (Preferences.isValidSignature() && Native.canVote()) {
+                        this.F.setOnClickListener(listener -> voteDialog(ownerId, postId, date, this.F.getContext()));
+                    }
+                } else if (NewsFeedFiltersUtils.sponsorFilters(text)) {
+                    disclamer = "SponsorPost: Заблокировано фильтрами";
+                    this.F.setOnClickListener(listener -> AndroidUtils.sendToast("Заблокировано по выражению: " + NewsFeedFiltersUtils.sponsorFiltersBanWord(text)));
+                } else {
+                    disclamer = m(R.string.sponsored_post_in_group);
+                }
+
+                height = e0().getDimensionPixelSize(R.dimen.newsfeed_ad_mark_post_height);
+            }
+        } else if (newsEntry instanceof PromoPost) {
+            PromoPost promoPost = (PromoPost) newsEntry;
+            if (!promoPost.E1().isEmpty()) {
+                height = e0().getDimensionPixelSize(R.dimen.newsfeed_ad_mark_promo_post_height);
+                disclamer = promoPost.E1();
+            }
+        }
+
+        this.F.setCompoundDrawablesRelativeWithIntrinsicBounds(drawable, null, null, null);
+        this.F.setMinHeight(height);
+        this.F.setText(disclamer);
+    }
+
+    public static void voteDialog(int ownerId, int postId, int date, Context ctx) {
+        new VkAlertDialog.Builder(ctx)
+                .setTitle("SponsorPost")
+                .setMessage("Этот пост является рекламным?")
+                .setPositiveButton("Да", ((dialog, which) -> {
+                    int resp = VotesService.ratePost(ownerId, postId, date, true).optInt("code");
+
+                    if (resp == 201 || resp == 100) {
+                        AndroidUtils.sendToast("Спасибо за голос!");
+                    } else {
+                        AndroidUtils.sendToast("Ваш голос уже учтен");
+                    }
+                }))
+                .setNeutralButton("Нет", ((dialog, which) -> {
+                    int resp = VotesService.ratePost(ownerId, postId, date, false).optInt("code");
+
+                    if (resp == 201 || resp == 100) {
+                        AndroidUtils.sendToast("Спасибо за голос!");
+                    } else {
+                        AndroidUtils.sendToast("Ваш голос уже учтен");
+                    }
+                }))
+                .show();
+    }
+}
@@ -36,37 +36,37 @@ public final class CommunityBorderedImageView extends BorderedCircleImageView im

    public CommunityBorderedImageView(Context context, AttributeSet attributeSet, int i) {
        super(context, attributeSet, i);
-        this.g0 = VKThemeHelper.d((int) R.attr.accent);
-        this.h0 = ContextExtKt.a(context, (int) R.color.gray_200);
+        this.g0 = VKThemeHelper.d(R.attr.accent);
+        this.h0 = ContextExtKt.a(context, R.color.gray_200);
        this.i0 = new PorterDuffColorFilter(this.g0, PorterDuff.Mode.SRC_IN);
        this.j0 = new PorterDuffColorFilter(this.h0, PorterDuff.Mode.SRC_IN);
    }

-    public final void c(int unread, int read) { // get unread and read resid
+    public void c(int unread, int read) { // get unread and read resid
        this.unread = unread;
        this.read = read;
        this.T = BitmapFactory.decodeResource(getResources(), this.unread);
    }

-    public final int getPrimaryColor() {
+    public int getPrimaryColor() {
        return this.g0;
    }

-    public final void setPrimaryColor(int i) {
+    public void setPrimaryColor(int i) {
        this.g0 = i;
        this.i0 = new PorterDuffColorFilter(i, PorterDuff.Mode.SRC_IN);
    }

-    public final int getWasViewedColor() {
+    public int getWasViewedColor() {
        return this.h0;
    }

-    public final void setWasViewedColor(int i) {
+    public void setWasViewedColor(int i) {
        this.h0 = i;
        this.j0 = new PorterDuffColorFilter(i, PorterDuff.Mode.SRC_IN);
    }

-    public final void o() {
+    public void o() {
        this.f0 = false;
        l();
    }
@@ -79,7 +79,7 @@ public final class CommunityBorderedImageView extends BorderedCircleImageView im
        }
    }

-    public final void setStoryContainer(StoriesContainer storiesContainer) {
+    public void setStoryContainer(StoriesContainer storiesContainer) {
        if (storiesContainer.L1()) {
            this.f0 = true;
            m();
@@ -30,14 +30,14 @@ public class TargetImageView extends VKMultiImageView {
    private static final int I = Screen.a(2);
    private final int B;
    private final int C;
+    private final RectF f21629d;
+    private final Paint f21630e;
+    private final RectF g;
+    private final Paint h;
    private Drawable D;
    private String[] F;
    private int G;
-    private final RectF f21629d;
-    private final Paint f21630e;
    private Canvas f21631f;
-    private final RectF g;
-    private final Paint h;

    public TargetImageView(Context context, Drawable d) {
        this(context, null, 0, 6);
@@ -51,6 +51,43 @@ public class TargetImageView extends VKMultiImageView {
        this(context, (i2 & 2) != 0 ? null : attributeSet, (i2 & 4) != 0 ? 0 : i);
    }

+    public TargetImageView(Context context, AttributeSet attributeSet, int i) {
+        super(context, attributeSet, i);
+        this.f21629d = new RectF();
+        Paint paint = new Paint();
+        paint.setAntiAlias(true);
+        paint.setDither(true);
+        paint.setFilterBitmap(true);
+        this.f21630e = paint;
+        this.g = new RectF();
+        Paint paint2 = new Paint();
+        paint2.setAntiAlias(true);
+        paint2.setStrokeWidth(I);
+        paint2.setStyle(Paint.Style.STROKE);
+        this.h = paint2;
+        this.B = getAccentColor();
+        this.C = this.B;
+        Drawable c2 = ContextExtKt.c(context, R.drawable.ic_check_circle_composite_24_full);
+        if (c2 != null) {
+            this.D = c2;
+            this.F = new String[4];
+            int i2 = I * 2;
+            setPadding(i2, i2, i2, i2);
+            if (attributeSet != null) {
+                TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, a0.TargetImageView);
+                setSelected(obtainStyledAttributes.getBoolean(0, false));
+                obtainStyledAttributes.recycle();
+            }
+            Drawable drawable = ContextCompat.getDrawable(context, R.drawable.user_placeholder);
+            for (int i3 = 0; i3 <= 3; i3++) {
+                a();
+                DraweeHolder<GenericDraweeHierarchy> a3 = this.a.a(i3);
+                a3.b().e(drawable);
+            }
+            setScaleType(ScalingUtils.b.o);
+        }
+    }
+
    private void e() {
        int i = this.G;
        for (int i2 = 0; i2 < i; i2++) {
@@ -251,41 +288,4 @@ public class TargetImageView extends VKMultiImageView {
        drawable.setBounds(i - drawable.getIntrinsicWidth(), i2 - this.D.getIntrinsicHeight(), i, i2);
        f();
    }
-
-    public TargetImageView(Context context, AttributeSet attributeSet, int i) {
-        super(context, attributeSet, i);
-        this.f21629d = new RectF();
-        Paint paint = new Paint();
-        paint.setAntiAlias(true);
-        paint.setDither(true);
-        paint.setFilterBitmap(true);
-        this.f21630e = paint;
-        this.g = new RectF();
-        Paint paint2 = new Paint();
-        paint2.setAntiAlias(true);
-        paint2.setStrokeWidth(I);
-        paint2.setStyle(Paint.Style.STROKE);
-        this.h = paint2;
-        this.B = getAccentColor();
-        this.C = this.B;
-        Drawable c2 = ContextExtKt.c(context, R.drawable.ic_check_circle_composite_24_full);
-        if (c2 != null) {
-            this.D = c2;
-            this.F = new String[4];
-            int i2 = I * 2;
-            setPadding(i2, i2, i2, i2);
-            if (attributeSet != null) {
-                TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, a0.TargetImageView);
-                setSelected(obtainStyledAttributes.getBoolean(0, false));
-                obtainStyledAttributes.recycle();
-            }
-            Drawable drawable = ContextCompat.getDrawable(context, R.drawable.user_placeholder);
-            for (int i3 = 0; i3 <= 3; i3++) {
-                a();
-                DraweeHolder<GenericDraweeHierarchy> a3 = this.a.a(i3);
-                a3.b().e(drawable);
-            }
-            setScaleType(ScalingUtils.b.o);
-        }
-    }
 }
@@ -104,6 +104,25 @@ public final class StickerDetailsAdapter extends RecyclerView.Adapter<RecyclerVi
        }
    }

+    private static final class d extends RecyclerView.ViewHolder {
+        private final VKStickerImageView mImage;
+
+        public d(ViewGroup viewGroup) {
+            super(new VKStickerImageView(viewGroup.getContext()));
+            this.mImage = (VKStickerImageView) itemView;
+            this.mImage.setAspectRatio(1.0f);
+            this.mImage.setClickable(true);
+            this.mImage.getHierarchy().a().setVisible(true, true);
+            this.mImage.getHierarchy().a(0);
+            this.mImage.setContentDescription(this.mImage.getContext().getString(R.string.stickers_accessibility_sticker));
+        }
+
+        public void a(StickerItem stickerItem) {
+            this.mImage.a(stickerItem.h(Screen.a(80)));
+            this.mImage.setTag(R.id.id, stickerItem.getId());
+        }
+    }
+
    private final class c extends RecyclerView.ViewHolder {
        private final VKImageView mImageBg;
        private final VKImageView mPackImage;
@@ -149,23 +168,4 @@ public final class StickerDetailsAdapter extends RecyclerView.Adapter<RecyclerVi
            this.mDescription.setText(stickerStockItem.C1());
        }
    }
-
-    private static final class d extends RecyclerView.ViewHolder {
-        private final VKStickerImageView mImage;
-
-        public d(ViewGroup viewGroup) {
-            super(new VKStickerImageView(viewGroup.getContext()));
-            this.mImage = (VKStickerImageView) itemView;
-            this.mImage.setAspectRatio(1.0f);
-            this.mImage.setClickable(true);
-            this.mImage.getHierarchy().a().setVisible(true, true);
-            this.mImage.getHierarchy().a(0);
-            this.mImage.setContentDescription(this.mImage.getContext().getString(R.string.stickers_accessibility_sticker));
-        }
-
-        public void a(StickerItem stickerItem) {
-            this.mImage.a(stickerItem.h(Screen.a(80)));
-            this.mImage.setTag(R.id.id, stickerItem.getId());
-        }
-    }
 }
@@ -382,7 +382,7 @@ public class StoryCircleImageView extends BorderedCircleImageView implements The
                return;
            }

-            pipelineDraweeControllerBuilder.a((Supplier<DataSource<CloseableReference<CloseableImage>>>) () -> StoryCircleImageView.this.a(list));
+            pipelineDraweeControllerBuilder.a(() -> StoryCircleImageView.this.a(list));
            return;
        }
        pipelineDraweeControllerBuilder.b(null);
@@ -13025,7 +13025,7 @@ public final class R {
        public static final int ic_launcher_shine = 0x7f0f005d; // 2131689565
        public static final int ic_launcher_shine_background = 0x7f0f005e; // 2131689566
        public static final int ic_launcher_shine_foreground = 0x7f0f005f; // 2131689567
-        public static final int vt_adaptive_launcher_foneground = 0x7f0f0043; // 2131689539
+        public static final int vt_adaptive_launcher_foreground = 0x7f0f0043; // 2131689539
        public static final int vt_launcher_round = 0x7f0f0046; // 2131689542
        public static final int ic_logo_facebook_28 = 0x7f0f0003; // 2131689475
        public static final int ic_logo_google_28 = 0x7f0f0004; // 2131689476
@@ -19661,9 +19661,39 @@ public final class R {
        public static final int cache_size = 0x7f12188d; // 2131892365
        public static final int cache_size_summ = 0x7f12188e; // 2131892366
        public static final int clear_all_cache = 0x7f12188f; // 2131892367
-        public static final int invalidate_theme_cache_each_update_title = 0x7f121890; // 2131892368
-        public static final int invertFilters = 0x7f121891; // 2131892369
-        public static final int invertFilters_summ = 0x7f121892; // 2131892370
+        public static final int disable_roaming_state = 0x7f121890; // 2131892368
+        public static final int disable_roaming_state_submit = 0x7f121891; // 2131892369
+        public static final int invalidate_theme_cache_each_update_title = 0x7f121892; // 2131892370
+        public static final int invertFilters = 0x7f121893; // 2131892371
+        public static final int invertFilters_summ = 0x7f121894; // 2131892372
+        public static final int invertcached_summ = 0x7f121895; // 2131892373
+        public static final int invertcached_title = 0x7f121896; // 2131892374
+        public static final int microg_dialog1 = 0x7f121897; // 2131892375
+        public static final int microg_dialog2 = 0x7f121898; // 2131892376
+        public static final int microg_dialog3 = 0x7f121899; // 2131892377
+        public static final int serverFeaturesDisable = 0x7f12189a; // 2131892378
+        public static final int serverFeaturesDisable_summ = 0x7f12189b; // 2131892379
+        public static final int sett_autoupdates = 0x7f12189c; // 2131892380
+        public static final int sett_autoupdates_summ = 0x7f12189d; // 2131892381
+        public static final int sett_battery = 0x7f12189e; // 2131892382
+        public static final int sett_battery_summ1 = 0x7f12189f; // 2131892383
+        public static final int sett_battery_summ2 = 0x7f1218a0; // 2131892384
+        public static final int sett_chats = 0x7f1218a1; // 2131892385
+        public static final int sett_chats_summ = 0x7f1218a2; // 2131892386
+        public static final int sett_community = 0x7f1218a3; // 2131892387
+        public static final int sett_community_summ = 0x7f1218a4; // 2131892388
+        public static final int sett_missing_links = 0x7f1218a5; // 2131892389
+        public static final int sett_missing_links_summ = 0x7f1218a6; // 2131892390
+        public static final int sett_nogms_summ = 0x7f1218a7; // 2131892391
+        public static final int sett_notifs = 0x7f1218a8; // 2131892392
+        public static final int sett_notifs_summ = 0x7f1218a9; // 2131892393
+        public static final int sett_recommendations = 0x7f1218aa; // 2131892394
+        public static final int tgs_token_missing = 0x7f1218ab; // 2131892395
+        public static final int tgs_token_reset = 0x7f1218ac; // 2131892396
+        public static final int tgs_token_reset_dialog = 0x7f1218ad; // 2131892397
+        public static final int tgs_token_reset_menu = 0x7f1218ae; // 2131892398
+        public static final int update_err = 0x7f1218af; // 2131892399
+        public static final int update_latest = 0x7f1218b0; // 2131892400
    }

    public static final class style {
@@ -35,16 +35,16 @@ public class BottomNavigationItemView extends FrameLayout implements MenuView.It
    private final View mCounterContainer;
    private final TextView mCounter;
    private final View mDot;
+    private final int mMargin;
+    private final float mSmallScale;
+    private final ImageView mIcon;
+    private final ImageView mActionIcon;
    private int mItemPos;
    private MenuItemImpl mItemData;
    private ColorStateList mColorStateList;
-    private final int mMargin;
-    private final float mSmallScale;
    private boolean mShiftingModeEnabled;
    private boolean mIconsModeEnabled;
    private boolean mStaticModeEnabled;
-    private final ImageView mIcon;
-    private final ImageView mActionIcon;

    public BottomNavigationItemView(@NonNull Context context) {
        this(context, null);
@@ -69,10 +69,10 @@ public class BottomNavigationItemView extends FrameLayout implements MenuView.It
        this.mIcon.getLayoutParams().height = V.a(28.0F);

        this.mSmallLabel = this.findViewById(R.id.smallLabel);
-        mSmallLabel.setTextColor(getCSTDock());
+        mSmallLabel.setTextColor(getCSTDock(this.getContext()));

        this.mLargeLabel = this.findViewById(R.id.largeLabel);
-        mLargeLabel.setTextColor(getCSTDock());
+        mLargeLabel.setTextColor(getCSTDock(this.getContext()));

        LayoutInflater.from(this.getContext()).inflate(R.layout.navigation_bottom_counter, this, true);
        this.mCounterContainer = this.findViewById(R.id.counter_container);
@@ -101,6 +101,10 @@ public class BottomNavigationItemView extends FrameLayout implements MenuView.It
        return this.mItemPos;
    }

+    public void setItemPosition(int pos) {
+        this.mItemPos = pos;
+    }
+
    @SuppressLint("RestrictedApi")
    public void initialize(MenuItemImpl impl, int i) {
        this.mItemData = impl;
@@ -310,10 +314,6 @@ public class BottomNavigationItemView extends FrameLayout implements MenuView.It
        ViewCompat.setBackground(this, resId != 0 ? ContextCompat.getDrawable(this.getContext(), resId) : null);
    }

-    public void setItemPosition(int pos) {
-        this.mItemPos = pos;
-    }
-
    public void setShiftingMode(boolean var1) {
        this.mShiftingModeEnabled = var1;
    }
@@ -3,7 +3,7 @@ package ru.vtosters.hooks;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import ru.vtosters.lite.utils.NewsFeedFiltersUtils;
+import ru.vtosters.lite.utils.newsfeed.NewsFeedFiltersUtils;

 public class AdBlockHook {
    public static JSONObject discoverInject(JSONObject json) throws JSONException {
@@ -11,11 +11,15 @@ public class AdBlockHook {
    }

    public static JSONArray feedInject(JSONArray items) {
-        return NewsFeedFiltersUtils.feedInject(items);
+        return NewsFeedFiltersUtils.feedInject(items, false);

    }

-    public static JSONObject storiesads(JSONObject json, boolean isDeleteFix) throws JSONException {
-        return NewsFeedFiltersUtils.storiesads(json, isDeleteFix);
+    public static JSONArray wallGetById(JSONArray items) {
+        return NewsFeedFiltersUtils.feedInject(items, true);
+    }
+
+    public static JSONObject storiesads(JSONObject json, boolean isDeleteFix) {
+        return NewsFeedFiltersUtils.storiesAds(json, isDeleteFix);
    }
 }
@@ -12,12 +12,12 @@ import com.vk.im.engine.models.messages.NestedMsg;
 import com.vk.libsqliteext.CustomSqliteExtensionsKt;
 import io.requery.android.database.sqlite.SQLiteDatabase;
 import io.requery.android.database.sqlite.SQLiteOpenHelper;
+import ru.vtosters.hooks.other.Preferences;

 import java.util.ArrayList;
 import java.util.List;

 import static ru.vtosters.hooks.other.Preferences.getBoolValue;
-import static ru.vtosters.hooks.other.Preferences.getString;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;

 public class DeletedMessagesHook {
@@ -69,7 +69,7 @@ public class DeletedMessagesHook {
    }

    private static String getPrefixUndelete() {
-        var prefs = getString("undeletemsg_prefix_value");
+        var prefs = Preferences.getPreferences().getString("undeletemsg_prefix_value", "🗑");

        if (prefs.isEmpty()) {
            return "\uD83D\uDDD1 ";
@@ -78,7 +78,7 @@ public class DeletedMessagesHook {
        return prefs + " ";
    }

-    public static void updateDialog(MsgDeleteLpTask msgDeleteLpTask) throws NoSuchFieldException, IllegalAccessException {
+    public static void updateDialog(MsgDeleteLpTask msgDeleteLpTask) {
        var cursor = getMessageFromDatabaseById(msgDeleteLpTask.d);
        if (cursor == null) return;

@@ -157,4 +157,4 @@ public class DeletedMessagesHook {
            return msgIdsList;
        }
    }
-}
+}
@@ -65,7 +65,7 @@ public class DockBarInjector {
        for (DockBarTab tab : sManager.getSelectedTabs()) {
            MenuItem add = menu.add(0, tab.id, 0, tab.titleID);

-            add.setIcon(new RecoloredDrawable(getResources().getDrawable(tab.iconID), getCSTDock()));
+            add.setIcon(new RecoloredDrawable(getResources().getDrawable(tab.iconID), getCSTDock(navigationView.getContext())));
            add.setTitle(getGlobalContext().getString(tab.titleID));
            add.setCheckable(true);
        }
@@ -76,7 +76,7 @@ public class DockBarInjector {
                item.setStaticMode(true);
                item.setIconsMode(false);
                item.setShiftingMode(false);
-                item.setTextColor(getCSTDock());
+                item.setTextColor(getCSTDock(item.getContext()));
            }
        }
    }
@@ -72,8 +72,9 @@ public class EncryptionMessagesHook {
    public static String decryptMessage(String msgBody, int peer) {
        try {
            for (IMProcessor processor : EncryptProvider.processors) {
-                if ((processor.isUsed() || !processor.isPublic()) && processor.isEncrypted(msgBody) && (processor.isPublic() || EncryptProvider.getKeyForProcessor(processor, peer) != null))
-                    return "\uD83D\uDD12 " + injectOwnTextAll(processor.decode(msgBody, EncryptProvider.getKeyForProcessor(processor, peer)));
+                if ((processor.isUsed() || !processor.isPublic()) && processor.isEncrypted(msgBody) && (processor.isPublic() || EncryptProvider.getKeyForProcessor(processor, peer) != null)) {
+                    return "\uD83D\uDD12 " + processor.getUIName() + ": " + injectOwnTextAll(processor.decode(msgBody, EncryptProvider.getKeyForProcessor(processor, peer)));
+                }
            }
        } catch (Exception e) {
            e.printStackTrace();
@@ -0,0 +1,38 @@
+package ru.vtosters.hooks;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.util.zip.GZIPInputStream;
+
+public class FirebaseGzipSupport {
+    public static JSONObject getJsonObjectFromConnection(URLConnection connection) throws IOException, JSONException {
+        InputStream inputStream = getDecompressedInputStream(connection);
+        String jsonString = readInputStream(inputStream);
+        return new JSONObject(jsonString);
+    }
+
+    private static InputStream getDecompressedInputStream(URLConnection connection) throws IOException {
+        String contentEncoding = connection.getHeaderField("Content-Encoding");
+        if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {
+            return new GZIPInputStream(connection.getInputStream());
+        }
+        return connection.getInputStream();
+    }
+
+    private static String readInputStream(InputStream inputStream) throws IOException {
+        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
+        StringBuilder sb = new StringBuilder();
+        int read;
+        while ((read = bufferedReader.read()) != -1) {
+            sb.append((char) read);
+        }
+        return sb.toString();
+    }
+}
@@ -0,0 +1,32 @@
+package ru.vtosters.hooks;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import com.vk.dto.gift.GiftCategory;
+import com.vtosters.lite.TabletDialogActivity;
+import com.vtosters.lite.fragments.gifts.GiftCategoryFragment;
+import ru.vtosters.lite.ui.fragments.SuperAppEditorFragment;
+import ru.vtosters.lite.utils.NavigatorUtils;
+
+import java.util.ArrayList;
+
+public class GiftsFix {
+    public static Bundle staticBundle;
+
+    public static void openGiftCategoryFragment(Activity activity, ArrayList<Integer> userIds, GiftCategory giftCategory, int balance, String reference) {
+        Bundle bundle = new Bundle();
+        bundle.putIntegerArrayList("uids", userIds);
+        bundle.putParcelable("data", giftCategory);
+        bundle.putInt("balance", balance);
+        bundle.putString("ref", reference);
+
+        staticBundle = bundle;
+
+        NavigatorUtils.switchFragment(activity, GiftCategoryFragment.class);
+    }
+
+    public static Bundle getBundle() {
+        return staticBundle;
+    }
+}
@@ -11,37 +11,37 @@ import com.vtosters.lite.R;
 import ru.vtosters.lite.utils.AndroidUtils;

 public class GmsHook {
-    private static final boolean needToSpoof = !isGmsInstalled() && (isFakeGmsInstalled() || isFakeGms2Installed());
+    private static final String[] spoofPackages = {"com.mgoogle", "app.revanced"};
+    private static final String currentGms;
+
+    static {
+        currentGms = getSpoofPackagePrefix();
+    }
+
+    private static boolean isPackageInstalled(String packageName) {
+        try {
+            AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo(packageName, 0);
+            return true;
+        } catch (Exception unused) {
+            return false;
+        }
+    }

    public static boolean isGmsInstalled() {
-        try {
-            AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo("com.google.android.gms", 0);
-            return true;
-        } catch (Exception unused) {
-            return false;
-        }
-    } // Google Market Services check
+        return isPackageInstalled("com.google.android.gms");
+    }

-    public static boolean isFakeGmsInstalled() {
-        try {
-            AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo("com.mgoogle.android.gms", 0);
-            return true;
-        } catch (Exception unused) {
-            return false;
-        }
-    } // Microg Google Market Services check
-
-    public static boolean isFakeGms2Installed() {
-        try {
-            AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo("app.revanced.android.gms", 0);
-            return true;
-        } catch (Exception unused) {
-            return false;
-        }
-    } // Microg Google Market Services check
+    public static boolean isSpoofPackageInstalled(String packageName) {
+        return isPackageInstalled(packageName + ".android.gms");
+    }

    public static boolean isAnyServicesInstalled() {
-        return isGmsInstalled() || isFakeGmsInstalled() || isFakeGms2Installed();
+        for (String packageName : spoofPackages) {
+            if (isSpoofPackageInstalled(packageName)) {
+                return true;
+            }
+        }
+        return false;
    }

    public static void fixGapps() {
@@ -52,10 +52,10 @@ public class GmsHook {
                notificationManager.createNotificationChannel(new NotificationChannel("audio_playback_channel", AndroidUtils.getResources().getString(R.string.audio_message_play_error), NotificationManager.IMPORTANCE_LOW));
            }
        }
-    } // Music channels fix
+    }

    public static String replaceGMSPackage(String str) {
-        return needToSpoof ? str.replaceAll("com.google", (isFakeGms2Installed() ? "app.revanced" : "com.mgoogle")) : str;
+        return shouldSpoof() ? str.replaceAll("com.google", currentGms) : str;
    }

    public static String getFirebaseInstanceIdReceiver() {
@@ -63,6 +63,37 @@ public class GmsHook {
    }

    public static Class getFirebaseInstanceIdReceiverClass() {
-        return needToSpoof ? (isFakeGms2Installed() ? FirebaseInstanceIdReceiver3.class : FirebaseInstanceIdReceiver2.class) : FirebaseInstanceIdReceiver.class;
+        return getSpoofFirebaseInstanceIdReceiverClass();
    }
-}
+
+    public static String getCurrentGms() {
+        return currentGms;
+    }
+
+    private static boolean shouldSpoof() {
+        return !isGmsInstalled() && (isSpoofPackageInstalled("com.mgoogle") || isSpoofPackageInstalled("app.revanced"));
+    }
+
+    private static String getSpoofPackagePrefix() {
+        for (String packageName : spoofPackages) {
+            if (isSpoofPackageInstalled(packageName)) {
+                return packageName;
+            }
+        }
+        return "com.google";
+    }
+
+    private static Class getSpoofFirebaseInstanceIdReceiverClass() {
+        switch (currentGms) {
+            case "com.mgoogle" -> {
+                return FirebaseInstanceIdReceiver2.class;
+            }
+            case "app.revanced" -> {
+                return FirebaseInstanceIdReceiver3.class;
+            }
+            default -> {
+                return FirebaseInstanceIdReceiver.class;
+            }
+        }
+    }
+}
@@ -0,0 +1,9 @@
+package ru.vtosters.hooks;
+
+import ru.vtosters.hooks.other.Preferences;
+
+public class GroupCoverHook {
+    public static boolean needToDisableCovers() {
+        return Preferences.getBoolValue("disablevideoscovers", false);
+    }
+}
@@ -3,10 +3,11 @@ package ru.vtosters.hooks;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.utils.FriendsCatalogUtils;
-import ru.vtosters.lite.utils.NewsFeedFiltersUtils;
 import ru.vtosters.lite.utils.OnlineBypass;
 import ru.vtosters.lite.utils.SuperAppUtils;
+import ru.vtosters.lite.utils.newsfeed.NewsFeedFiltersUtils;

 import java.io.IOException;
 import java.text.ParseException;
@@ -30,10 +31,10 @@ public class JsonInjectors {
    }

    public static JSONArray newsfeedlist(JSONArray items) throws JSONException {
-        return NewsFeedFiltersUtils.newsfeedlist(items);
+        return Preferences.getBoolValue("unlockCustomLists", false) ? NewsFeedFiltersUtils.setNewsfeedLists(items) : items;
    }

    public static JSONObject friends(JSONObject json) throws JSONException, ParseException, IOException {
        return FriendsCatalogUtils.inject(json);
    }
-}
+}
@@ -6,6 +6,7 @@ import android.os.Build;
 import b.h.g.k.VKProgressDialog;
 import com.aefyr.tsg.g2.TelegramStickersService;
 import com.vk.core.dialogs.alert.VkAlertDialog;
+import com.vk.medianative.NativeLibLoader;
 import com.vtosters.lite.R;
 import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.hooks.other.ThemesUtils;
@@ -17,20 +18,17 @@ import ru.vtosters.lite.themes.ThemesManager;
 import ru.vtosters.lite.ui.dialogs.InstallGMS;
 import ru.vtosters.lite.ui.dialogs.OTADialog;
 import ru.vtosters.lite.ui.dialogs.Start;
-import ru.vtosters.lite.utils.AndroidUtils;
-import ru.vtosters.lite.utils.LifecycleUtils;
-import ru.vtosters.lite.utils.NavigatorUtils;
-import ru.vtosters.lite.utils.VTVerifications;
+import ru.vtosters.lite.utils.*;
+import ru.vtosters.sponsorpost.internal.Native;
+import ru.vtosters.sponsorpost.utils.Updates;

 import static ru.vtosters.hooks.other.Preferences.checkupdates;
-import static ru.vtosters.lite.ui.dialogs.ServerDialog.sendRequest;
 import static ru.vtosters.lite.utils.CacheUtils.getInstance;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.setupFilters;

 public class MainActivityInjector {
    public static void inject(Activity activity) {
        SystemThemeChangerHook.themeOnStart(activity);
-        sendRequest();
+
        UsersList.getUsersList();
        VTVerifications.load(activity);

@@ -38,9 +36,12 @@ public class MainActivityInjector {

        VTExecutors.getSlowTasksScheduler().a(() -> {
            getInstance().autoCleaningCache();
-        }); // slowTasksScheduler

-        setupFilters();
+            if (!Preferences.serverFeaturesDisable()) {
+                Updates.updateFilters();
+                Updates.updatePosts();
+            }
+        }); // slowTasksScheduler

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            NotificationChannels.createChannels();
@@ -65,6 +66,10 @@ public class MainActivityInjector {
        // VKIDProtection.alert(activity);
        //needs to show selected tgs pack count in settings after cold launch
        TelegramStickersService.getInstance(activity);
+
+        if (AccountManagerUtils.isLogin() && !Preferences.serverFeaturesDisable() && Preferences.isValidSignature()) {
+            Native.canVote = NativeLibLoader.loadLibrary("sponsorpost");
+        }
    }

    private static void updateBinsAndTmpArchive(Activity activity) {
@@ -78,7 +83,7 @@ public class MainActivityInjector {
                ThemesManager.generateModApk(ThemesUtils.getReservedAccent());
                activity.runOnUiThread(LifecycleUtils::restartApplication);
            } catch (Throwable e) {
-                e.printStackTrace();
+                e.fillInStackTrace();
                activity.runOnUiThread(() -> {
                    dialog.cancel();
                    new VkAlertDialog.Builder(activity)
@@ -7,6 +7,7 @@ import com.vk.api.internal.MethodCall;
 import com.vk.im.ui.providers.audiomsg.ImAudioMsgPlayerProvider;
 import com.vk.im.ui.providers.audiomsg.PlayerActionSources;
 import com.vtosters.lite.im.ImEngineProvider;
+import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.translators.BaseTranslator;
 import ru.vtosters.lite.ui.dialogs.MessageSettings;
 import ru.vtosters.lite.utils.LifecycleUtils;
@@ -20,7 +21,7 @@ import static ru.vtosters.lite.ui.dialogs.MessageSettings.isSilentEnabled;

 public class MessagesHook {
    public static String injectOwnText(String oldText) {
-        if (!autotranslate() || TextUtils.isEmpty(oldText))
+        if (!autotranslate() || Preferences.serverFeaturesDisable() || TextUtils.isEmpty(oldText))
            return oldText;
        var instance = BaseTranslator.getInstance();

@@ -28,7 +29,7 @@ public class MessagesHook {
    }

    public static String injectOwnTextAll(String oldText) {
-        if (!autoalltranslate() || TextUtils.isEmpty(oldText)) {
+        if (!autoalltranslate() || Preferences.serverFeaturesDisable() || TextUtils.isEmpty(oldText)) {
            return oldText;
        }
        var instance = BaseTranslator.getInstance();
@@ -1,18 +1,27 @@
 package ru.vtosters.hooks;

 import android.content.Context;
+import android.net.NetworkInfo;
 import android.os.PowerManager;
+import android.telephony.TelephonyManager;
+import android.util.Log;
 import androidx.recyclerview.widget.RecyclerView;
 import com.vk.core.preference.Preference;
 import com.vk.discover.DiscoverItemDecorator;
+import ru.vtosters.hooks.other.Preferences;
+import ru.vtosters.lite.concurrent.VTExecutors;
+import ru.vtosters.lite.utils.NetworkUtils;
+import ru.vtosters.sponsorpost.internal.VotesPreferences;
+import ru.vtosters.sponsorpost.internal.VotesService;
+import ru.vtosters.sponsorpost.services.PostService;
+import ru.vtosters.sponsorpost.utils.PostsPreferences;

-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;

 import static java.lang.Long.MAX_VALUE;
 import static ru.vtosters.hooks.other.Preferences.*;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
+import static ru.vtosters.lite.utils.AndroidUtils.sendToast;

 public class NewsfeedHook {
    public static long getUpdateNewsfeed(boolean refresh_timeout) {
@@ -22,8 +31,7 @@ public class NewsfeedHook {
        return switch (getString("newsupdate")) {
            case "no_update" -> MAX_VALUE;
            case "imd_update" -> 10000L;
-            default ->
-                    Preference.b().getLong(refresh_timeout ? "refresh_timeout_top" : "refresh_timeout_recent", 600000L);
+            default -> Preference.b().getLong(refresh_timeout ? "refresh_timeout_top" : "refresh_timeout_recent", 600000L);
        };
    }

@@ -53,41 +61,89 @@ public class NewsfeedHook {
    }

    public static String[] feedParams() {
-        HashSet<String> params = new HashSet<>();
-        params.add("post");
-        params.add("photo");
-        params.add("photo_tag");
+        List<String> params = List.of("post", "photo", "photo_tag", "friends_recomm", "app_widget", "promo_button", "authors_rec");

-        if (!friendsrecomm()) {
-            params.add("friends_recomm");
+        HashSet<String> filteredParams = new HashSet<>();
+
+        for (String param : params) {
+            if (!isDisabled(param)) {
+                filteredParams.add(param);
+            }
        }

-        if (!ads()) {
-            params.add("app_widget");
-            params.add("promo_button");
-        }
+        return filteredParams.toArray(new String[0]);
+    }

-        if (!authorsrecomm()) {
-            params.add("authors_rec");
-        }
-
-        return params.toArray(new String[0]);
+    private static boolean isDisabled(String param) {
+        return switch (param) {
+            case "friends_recomm" -> friendsrecomm();
+            case "app_widget", "promo_button" -> ads();
+            case "authors_rec" -> authorsrecomm();
+            default -> false;
+        };
    }

    public static void adsParams(HashSet<String> hashSet) {
+        String[] adsParams = {"ads_app_slider", "ads_site_slider", "ads_app", "ads_site", "ads_post", "ads_app_video", "ads_post_pretty_cards", "ads_post_snippet_video"};
+        String noAdParam = "ads_disabled";
+
        if (ads()) {
-            hashSet.add("ads_disabled");
+            hashSet.add(noAdParam);
+
+            if (!Preferences.milkshake()) {
+                hashSet.add(adsParams[0]);
+            }
        } else {
-            hashSet.add("ads_app_slider");
-            hashSet.add("ads_site_slider");
+            Collections.addAll(hashSet, adsParams);
+        }
+    }
+
+    public static void takeOwnerIdSponsorPost(int ownerid) {
+        if (NetworkUtils.isNetworkConnected() && PostsPreferences.isEnabled() && !Preferences.serverFeaturesDisable()) {
+            VTExecutors.getIoScheduler().a(() -> {
+                if (PostsPreferences.isGroupAd(ownerid) || VotesPreferences.isGroupAd(ownerid)) {
+                    if (VotesPreferences.isEnabled()) {
+                        Map<String, List<String>> postIds = VotesService.getPostIdsByOwnerId((long) ownerid, 0L);
+                        VotesPreferences.saveGroupSpecifiedPosts(postIds.get("vote"), (long) ownerid);
+                        PostsPreferences.saveGroupSpecifiedPosts(postIds.get("prod"), (long) ownerid);
+                    } else {
+                        List<Long> postIds = PostService.getPostIdsByOwnerId((long) ownerid, 0L);
+                        PostsPreferences.saveGroupSpecifiedPosts(postIds, (long) ownerid);
+                    }
+                }
+            });
+        }
+    }
+
+    public static void takeOwnerIdPostIdSponsorPost(String[] strArr) {
+        long ownerid = Long.parseLong(strArr[0].split("_")[0]);
+        long postId = Long.parseLong(strArr[0].split("_")[1]);
+
+        if (PostsPreferences.isPostAd(ownerid, postId) || VotesPreferences.isPostAd(ownerid, postId)) {
+            return;
        }

-        hashSet.add("ads_app");
-        hashSet.add("ads_site");
-        hashSet.add("ads_post");
-        hashSet.add("ads_app_video");
-        hashSet.add("ads_post_pretty_cards");
-        hashSet.add("ads_post_snippet_video");
+        if (NetworkUtils.isNetworkConnected() && PostsPreferences.isEnabled() && !Preferences.serverFeaturesDisable()) {
+            VTExecutors.getIoScheduler().a(() -> {
+                if (VotesPreferences.isEnabled()) {
+                    boolean postIds = VotesService.isPostAd(ownerid, postId);
+
+                    if (postIds) {
+                        VotesPreferences.saveAdPostInfo(ownerid, postId);
+                    }
+                } else {
+                    boolean postIds = PostService.isPostAd(ownerid, postId);
+
+                    if (postIds) {
+                        PostsPreferences.saveAdPostInfo(ownerid, postId);
+
+                        if (!PostsPreferences.isEnabledMarking()) {
+                            sendToast("Этот пост помечен как рекламный");
+                        }
+                    }
+                }
+            });
+        }
    }

    public static boolean isPowerSaveMode() {
@@ -96,4 +152,12 @@ public class NewsfeedHook {
 //        return !getBoolValue("force_disable_psm", false) && pw.isPowerSaveMode();
        return false;
    }
+
+    public static boolean isRoaming(NetworkInfo networkInfo) {
+        return !Preferences.disableForceTrafficSaver() && networkInfo.isRoaming();
+    }
+
+    public static boolean isNetworkRoaming(TelephonyManager telephonyManager) {
+        return !Preferences.disableForceTrafficSaver() && telephonyManager.isNetworkRoaming();
+    }
 }
@@ -1,15 +1,23 @@
 package ru.vtosters.hooks;

 import android.util.Log;
+import android.util.SparseArray;
+import com.vk.core.network.Network;
+import com.vk.im.engine.internal.api_parsers.UserApiParser;
+import com.vk.im.engine.models.users.User;
 import com.vtosters.lite.R;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.Response;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.utils.AndroidUtils;

 import java.io.IOException;
-import java.text.ParseException;

+import static com.vk.core.network.Network.ClientType.CLIENT_API;
 import static ru.vtosters.hooks.other.Preferences.*;
 import static ru.vtosters.lite.net.Request.makeRequest;
 import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
@@ -87,22 +95,34 @@ public class OnlineFormatterHook {

        if (appname != null) return appname;

-        makeRequest("https://" + getApi() + "/method/apps.get?app_id=" + appid + "&v=5.99&access_token=" + getUserToken(),
-                response -> {
-                    try {
-                        JSONObject mainJson = new JSONObject(response);
-                        JSONObject responseJson = mainJson.getJSONObject("response");
-                        JSONArray itemsJson = responseJson.getJSONArray("items");
+        okhttp3.Request req = new okhttp3.Request.a()
+                .b("https://" + getApi() + "/method/apps.get?app_id=" + appid + "&v=5.99&access_token=" + getUserToken())
+                .a();

-                        AppName = itemsJson.getJSONObject(0).optString("title", "");
+        Network.b(CLIENT_API).a(req).a(new Callback() {
+            @Override
+            public void a(Call call, IOException e) {
+                e.fillInStackTrace();
+            }

-                        prefs.edit().putString(String.valueOf(appid), AppName).apply();
+            @Override
+            public void a(Call call, Response response) throws IOException {
+                try {
+                    JSONObject mainJson = new JSONObject(response.a().g());
+                    JSONObject responseJson = mainJson.getJSONObject("response");
+                    JSONArray itemsJson = responseJson.getJSONArray("items");
+
+                    AppName = itemsJson.getJSONObject(0).optString("title", "");
+
+                    prefs.edit().putString(String.valueOf(appid), AppName).apply();
+
+                    if (dev()) sendToast("AppName: " + AppName + " for appid: " + appid);
+                } catch (JSONException e) {
+                    e.fillInStackTrace();
+                }
+            }
+        });

-                        if (dev()) sendToast("AppName: " + AppName + " for appid: " + appid);
-                    } catch (JSONException e) {
-                        e.printStackTrace();
-                    }
-                });

        return AppName;
    }
@@ -115,26 +135,52 @@ public class OnlineFormatterHook {
        return AndroidUtils.getString(R.string.custom_online) + " " + appname;
    }

-    public static JSONObject onlineHook(JSONObject json) throws ParseException, IOException, JSONException {
-        if (getBoolValue("onlinefix", false)) JsonInjectors.setOnlineInfo(json);
+    public static JSONObject onlineHook(JSONObject json) {
+        if (!getBoolValue("onlinefix", false) || Preferences.serverFeaturesDisable()) return json;
+
+        try {
+            JsonInjectors.setOnlineInfo(json);
+        } catch (JSONException e) {
+            Log.e("onlineHook", e.getMessage());
+        }

        return json;
    }

-    public static JSONArray onlineHookList(JSONArray jsonArr) throws ParseException, IOException, JSONException {
-        if (!getBoolValue("onlinefix", false)) return jsonArr;
-
+    public static SparseArray<User> onlineHookList(String str) {
+        JSONArray jSONArray;
        try {
-            JsonInjectors.setOnlineInfoUsers(jsonArr);
-        } catch (Exception e) {
-            Log.e("onlineHookProfiles", e.getMessage());
+            jSONArray = new JSONObject(str).getJSONArray("response");
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
+        }
+        SparseArray<User> sparseArray = new SparseArray<>(jSONArray.length());
+        int length = jSONArray.length();
+
+        if (getBoolValue("onlinefix", false) || !Preferences.serverFeaturesDisable()) {
+            try {
+                jSONArray = JsonInjectors.setOnlineInfoUsers(jSONArray);
+            } catch (JSONException e) {
+                throw new RuntimeException(e);
+            }
        }

-        return jsonArr;
+        for (int i = 0; i < length; i++) {
+            JSONObject jSONObject;
+            try {
+                jSONObject = jSONArray.getJSONObject(i);
+            } catch (JSONException e) {
+                throw new RuntimeException(e);
+            }
+            User b = UserApiParser.b(jSONObject);
+            sparseArray.put(b.getId(), b);
+        }
+
+        return sparseArray;
    }

    public static JSONObject onlineHookProfiles(JSONObject json) {
-        if (!getBoolValue("onlinefix", false)) return json;
+        if (!getBoolValue("onlinefix", false) || Preferences.serverFeaturesDisable()) return json;

        try {
            JsonInjectors.setOnlineInfoUsers(json.optJSONArray("profiles"));
@@ -146,7 +192,7 @@ public class OnlineFormatterHook {
    }

    public static JSONObject onlineHookItems(JSONObject json) {
-        if (!getBoolValue("onlinefix", false)) return json;
+        if (!getBoolValue("onlinefix", false) || Preferences.serverFeaturesDisable()) return json;

        try {
            JsonInjectors.setOnlineInfoUsers(json.optJSONArray("items"));
@@ -157,25 +203,25 @@ public class OnlineFormatterHook {
        return json;
    }

-    public static JSONObject onlineHookRequestsAndRecommendations(JSONObject json) throws ParseException, IOException, JSONException {
-        if (!getBoolValue("onlinefix", false)) return json;
+    public static JSONObject onlineHookRequestsAndRecommendations(JSONObject json) {
+        if (!getBoolValue("onlinefix", false) || Preferences.serverFeaturesDisable()) return json;

        try {
            JsonInjectors.setOnlineInfoUsers(json.optJSONObject("read_requests").optJSONArray("items"));
        } catch (Exception e) {
-            Log.e("onlineHookItems", e.getMessage());
+            Log.e("onlineHookItemsRec", e.getMessage());
        }

        try {
            JsonInjectors.setOnlineInfoUsers(json.optJSONObject("recommendations").optJSONArray("items"));
        } catch (Exception e) {
-            Log.e("onlineHookItems", e.getMessage());
+            Log.e("onlineHookItemsRec", e.getMessage());
        }

        try {
            JsonInjectors.setOnlineInfoUsers(json.optJSONArray("profiles"));
        } catch (Exception e) {
-            Log.e("onlineHookItems", e.getMessage());
+            Log.e("onlineHookItemsRec", e.getMessage());
        }

        return json;
@@ -15,6 +15,7 @@ import android.widget.Toast;
 import androidx.core.content.FileProvider;
 import com.vk.core.dialogs.actionspopup.ActionsPopup;
 import com.vk.core.dialogs.alert.VkAlertDialog;
+import com.vk.core.network.Network;
 import com.vk.core.util.ToastUtils;
 import com.vk.dto.common.AttachmentWithMedia;
 import com.vk.dto.common.ImageSize;
@@ -90,7 +91,7 @@ public class PhotoViewer {
        var req = new Request.a()
                .b(getImageUrlFromAttachment(attachment))
                .a();
-        client.a(req).a(new Callback() {
+        Network.b(Network.ClientType.CLIENT_API).a(req).a(new Callback() {
            @Override
            public void a(Call call, IOException e) {
                e.printStackTrace();
@@ -100,7 +101,7 @@ public class PhotoViewer {
            public void a(Call call, Response response)
                    throws IOException {
                var tmpImage = new File(AndroidUtils.getGlobalContext().getExternalCacheDir(), attachment.getId() + ".jpg");
-                try (var resp = client.a(req).execute();
+                try (var resp = Network.b(Network.ClientType.CLIENT_IMAGE_LOADER).a(req).execute();
                     var sink = Okio.a(Okio.b(tmpImage))) {
                    sink.a(resp.a().f());
                    var manager = (ClipboardManager) AndroidUtils.getGlobalContext().getSystemService(Context.CLIPBOARD_SERVICE);
@@ -175,4 +176,4 @@ public class PhotoViewer {
        }
        return max.url;
    }
-}
+}
@@ -0,0 +1,43 @@
+package ru.vtosters.hooks;
+
+import android.content.Context;
+import android.util.Log;
+import com.vk.dto.newsfeed.entries.NewsEntry;
+import com.vk.dto.newsfeed.entries.Post;
+import com.vk.newsfeed.NewsEntryActionsAdapter;
+import com.vk.newsfeed.holders.AdMarkHolder;
+import ru.vtosters.hooks.other.Preferences;
+import ru.vtosters.lite.utils.AccountManagerUtils;
+import ru.vtosters.sponsorpost.internal.Native;
+import ru.vtosters.sponsorpost.utils.PostsPreferences;
+
+public class PostsMenuHook {
+    private static final int id = 200;
+
+    public static void injectList(NewsEntryActionsAdapter actionsAdapter, NewsEntry newsEntry) {
+        if (newsEntry instanceof Post && Preferences.isValidSignature() && Native.canVote()) {
+            int ownerId = ((Post) newsEntry).b();
+
+            if (ownerId != AccountManagerUtils.getUserId() && PostsPreferences.isEnabled()) {
+                actionsAdapter.a(id, "SponsorPost");
+            }
+        }
+    }
+
+    public static void injectButtons(int i, NewsEntry newsEntry, Context context) {
+        if (newsEntry instanceof Post) {
+            Post post = (Post) newsEntry;
+            int ownerId = post.b();
+            int postId = post.P1();
+            int date = post.K();
+
+            AdMarkHolder.voteDialog(ownerId, postId, date, context);
+        } else {
+            Log.d("PostsMenuHook", "unsupported instance");
+        }
+    }
+
+    public static boolean isCustomButton(int i) {
+        return i == id;
+    }
+}
@@ -26,26 +26,15 @@ import static ru.vtosters.lite.utils.LifecycleUtils.restartApplication;

 public class ProxyHook {
    public static String linkReplacer(String link) {
-        var vkapi = "api.vk.com";
-        var oauth = "oauth.vk.com";
-        var vkstatic = "static.vk.com";
+        String vkapi = "api.vk.com";
+        String oauth = "oauth.vk.com";
+        String vkstatic = "static.vk.com";

-        var proxyapi = getString("proxyapi");
-        var proxyoauth = getString("proxyoauth");
-        var proxystatic = getString("proxystatic");
+        String proxyapi = getProxyHost("proxyapi");
+        String proxyoauth = getProxyHost("proxyoauth");
+        String proxystatic = getProxyHost("proxystatic");

-        if (isVikaProxyEnabled()) {
-            proxyapi = VikaMobile.getApiHost();
-            proxyoauth = VikaMobile.getOauthHost();
-            proxystatic = VikaMobile.getStaticHost();
-        }
-
-        if (!isAnyProxyEnabled() || link.isEmpty()) {
-            return link;
-        }
-
-        if (proxyapi.isEmpty() || proxyoauth.isEmpty() || proxystatic.isEmpty()) {
-            Log.d("VTLite", "Proxy is not set" + " " + proxyapi + " " + proxyoauth + " " + proxystatic);
+        if (!isAnyProxyEnabled() || link.isEmpty() || areProxyHostsEmpty(proxyapi, proxyoauth, proxystatic)) {
            return link;
        }

@@ -64,6 +53,29 @@ public class ProxyHook {
        return link;
    }

+    private static String getProxyHost(String hostType) {
+        if (isVikaProxyEnabled()) {
+            return switch (hostType) {
+                case "proxyapi" -> VikaMobile.getApiHost();
+                case "proxyoauth" -> VikaMobile.getOauthHost();
+                case "proxystatic" -> VikaMobile.getStaticHost();
+                default -> "";
+            };
+        } else {
+            return "";
+        }
+    }
+
+    private static boolean areProxyHostsEmpty(String... hosts) {
+        for (String host : hosts) {
+            if (host.isEmpty()) {
+                Log.d("VTLite", "Proxy is not set: " + host);
+                return true;
+            }
+        }
+        return false;
+    }
+
    public static String staticFix(String str) {
        var string = getString("proxystatic");

@@ -108,22 +120,18 @@ public class ProxyHook {

        RadioButton rgDefault = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
        RadioButton rgZaborona = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
-        RadioButton rgRandomProxy = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
        RadioButton rgVika = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));

        SwitchHook.setCompoundButton(rgDefault);
        SwitchHook.setCompoundButton(rgZaborona);
-        SwitchHook.setCompoundButton(rgRandomProxy);
        SwitchHook.setCompoundButton(rgVika);

        rg.addView(rgDefault);
        rg.addView(rgVika);
        rg.addView(rgZaborona);
-        rg.addView(rgRandomProxy);

        rgDefault.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
        rgZaborona.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
-        rgRandomProxy.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
        rgVika.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));

        rg.setPadding(dp2px(18f), dp2px(12f), dp2px(18f), 0);
@@ -134,28 +142,21 @@ public class ProxyHook {
        rgZaborona.setText(ctx.getString(R.string.proxy_enable) + " (Zaborona)");
        rgZaborona.setTextColor(getTextAttr());

-        rgRandomProxy.setText(ctx.getString(R.string.proxy_enable) + " (Random Socks Proxy)");
-        rgRandomProxy.setTextColor(getTextAttr());
-
        rgVika.setText(ctx.getString(R.string.proxy_enable) + " (Vika Mobile)");
        rgVika.setTextColor(getTextAttr());

        rgZaborona.setChecked(isZaboronaEnabled());
-        rgDefault.setChecked(!isZaboronaEnabled() && !isRandomProxyEnabled() && !isVikaProxyEnabled());
-        rgRandomProxy.setChecked(isRandomProxyEnabled());
+        rgDefault.setChecked(!isZaboronaEnabled() && !isVikaProxyEnabled());
        rgVika.setChecked(isVikaProxyEnabled());

        new VkAlertDialog.Builder(ctx)
                .setTitle(ctx.getString(R.string.vtlproxy))
-                .setMessage(ctx.getString(R.string.proxy_warning))
+                .setMessage(ctx.getString(R.string.proxy_warning) + "\n\nТак же можно включить встроенный прокси от ВКонтакте перейдя в настройки прокси")
                .setView(rg)
                .setPositiveButton(ctx.getString(R.string.vtl_confirm), ((dialog, which) -> { // Применить
                    if (rgZaborona.isChecked()) {
                        Preferences.getPreferences().edit().putString("proxy", "zaborona").commit();
                        restartApplication();
-                    } else if (rgRandomProxy.isChecked()) {
-                        Preferences.getPreferences().edit().putString("proxy", "randomproxy").commit();
-                        restartApplication();
                    } else if (rgVika.isChecked()) {
                        Preferences.getPreferences().edit().putString("proxy", "vika").commit();
                        restartApplication();
@@ -169,4 +170,4 @@ public class ProxyHook {
                })
                .show();
    }
-}
+}
@@ -1,29 +1,40 @@
 package ru.vtosters.hooks;

+import androidx.core.util.Pair;
 import org.json.JSONException;
 import org.json.JSONObject;
+import ru.vtosters.hooks.other.Preferences;
+import ru.vtosters.lite.utils.RenameTool;

 public class RenameHook {
    public static void injectIntoJson(JSONObject obj) throws JSONException {
-//        int i = obj.getInt("id");
-//        if (RenameTool.updateRequested) {
-//            RenameTool.reloadDB();
-//        }
-//
-//        Pair<String, String> user = RenameTool.renamedUsers.get(i);
-//        if (user == null) return;
-//        obj.put(RenameTool.COLUMN_FIRSTNAME, user.first).put(RenameTool.COLUMN_LASTNAME, user.second);
+        if (isEnabled()) {
+            int i = obj.getInt("id");
+            if (RenameTool.updateRequested) {
+                RenameTool.reloadDB();
+            }
+
+            Pair<String, String> user = RenameTool.renamedUsers.get(i);
+            if (user == null) return;
+            obj.put(RenameTool.COLUMN_FIRSTNAME, user.first).put(RenameTool.COLUMN_LASTNAME, user.second);
+        }
+    }
+
+    public static boolean isEnabled() {
+        return Preferences.getBoolValue("unstableNameChanger", true);
    }

    public static void injectIntoJsonGroup(JSONObject obj) throws JSONException {
-//        int i = obj.getInt("id");
-//
-//        if (RenameTool.updateRequested) {
-//            RenameTool.reloadDB();
-//        }
-//
-//        String user = RenameTool.renamedGroups.get(i);
-//        if (user == null) return;
-//        obj.put("name", user);
+        if (isEnabled()) {
+            int i = obj.getInt("id");
+
+            if (RenameTool.updateRequested) {
+                RenameTool.reloadDB();
+            }
+
+            String user = RenameTool.renamedGroups.get(i);
+            if (user == null) return;
+            obj.put("name", user);
+        }
    }
 }
@@ -0,0 +1,29 @@
+package ru.vtosters.hooks;
+
+import android.os.Build;
+import me.leolin.shortcutbadger.Badger;
+import me.leolin.shortcutbadger.impl.*;
+
+import java.util.List;
+
+public class ShortcutBadgerHook {
+    public static void init(List<Class<? extends Badger>> list) {
+        list.add(AdwHomeBadger.class);
+        list.add(ApexHomeBadger.class);
+        list.add(DefaultBadger.class);
+        list.add(NewHtcHomeBadger.class);
+        list.add(NovaHomeBadger.class);
+        list.add(AsusHomeBadger.class);
+        list.add(HuaweiHomeBadger.class);
+        list.add(OPPOHomeBader.class);
+        list.add(SamsungHomeBadger.class);
+        list.add(ZukHomeBadger.class);
+        list.add(VivoHomeBadger.class);
+        list.add(ZTEHomeBadger.class);
+        list.add(EverythingMeHomeBadger.class);
+
+        if (Build.VERSION.SDK_INT < 34) {
+            list.add(SonyHomeBadger.class);
+        }
+    }
+}
@@ -0,0 +1,10 @@
+package ru.vtosters.hooks;
+
+import ru.vtosters.hooks.other.Preferences;
+import ru.vtosters.lite.utils.AndroidUtils;
+
+public class TabletHook {
+    public static boolean hook() {
+        return AndroidUtils.isTablet() && !Preferences.getBoolValue("disableForceTabletMode", false);
+    }
+}
@@ -3,15 +3,17 @@ package ru.vtosters.hooks;
 import com.vk.medianative.MediaImageEncoder;
 import com.vk.toggle.FeatureManager;
 import com.vk.toggle.Features;
+import ru.vtosters.hooks.other.Preferences;

 import static ru.vtosters.hooks.other.Preferences.*;

 public class TogglesHook {
    public static boolean shouldPatch(Features.Type feature) {
        return switch (feature) {
-            case AB_IM_LONGPOLL_MSG_BATCHING, AB_IM_VIEW_POOL, AB_MULTI_GIFTS, AB_NEWS_VIDEO_LAYOUT_TEXT, AB_STICKERS_DISCOVER, AB_GIFTS_FROM_KEYBOARD, FEATURE_FEED_DEFAULT_LIST_ALWAYS, EXPERIMENT_NEWS_VIDEO_LAYOUT_TEXT, FEATURE_DISCOVER_CATEGORIES, FEATURE_FAVE_PERF_IMPROVE, FEATURE_GROUP_ADMIN_MESSAGES, FEATURE_GROUP_MSG_PUSH_PARAM, FEATURE_IMAGE_QUALITY_UPGRADE, FEATURE_IM_AUDIO_MSG_TRANSCRIPT, FEATURE_IM_CASPER_MSGS, FEATURE_IM_DISABLE_FORCE_OPEN_VK_ME, FEATURE_IM_GIF_AUTOPLAY, FEATURE_IM_MR_IN_VKAPP, FEATURE_MEMORIES_ENABLED, FEATURE_MENU_GAMES_CAROUSEL, FEATURE_MILKSHAKE, FEATURE_MILKSHAKE_CHANGE_FEED_BY_TIMEOUT, FEATURE_MILKSHAKE_NEWS_SCROLL_ON_BACK, FEATURE_MILKSHAKE_SWITCH_THEME_ON_TAP, FEATURE_ML_BRANDS, FEATURE_ML_FEATURES, FEATURE_ML_MODELS_LOADING, FEATURE_MONEY_TRANSFERS_VKPAY, FEATURE_MUSIC_ARTIST_CATALOG, FEATURE_MUSIC_NEW_CATALOG, FEATURE_NARRATIVE_SNIPPET_TYPE, FEATURE_NEWS_GAMES_IN_DISCOVER, FEATURE_NEWS_HEADER_SCROLL, FEATURE_NEW_FORMAT_SHOW_WPB, FEATURE_PODCASTS_PAGE, FEATURE_QR_CREATE_QR, FEATURE_QR_DYNAMIC_FRAME, FEATURE_QR_SCAN_FROM_PHOTO, FEATURE_QR_VISION_DECODER, FEATURE_QUEUE_COUNTERS, FEATURE_REEF, FEATURE_ROAMING_AUTOPLAY, FEATURE_SHARE_MSGS_ON_INVITE, FEATURE_STICKERS_BOT_LINK, FEATURE_STICKERS_NEW_CATALOG, FEATURE_STORIES_AVATAR, FEATURE_STORIES_FEED_TYPE, FEATURE_STORIES_SHOW_ALWAYS, FEATURE_STORY_ANSWER_PUBLIC, FEATURE_STORY_APP_STICKER, FEATURE_STORY_ARCHIVE, FEATURE_STORY_ARCHIVE_POST, FEATURE_STORY_BAKGROUND_ALL, FEATURE_STORY_BOX, FEATURE_STORY_CADRE, FEATURE_STORY_CAMERA_TOOLTIP, FEATURE_STORY_EDITOR_GALLERY, FEATURE_STORY_EDITOR_TYPE, FEATURE_STORY_ENDLESS_VIDEO, FEATURE_STORY_FAST_REACTIONS, FEATURE_STORY_GIF, FEATURE_STORY_GROUPED, FEATURE_STORY_HIGH_QUALITY, FEATURE_STORY_MASKS_FRONTAL, FEATURE_STORY_MENTION_ICON, FEATURE_STORY_MODERN_PUBLISH, FEATURE_STORY_MUSIC_EDITOR, FEATURE_STORY_MUSIC_REPLIES, FEATURE_STORY_MUSIC_REPLIES_2, FEATURE_STORY_NEW_FRAME, FEATURE_STORY_ONE_TIME, FEATURE_STORY_PHOTO_SHARING, FEATURE_STORY_PHOTO_STICKER, FEATURE_STORY_POLLS, FEATURE_STORY_POST_REPOST, FEATURE_STORY_PRELOADING, FEATURE_STORY_QUESTION, FEATURE_STORY_QUESTION_STYLE, FEATURE_STORY_RLOTTIE, FEATURE_STORY_RLOTTIE_CACHE, FEATURE_STORY_SAVE_DEFAULT_ON, FEATURE_STORY_SEND_DIALOG_LIST, FEATURE_STORY_STICKER_PACK, FEATURE_STORY_TIME, FEATURE_STORY_VIEWER_CAMERA, FEATURE_STORY_VOICE_ANSWER, FEATURE_STORY_WITH_CONTEXT, FEATURE_SUPERAPP_MENU, FEATURE_TRAFFIC_SAVER, FEATURE_VKPAY_WIDGET, FEATURE_VKUI_INTERNAL_TO_MINI_APPS, FEATURE_VKUI_TOKEN_CACHE, FEATURE_VK_APPS_SEARCH, FEATURE_VOTES_BALANCE, FEATURE_WEBVIEW_TOKEN_ACTIVE, FEATURE_MILKSHAKE_FORCE_DISABLED, FEATURE_MILKSHAKE_ACTIVATION_DISABLED, EXPERIMENT_NEWS_DISABLE_CACHE ->
+            case AB_IM_LONGPOLL_MSG_BATCHING, AB_IM_VIEW_POOL, AB_MULTI_GIFTS, AB_NEWS_VIDEO_LAYOUT_TEXT, AB_STICKERS_DISCOVER, AB_GIFTS_FROM_KEYBOARD, EXPERIMENT_NEWS_VIDEO_LAYOUT_TEXT, FEATURE_DISCOVER_CATEGORIES, FEATURE_FAVE_PERF_IMPROVE, FEATURE_GROUP_ADMIN_MESSAGES, FEATURE_GROUP_MSG_PUSH_PARAM, FEATURE_IMAGE_QUALITY_UPGRADE, FEATURE_IM_AUDIO_MSG_TRANSCRIPT, FEATURE_IM_CASPER_MSGS, FEATURE_IM_DISABLE_FORCE_OPEN_VK_ME, FEATURE_IM_GIF_AUTOPLAY, FEATURE_IM_MR_IN_VKAPP, FEATURE_MEMORIES_ENABLED, FEATURE_MENU_GAMES_CAROUSEL, FEATURE_MILKSHAKE, FEATURE_MILKSHAKE_NEWS_SCROLL_ON_BACK, FEATURE_MILKSHAKE_SWITCH_THEME_ON_TAP, FEATURE_ML_BRANDS, FEATURE_ML_FEATURES, FEATURE_ML_MODELS_LOADING, FEATURE_MONEY_TRANSFERS_VKPAY, FEATURE_MUSIC_ARTIST_CATALOG, FEATURE_MUSIC_NEW_CATALOG, FEATURE_NARRATIVE_SNIPPET_TYPE, FEATURE_NEWS_GAMES_IN_DISCOVER, FEATURE_NEWS_HEADER_SCROLL, FEATURE_NEW_FORMAT_SHOW_WPB, FEATURE_PODCASTS_PAGE, FEATURE_QR_CREATE_QR, FEATURE_QR_DYNAMIC_FRAME, FEATURE_QR_SCAN_FROM_PHOTO, FEATURE_QR_VISION_DECODER, FEATURE_QUEUE_COUNTERS, FEATURE_REEF, FEATURE_ROAMING_AUTOPLAY, FEATURE_SHARE_MSGS_ON_INVITE, FEATURE_STICKERS_BOT_LINK, FEATURE_STICKERS_NEW_CATALOG, FEATURE_STORIES_AVATAR, FEATURE_STORIES_FEED_TYPE, FEATURE_STORIES_SHOW_ALWAYS, FEATURE_STORY_ANSWER_PUBLIC, FEATURE_STORY_APP_STICKER, FEATURE_STORY_ARCHIVE, FEATURE_STORY_ARCHIVE_POST, FEATURE_STORY_BAKGROUND_ALL, FEATURE_STORY_BOX, FEATURE_STORY_CADRE, FEATURE_STORY_CAMERA_TOOLTIP, FEATURE_STORY_EDITOR_GALLERY, FEATURE_STORY_EDITOR_TYPE, FEATURE_STORY_ENDLESS_VIDEO, FEATURE_STORY_FAST_REACTIONS, FEATURE_STORY_GIF, FEATURE_STORY_GROUPED, FEATURE_STORY_HIGH_QUALITY, FEATURE_STORY_MASKS_FRONTAL, FEATURE_STORY_MENTION_ICON, FEATURE_STORY_MODERN_PUBLISH, FEATURE_STORY_MUSIC_EDITOR, FEATURE_STORY_MUSIC_REPLIES, FEATURE_STORY_MUSIC_REPLIES_2, FEATURE_STORY_NEW_FRAME, FEATURE_STORY_ONE_TIME, FEATURE_STORY_PHOTO_SHARING, FEATURE_STORY_PHOTO_STICKER, FEATURE_STORY_POLLS, FEATURE_STORY_POST_REPOST, FEATURE_STORY_PRELOADING, FEATURE_STORY_QUESTION, FEATURE_STORY_QUESTION_STYLE, FEATURE_STORY_RLOTTIE, FEATURE_STORY_RLOTTIE_CACHE, FEATURE_STORY_SAVE_DEFAULT_ON, FEATURE_STORY_SEND_DIALOG_LIST, FEATURE_STORY_STICKER_PACK, FEATURE_STORY_TIME, FEATURE_STORY_VIEWER_CAMERA, FEATURE_STORY_VOICE_ANSWER, FEATURE_STORY_WITH_CONTEXT, FEATURE_SUPERAPP_MENU, FEATURE_TRAFFIC_SAVER, FEATURE_VKPAY_WIDGET, FEATURE_VKUI_INTERNAL_TO_MINI_APPS, FEATURE_VKUI_TOKEN_CACHE, FEATURE_VK_APPS_SEARCH, FEATURE_VOTES_BALANCE, FEATURE_WEBVIEW_TOKEN_ACTIVE, FEATURE_MILKSHAKE_FORCE_DISABLED, FEATURE_MILKSHAKE_ACTIVATION_DISABLED, EXPERIMENT_NEWS_DISABLE_CACHE ->
                    true;
-            default -> false;
+            default ->
+                    false;
        };
    }

@@ -23,8 +25,10 @@ public class TogglesHook {
            case FEATURE_MILKSHAKE_FORCE_DISABLED, FEATURE_MILKSHAKE_ACTIVATION_DISABLED -> !milkshake();
            case AB_NEWS_VIDEO_LAYOUT_TEXT, FEATURE_COMPACT_REPOST, EXPERIMENT_NEWS_VIDEO_LAYOUT_TEXT ->
                    postsredesign();
-            case FEATURE_IMAGE_QUALITY_UPGRADE -> MediaImageEncoder.needToSkipCompression();
+            case FEATURE_IMAGE_QUALITY_UPGRADE -> !MediaImageEncoder.needToCompress();
            case FEATURE_MENU_GAMES_CAROUSEL -> miniapps();
+            case FEATURE_TRAFFIC_SAVER -> !disableForceTrafficSaver();
+            case AB_IM_LONGPOLL_MSG_BATCHING, AB_IM_VIEW_POOL -> Preferences.getBoolValue("batchmessages", false);
            default -> true;
        };
    }
@@ -24,9 +24,7 @@ public class VKUIHook {

    private static void applyVKUIStyles(WebView webView) {
        if (getBoolValue("VKUI_INJ", true) && webView != null && webView.getUrl() != null && !webView.getUrl().contains("static.vk.com/memories")) {
-            if (!WebViewColoringUtils.isLoaded) {
-                WebViewColoringUtils.load();
-            }
+            WebViewColoringUtils.load();
            loadAndApplyCSS(webView);
        }
    }
@@ -2,6 +2,7 @@ package ru.vtosters.hooks;

 import com.vk.dto.common.VerifyInfo;
 import org.json.JSONObject;
+import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.utils.VTVerifications;

 import static ru.vtosters.hooks.other.Preferences.getBoolValue;
@@ -20,7 +21,7 @@ public class VerificationsHook {
            return true;
        }

-        if (!getBoolValue("VT_Verification", true)) {
+        if (!getBoolValue("VT_Verification", true) || Preferences.serverFeaturesDisable()) {
            return false;
        }

@@ -32,7 +33,7 @@ public class VerificationsHook {
            return true;
        }

-        if (!getBoolValue("VT_Fire", true)) {
+        if (!getBoolValue("VT_Fire", true) || Preferences.serverFeaturesDisable()) {
            return false;
        }

@@ -40,10 +41,6 @@ public class VerificationsHook {
    }

    public static boolean hasDeveloper(JSONObject jSONObject) {
-        if (!getBoolValue("VT_Dev", true)) {
-            return false;
-        }
-
        return VTVerifications.isDeveloper(VTVerifications.getId(jSONObject));
    }

@@ -9,6 +9,7 @@ import com.vk.music.common.MusicPlaybackLaunchContext;
 import com.vtosters.lite.R;
 import ru.vtosters.lite.downloaders.AudioDownloader;
 import ru.vtosters.lite.music.cache.MusicCacheImpl;
+import ru.vtosters.lite.music.cache.delegate.PlaylistCacheDbDelegate;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.music.VKXUtils;

@@ -19,18 +20,29 @@ import static ru.vtosters.hooks.other.Preferences.milkshake;
 import static ru.vtosters.lite.utils.NetworkUtils.isNetworkConnected;

 public class MusicBottomSheetHook {
-    public static ArrayList<MusicAction> hook(final ArrayList<MusicAction> actions, final MusicTrack musicTrack) {
+    public static ArrayList<MusicAction> hook(ArrayList<MusicAction> actions, MusicTrack musicTrack) {
        if (musicTrack.F1()) return actions;
-        final var trackId = asId(musicTrack);
+
+        String trackId = asId(musicTrack);
+
        if (isVkxInstalled()) actions.add(getPlayInVKXAction());
+
        if (isIntegrationEnabled()) {
-            if (VKXUtils.isVkxCached(trackId)) actions.add(getRemoveCacheTrackVkxAction());
-            else if (isNetworkConnected()) actions.add(addToCacheTrackVkxAction());
+            if (VKXUtils.isVkxCached(trackId)) {
+                actions.add(getRemoveCacheTrackVkxAction());
+            } else if (isNetworkConnected()) {
+                actions.add(addToCacheTrackVkxAction());
+            }
        } else {
-            if (MusicCacheImpl.isCachedTrack(trackId)) actions.add(getRemoveCacheTrackAction());
-            else if (isNetworkConnected()) actions.add(addToCacheTrackAction());
+            if (MusicCacheImpl.isCachedTrack(trackId)) {
+                actions.add(getRemoveCacheTrackAction());
+            } else if (isNetworkConnected()) {
+                actions.add(addToCacheTrackAction());
+            }
        }
+
        if (isNetworkConnected()) actions.add(downloadAsMp3Action());
+
        return actions;
    }

@@ -72,8 +84,12 @@ public class MusicBottomSheetHook {
            } else if (isNetworkConnected()) {
                actions.add(addToCacheTrackVkxAction());
            }
-        } else if (isNetworkConnected()) {
-            actions.add(addToCacheTrackAction());
+        } else {
+            if (PlaylistCacheDbDelegate.isCachedPlaylist(AndroidUtils.getGlobalContext(), playlist.v1())) {
+                actions.add(getRemoveCacheTrackAction());
+            } else if (isNetworkConnected()) {
+                actions.add(addToCacheTrackAction());
+            }
        }

        if (isNetworkConnected()) actions.add(downloadAsMp3Action());
@@ -134,20 +150,24 @@ public class MusicBottomSheetHook {
    }

    public static boolean injectOnClick(int actionId, Playlist playlist) { // playlist inj
-        if (actionId == R.id.play_in_vkx)
+        if (actionId == R.id.play_in_vkx) {
            return tryPlayInVKX(null, null, playlist);
-
-        if (actionId == R.id.add_to_cache) {
+        }
+        
+        if (actionId == R.id.remove_from_cache) {
+            PlaylistCacheDbDelegate.deletePlaylist(AndroidUtils.getGlobalContext(), playlist.v1());
+            return true;
+        } else if (actionId == R.id.add_to_cache) {
            AudioDownloader.cachePlaylist(playlist);
            return true;
        }
-
+        
        if (actionId == R.id.remove_from_cache_vkx) {
            getInstance().runOnService(service -> {
                try {
                    service.deletePlaylistFromCache(playlist.a, playlist.b);
                } catch (RemoteException e) {
-                    e.printStackTrace();
+                    e.fillInStackTrace();
                }
            });
            return true;
@@ -156,7 +176,7 @@ public class MusicBottomSheetHook {
                try {
                    service.addPlaylistToCache(playlist.a, playlist.b, (playlist.Q != null) ? playlist.Q : "");
                } catch (RemoteException e) {
-                    e.printStackTrace();
+                    e.fillInStackTrace();
                }
            });
            return true;
@@ -168,7 +188,7 @@ public class MusicBottomSheetHook {
                    try {
                        service.downloadPlaylist(playlist.a, playlist.b, (playlist.Q != null) ? playlist.Q : "");
                    } catch (RemoteException e) {
-                        e.printStackTrace();
+                        e.fillInStackTrace();
                    }
                });
            } else {
@@ -258,4 +278,4 @@ public class MusicBottomSheetHook {
                false
        );
    }
-}
+}
@@ -4,20 +4,22 @@ import android.util.Log;
 import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
 import com.vk.core.network.Network;
 import com.vk.core.util.DeviceIdProvider;
-import okhttp3.Headers;
-import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.Response;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import ru.vtosters.hooks.other.Preferences;
-import ru.vtosters.lite.di.singleton.VtOkHttpClient;
+import ru.vtosters.lite.music.cache.helpers.PlaylistHelper;
 import ru.vtosters.lite.music.cache.MusicCacheImpl;
 import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.sponsorpost.utils.GzipDecompressor;

 import java.io.IOException;
+import java.util.Objects;

+import static com.vk.core.network.Network.ClientType.CLIENT_API;
 import static ru.vtosters.hooks.DateHook.getLocale;
 import static ru.vtosters.hooks.GroupsCatalogInjector.injectIntoCatalog;
 import static ru.vtosters.hooks.other.Preferences.getBoolValue;
@@ -26,8 +28,6 @@ import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserId;

 public class CatalogJsonInjector {
-    private static final OkHttpClient mClient = VtOkHttpClient.getInstance();
-
    public static JSONObject music(JSONObject json) throws JSONException {
        var catalog = json.optJSONObject("catalog");
        var oldItems = catalog != null ? catalog.optJSONArray("sections") : null;
@@ -41,9 +41,15 @@ public class CatalogJsonInjector {

                removeUnsupportedLayouts(blocks);

-                fetchCatalogId("https://vk.com/audio?section=my_playlists", oldItems);
+                if (Preferences.getBoolValue("playlistsCatalogs", true)) {
+                    fetchCatalogId("https://vk.com/audio?section=my_playlists", oldItems);

-                fetchCatalogId("https://vk.com/audio?section=albums", oldItems);
+                    fetchCatalogId("https://vk.com/audio?section=albums", oldItems);
+                }
+
+                if (Preferences.sendMusicMetrics() && Preferences.getBoolValue("playStatCatalog", false)) {
+                    fetchCatalogId("https://vk.com/audio?section=recent", oldItems);
+                }

                setDefaultAudioPage(oldItems, catalog);
            }
@@ -52,18 +58,16 @@ public class CatalogJsonInjector {
                var noPlaylists = !json.has("playlists");

                if (noPlaylists) {
-                    json.put("playlists", new JSONArray().put(getPlaylist()));
-                    Log.d("catalogInjector", "added new pl");
+                    PlaylistHelper.addCachedPlaylists(new JSONArray());
                } else {
-                    json.optJSONArray("playlists").put(getPlaylist());
-                    Log.d("catalogInjector", "added to exist pl");
+                    PlaylistHelper.addCachedPlaylists(json.optJSONArray("playlists"));
                }

                if (!useOldAppVer || noPlaylists) {
                    var newBlocks = new JSONArray();

                    newBlocks
-                            .put(getCatalogHeader())
+                            .put(getCatalogHeader("Кешированные плейлисты"))
                            .put(getCatalogPlaylist())
                            .put(getCatalogSeparator());

@@ -90,6 +94,7 @@ public class CatalogJsonInjector {
            var blocks = section.getJSONArray("blocks");

            fixDailyMix(blocks);
+            removeUnsupportedLayouts(blocks);

            if (!isUsersCatalog || MusicCacheImpl.isEmpty() || LibVKXClient.isIntegrationEnabled()) {
                return; // early return if not users catalog or no tracks or integration enabled
@@ -98,22 +103,16 @@ public class CatalogJsonInjector {
            var noPlaylists = !json.has("playlists");

            if (noPlaylists) {
-                json.put("playlists", new JSONArray().put(getPlaylist()));
-                Log.d("catalogInjector", "added new pl");
+                PlaylistHelper.addCachedPlaylists(new JSONArray());
            } else {
-                try {
-                    json.optJSONArray("playlists").put(getPlaylist());
-                    Log.d("catalogInjector", "added to exist pl");
-                } catch (Exception e) {
-                    Log.d("catalogInjector", e.toString());
-                }
+                PlaylistHelper.addCachedPlaylists(json.optJSONArray("playlists"));
            }

            if (!useOldAppVer && !noPlaylists) {
                var newBlocks = new JSONArray();

                newBlocks
-                        .put(getCatalogHeader())
+                        .put(getCatalogHeader("Кешированные плейлисты"))
                        .put(getCatalogPlaylist())
                        .put(getCatalogSeparator());

@@ -131,12 +130,15 @@ public class CatalogJsonInjector {

                    if (type.equals("music_playlists") && j.has("playlists_ids")) {
                        var newarr = new JSONArray();
-                        var playlists_ids = j.optJSONArray("playlists_ids");
+                        var playlists_ids = j.getJSONArray("playlists_ids");
+                        var savedPlaylists = PlaylistHelper.getCachedPlaylistsIds();

-                        newarr.put(getUserId() + "_-1");
+                        for (int n = 0; n < savedPlaylists.length(); n++) {
+                            newarr.put(savedPlaylists.getString(n));
+                        }

                        for (int n = 0; n < playlists_ids.length(); n++) {
-                            newarr.put(playlists_ids.optString(n));
+                            newarr.put(playlists_ids.getString(n));
                        }

                        Log.d("catalogInjector", "added to pl ids");
@@ -219,19 +221,33 @@ public class CatalogJsonInjector {
    }

    private static void removeUnsupportedLayouts(JSONArray blocks) throws JSONException {
-        for (int i = 0; i < blocks.length(); i++) {
-            var block = blocks.optJSONObject(i);
-            var layout = block.optJSONObject("layout");
-            if (layout != null) {
-                var name = layout.optString("name");
-                if (name.equals("header_extended")) {
-                    if (layout.has("top_title")) blocks.remove(i);
-                    layout.put("name", "header");
-                }
+        for (int i = blocks.length() - 1; i >= 0; i--) {
+            JSONObject block = blocks.optJSONObject(i);
+            JSONObject layout = block.optJSONObject("layout");
+            String data_type = block.optString("data_type");
+
+            if (Objects.equals(data_type, "music_recommended_playlists") || Objects.equals(data_type, "radiostations")) {
+                blocks.remove(i); // block
+                if (i - 1 >= 0) blocks.remove(i - 1); // text
+                if (i - 2 >= 0) blocks.remove(i - 2); // divider
+                continue; // Skip to the next iteration after removing
            }
+
+            if (layout == null) continue; // Skip to the next iteration if layout is null
+
+            String name = layout.optString("name");
+            if (!name.equals("header_extended")) {
+                continue; // Skip to the next iteration if not header_extended
+            }
+
+            if (layout.has("top_title")) {
+                blocks.remove(i);
+            }
+            layout.put("name", "header");
        }
    }

+
    private static void setDefaultAudioPage(JSONArray jsonArray, JSONObject catalog) throws JSONException {
        for (int i = 0; i < jsonArray.length(); i++) {
            var item = jsonArray.optJSONObject(i);
@@ -263,9 +279,12 @@ public class CatalogJsonInjector {
                        + sectionUrl
                        + "&access_token="
                        + AccountManagerUtils.getUserToken())
-                .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8")).a();
-        try {
-            var json = new JSONObject(mClient.a(request).execute().a().g()).getJSONObject("response");
+                .a("Accept-Encoding", "gzip")
+                .a("User-Agent", Network.l.c().a())
+                .a("Content-Type", "application/x-www-form-urlencoded; charset=utf-8")
+                .a();
+        try (Response resp = Network.b(CLIENT_API).a(request).execute()) {
+            var json = new JSONObject(GzipDecompressor.decompressResponse(resp)).getJSONObject("response");
            var catalogarr = json.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);

            var title = catalogarr.optString("title");
@@ -279,4 +298,4 @@ public class CatalogJsonInjector {
            Log.d("VTLMusic", "Error: " + e.getMessage());
        }
    }
-}
+}
@@ -15,18 +15,20 @@ import ru.vtosters.lite.downloaders.AudioDownloader;
 import ru.vtosters.lite.music.cache.MusicCacheImpl;
 import ru.vtosters.lite.music.cache.helpers.PlaylistHelper;
 import ru.vtosters.lite.music.cache.helpers.TracklistHelper;
+import ru.vtosters.lite.utils.AccountManagerUtils;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

 public class PlaylistInjector {
-    public final static String CHANNEL_NAME = "VTCH";
    private static final ExecutorService executor = Executors.newCachedThreadPool();
+    public final static String CHANNEL_NAME = "VTCH";

    public static void injectDownloadPlaylist(Playlist playlist) {
-        executor.submit(() -> AudioDownloader.cachePlaylist(playlist));
+        AudioDownloader.cachePlaylist(playlist);
    }

    public static boolean eligibleForOfflineCaching() {
@@ -35,8 +37,10 @@ public class PlaylistInjector {

    public static Observable<AudioGetPlaylist.c> injectGetPlaylist(AudioGetPlaylist audioGetPlaylist) {
        try {
-            if (!eligibleForOfflineCaching())
+            if (MusicCacheImpl.isEmpty()) {
                return null;
+            }
+            
            var requestArgs = audioGetPlaylist.b();

            var id = requestArgs.get("id");
@@ -44,11 +48,11 @@ public class PlaylistInjector {
            var accessKey = requestArgs.get("access_key");
            boolean isVirtualPlaylist = accessKey != null && (accessKey.equals("cache"));
            boolean isAlbumVirtualPlaylist = accessKey != null && (accessKey.equals("cacheAlbum"));
+            boolean isOwnCachePlaylist = Objects.equals(ownerId, String.valueOf(AccountManagerUtils.getUserId())) && Objects.equals(id, "-1");

-            Log.d("PlaylistInjector", "id = " + id + " / owner = " + ownerId + " / access = " + accessKey + " / " + isVirtualPlaylist + " + " + isAlbumVirtualPlaylist);
-
-            if (TextUtils.isEmpty(id) || (!isVirtualPlaylist && !isAlbumVirtualPlaylist))
+            if (TextUtils.isEmpty(id) || (!isVirtualPlaylist && !isAlbumVirtualPlaylist)) {
                return null;
+            }

            return Observable.a((ObservableOnSubscribe<AudioGetPlaylist.c>) observableEmitter -> {
                AudioGetPlaylist.c response = new AudioGetPlaylist.c();
@@ -73,7 +77,7 @@ public class PlaylistInjector {

                            response.c = tracks;
                        } catch (RemoteException | JSONException e) {
-                            e.printStackTrace();
+                            e.fillInStackTrace();
                            response.c = new ArrayList<>();
                        }
                        observableEmitter.b(response);
@@ -82,18 +86,18 @@ public class PlaylistInjector {
                    return;
                }

-                if (isVirtualPlaylist) {
+                if (isOwnCachePlaylist) {
                    response.c = (ArrayList<MusicTrack>) TracklistHelper.getMyCachedMusicTracks();
                    response.b = PlaylistHelper.createCachedPlaylistMetadata();
                } else {
-                    response.c = (ArrayList<MusicTrack>) TracklistHelper.getTracks(requestArgs.get("owner_id"));
-                    response.b = PlaylistHelper.createCachedPlaylistMetadata(requestArgs.get("owner_id"));
+                    response.c = (ArrayList<MusicTrack>) MusicCacheImpl.getPlaylistSongs(ownerId, id);
+                    response.b = MusicCacheImpl.getPlaylist(id, ownerId);
                }

                observableEmitter.b(response);
            });
        } catch (Exception e) {
-            e.printStackTrace();
+            e.fillInStackTrace();
        }
        return null;
    }
@@ -12,6 +12,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import ru.vtosters.lite.music.cache.MusicCacheImpl;
+import ru.vtosters.lite.music.cache.delegate.PlaylistCacheDbDelegate;
 import ru.vtosters.lite.music.cache.helpers.PlaylistHelper;
 import ru.vtosters.lite.music.cache.helpers.TracklistHelper;
 import ru.vtosters.lite.utils.AccountManagerUtils;
@@ -22,6 +23,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;

+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.*;
+
 public class TracklistInjector {

    public static boolean eligibleForOfflineCaching() {
@@ -39,7 +42,7 @@ public class TracklistInjector {
                            Log.d("TracklistInjector", "Using vkx cache catalog");
                            observableEmitter.b(parser.c(new JSONObject(service.getCacheCatalog())));
                        } catch (Exception e) {
-                            e.printStackTrace();
+                            e.fillInStackTrace();
                            List<MusicTrack> tracks = new ArrayList<>();
                            List<String> cache = service.getCache();

@@ -52,14 +55,14 @@ public class TracklistInjector {
                            observableEmitter.b(parser.c(createVirtualCatalog(tracks)));
                        }
                    } catch (Exception e) {
-                        e.printStackTrace();
+                        e.fillInStackTrace();
                    }
                });
            } else {
                if (MusicCacheImpl.isEmpty()) {
                    observableEmitter.b(parser.c(getEmptyCatalog()));
                } else {
-                    observableEmitter.b(parser.c(createVirtualCatalog(TracklistHelper.getTracks())));
+                    observableEmitter.b(parser.c(createVirtualCatalog(TracklistHelper.getMyCachedMusicTracks())));
                }
            }
        });
@@ -162,16 +165,12 @@ public class TracklistInjector {
                boolean noPlaylists = hasNoPlaylists(blocks);

                if (noPlaylists) {
-                    catalogNode.put("playlists", new JSONArray().put(PlaylistHelper.getPlaylist()));
+                    PlaylistHelper.addCachedPlaylists(new JSONArray());

-                    JSONArray newBlocks = createNewBlocks(blocks);
-
-                    Log.d("catalogInjector", "added cache catalog playlist");
-
-                    firstSection.put("blocks", newBlocks);
+                    firstSection.put("blocks", createNewBlocks(blocks));
                } else {
                    try {
-                        catalogNode.optJSONArray("playlists").put(PlaylistHelper.getPlaylist());
+                        PlaylistHelper.addCachedPlaylists(catalogNode.optJSONArray("playlists"));

                        updatePlaylistsIds(blocks);
                    } catch (Exception e) {
@@ -188,7 +187,7 @@ public class TracklistInjector {
        return firstSection.getString("url").equals("https://vk.com/audios" + AccountManagerUtils.getUserId() + "?section=all");
    }

-    private static boolean hasNoPlaylists(JSONArray blocks) throws JSONException {
+    private static boolean hasNoPlaylists(JSONArray blocks) {
        return blocks.optJSONObject(0).optJSONArray("buttons").optJSONObject(0).optJSONObject("action").optString("type").equals("create_playlist");
    }

@@ -196,13 +195,14 @@ public class TracklistInjector {
        JSONArray newBlocks = new JSONArray();

        newBlocks
-                .put(PlaylistHelper.getCatalogHeader())
+                .put(PlaylistHelper.getCatalogHeader(AndroidUtils.getString(R.string.cached_tracks_title)))
                .put(PlaylistHelper.getCatalogPlaylist())
                .put(PlaylistHelper.getCatalogSeparator());

        for (int i = 0; i < blocks.length(); i++) {
            newBlocks.put(blocks.optJSONObject(i));
        }
+
        return newBlocks;
    }

@@ -212,16 +212,15 @@ public class TracklistInjector {
            String type = j.optString("data_type");

            if (type.equals("music_playlists") && j.has("playlists_ids")) {
-                JSONArray newarr = new JSONArray();
+                JSONArray newarr = PlaylistHelper.getCachedPlaylistsIds();
                JSONArray playlists_ids = j.optJSONArray("playlists_ids");

-                newarr.put(AccountManagerUtils.getUserId() + "_-1");
-
                for (int n = 0; n < playlists_ids.length(); n++) {
                    newarr.put(playlists_ids.optString(n));
                }

                j.put("playlists_ids", newarr);
+
                break;
            }
        }
@@ -240,7 +239,19 @@ public class TracklistInjector {

        audiosBlock.put("layout", layout);

-        var blocks = new JSONArray().put(getShuffleButton()).put(audiosBlock);
+        var blocks = new JSONArray();
+
+        if (MusicCacheImpl.hasPlaylist()) {
+            blocks.put(getCatalogHeader("Кешированные плейлисты"))
+                    .put(getCatalogPlaylist());
+        }
+
+        if (!PlaylistCacheDbDelegate.isPlaylistEmpty(AndroidUtils.getGlobalContext(), AccountManagerUtils.getUserId() + "_-1")) {
+            if (MusicCacheImpl.hasPlaylist()) blocks.put(getCatalogSeparator());
+            blocks.put(getCatalogHeader(AndroidUtils.getString(R.string.cached_tracks_title)))
+                    .put(getShuffleButton())
+                    .put(audiosBlock);
+        }

        var randomId = getRandomId();

@@ -259,6 +270,7 @@ public class TracklistInjector {

        return new JSONObject()
                .put("catalog", catalog)
+                .put("playlists", addCachedPlaylists(new JSONArray()))
                .put("audios", TracklistHelper.tracksToJsons(tracks));
    }

@@ -6,6 +6,8 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.StrictMode;
+
+import com.vk.core.util.AppContextHolder;
 import com.vk.medianative.MediaImageEncoder;
 import com.vk.medianative.MediaNative;
 import com.vtosters.lite.data.Users;
@@ -22,14 +24,14 @@ import java.security.NoSuchAlgorithmException;
 public class Preferences {

    public static void init(Application application) throws Exception {
-        StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
+        AppContextHolder.a = application.getApplicationContext();
+        StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitNetwork().build();
        StrictMode.setThreadPolicy(policy); // fix profiles hide hook

        MediaNative.init(application);

        GmsHook.fixGapps();
        ProxyUtils.setProxy();
-        NewsFeedFiltersUtils.setupFilters();
        VTVerifications.load(application);
        LifecycleUtils.registerActivities(application);

@@ -98,8 +100,8 @@ public class Preferences {
        return getBoolValue("vkme", false);
    }

-    public static boolean autocache() {
-        return getBoolValue("autocache", false);
+    public static int autocache() {
+        return Preferences.getPreferences().getInt("autocaching", 0);
    }

    public static boolean adsstories() {
@@ -177,6 +179,10 @@ public class Preferences {
        return getBoolValue("miniapps", true);
    }

+    public static boolean disableForceTrafficSaver() {
+        return getBoolValue("disableForceTrafficSaver", false);
+    }
+
    public static boolean savemsgsett() {
        return getBoolValue("savemsgsett", false);
    }
@@ -242,6 +248,10 @@ public class Preferences {
        return getBoolValue("autoalltranslate", false);
    }

+    public static boolean serverFeaturesDisable() {
+        return getBoolValue("serverFeaturesDisable", false);
+    }
+
    public static boolean shortinfo() {
        return getBoolValue("shortinfo", true);
    }
@@ -263,7 +273,7 @@ public class Preferences {
    }

    public static boolean stories() {
-        return getBoolValue("stories", false);
+        return getBoolValue("stories", true);
    }

    public static boolean swipe() {
@@ -282,13 +292,17 @@ public class Preferences {
        return getBoolValue("vkme_notifs", false);
    }

+    public static boolean sendMusicMetrics() {
+        return getBoolValue("sendMusicMetrics", true);
+    }
+
    public static boolean screenshotdetect() {
        return getBoolValue("screenshotdetect", true);
    }

    @SuppressWarnings("ConstantConditions")
    public static boolean checkupdates() {
-        return !getBoolValue("isRoamingState", false) && isValidSignature() && BuildConfig.BUILD_TYPE.equals("release");
+        return !getBoolValue("isRoamingState", false) && isValidSignature() && BuildConfig.BUILD_TYPE.equals("release") && getBoolValue("autoupdates", true) && !serverFeaturesDisable();
    }

    public static boolean isNewBuild() {
@@ -304,6 +318,10 @@ public class Preferences {
        return false;
    }

+    public static String getId() {
+        return String.valueOf(AccountManagerUtils.getUserId());
+    }
+
    public static void updateBuildNumber() {
        try {
            getPreferences().edit().putLong("setupTime", AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo(AndroidUtils.getPackageName(), 0).lastUpdateTime).apply();
@@ -345,7 +363,14 @@ public class Preferences {
    }

    public static int compress(int origquality) {
-        if (MediaImageEncoder.needToSkipCompression()) return 100;
-        return origquality;
+        return MediaImageEncoder.needToCompress() ? origquality : 100;
+    }
+
+    public static String metadataSeparator() {
+        return getPreferences().getString("metadata_separator", "; ");
+    }
+
+    public static void setMetadataSeparator(String separator) {
+        getPreferences().edit().putString("metadata_separator", separator).apply();
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
gdlbo	fd17e2bc8c	fixed groups load	2024-04-12 10:24:02 +03:00
gdlbo	4cd94d811c	fix #1607	2024-04-12 10:08:57 +03:00
gdlbo	f1ea800336	fixed profiles loading	2024-04-12 09:58:44 +03:00
Artur Skubei	b20230848b	Speedup cache injection (#1597 )	2024-03-30 05:54:56 +03:00
gdlbo	adc5bb2b8c	some more global renames	2024-03-29 15:16:33 +03:00
gdlbo	34f49a9b42	fixed rename in wall	2024-03-29 15:12:56 +03:00
gdlbo	84ad75e948	fixed disabler for playlist catalog	2024-03-29 13:45:28 +03:00
gdlbo	e049b5f989	Update OEMDetector.java	2024-03-29 13:41:55 +03:00
Artur Skubei	5de52ed6b5	Rename Profiles/Groups v2 (#1596 )	2024-03-29 13:38:30 +03:00
gdlbo	46c4f1c6dc	hyperos support + gms refactored	2024-03-29 13:37:25 +03:00
gdlbo	126f5259d1	fixes	2024-03-29 10:47:18 +03:00
gdlbo	2d1867197f	fixes of sponsorpost sdk also added force update of filters	2024-03-28 22:20:07 +03:00
gdlbo	c1d4216416	music stats catalog disabler	2024-03-28 20:16:39 +03:00
gdlbo	0f45a8d175	Update strings.xml	2024-03-28 20:10:08 +03:00
gdlbo	15ed01b4d3	fixed cache playlist shuffle	2024-03-28 20:05:10 +03:00
aliveoutside	41763a4b54	master.m3u8 fix	2024-03-26 22:59:32 +03:00
gdlbo	d98d81f105	fixed autocache text dialog with dark theme	2024-03-26 17:47:10 +03:00
Artur Skubei	899554a571	Music autocaching v2 (#1591 )	2024-03-26 17:36:34 +03:00
Artur Skubei	87b1a89bd8	Video metrics impl (#1590 )	2024-03-25 23:45:42 +03:00
gdlbo	c2b51338e8	Update MusicFragment.java	2024-03-24 22:55:58 +03:00
gdlbo	1d03182a1f	fixed pause for music track stats	2024-03-24 22:40:01 +03:00
Artur Skubei	bbad64c0aa	Music metrics impl for recommendations (#1587 )	2024-03-24 22:00:26 +03:00
Artur Skubei	53081115cc	Fixed bypass online in profiles and messages (#1584 )	2024-03-21 21:40:49 +03:00
gdlbo	af4f069eb4	fixed sony crash on android 14 https://t.me/vtosterschat/3499552/3563197	2024-03-21 08:41:42 +03:00
gdlbo	904814e5cb	fixed batchmessages applying	2024-03-19 22:49:06 +03:00
gdlbo	c240db520d	fixed tabs text color in vkid	2024-03-19 22:33:34 +03:00
gdlbo	8f9235e6db	added test feature of alter load msgs	2024-03-19 22:16:00 +03:00
gdlbo	10b27566c0	fix #1350 #1178 #1045 also fixed webview coloring after theme change	2024-03-19 21:43:59 +03:00
Artur Skubei	16b67cf6c6	Music Caching v2 (#1283 ) * Playlist caching * Playlist gzip support * Many catalog fixes	2024-03-19 19:33:05 +03:00
gdlbo	23436f1026	some sponsorpost fixes	2024-03-19 19:29:29 +03:00
gdlbo	6998bdba1c	added new block to remove cyz unsupported	2024-03-18 10:38:33 +03:00
aliveoutside	5aa0fe9959	Merge remote-tracking branch 'sunmisc/main' #1554	2024-03-18 03:17:30 +03:00
gdlbo	88f0939f04	StrictMode corrections	2024-03-17 12:10:22 +03:00
Vologhat	73653fa2e0	optimize getting of global app context (#1583 )	2024-03-16 02:24:51 +03:00
gdlbo	c812b13446	fixed cold start	2024-03-14 08:52:01 +03:00
gdlbo	ea9291a5eb	fixed background menu in nonmilk	2024-03-13 12:55:32 +03:00
gdlbo	8d93e298b4	fixed default value of undelete prefix	2024-03-13 12:42:41 +03:00
gdlbo	49d448ad99	added some null checks	2024-03-13 12:30:27 +03:00
gdlbo	6bcc278dee	fixed progress icon for downloaders	2024-03-12 15:30:17 +03:00
gdlbo	cff0a98227	fixed download video notification	2024-03-12 15:14:01 +03:00
gdlbo	3529eb7ba1	moved metadataSeparator to MusicFragment	2024-03-12 15:08:25 +03:00
gdlbo	2ee4bf1107	new switch frag solution	2024-03-12 14:26:59 +03:00
gdlbo	ac43a7794b	fix #1260	2024-03-12 14:24:30 +03:00
gdlbo	47b2519ca5	fixed #1471	2024-03-12 13:25:16 +03:00
aliveoutside	701674ce45	rollback accidentally changed ndk version	2024-03-11 10:18:17 +03:00
aliveoutside	e19a005362	Merge branch 'feat/java-mpeg-demux' # Conflicts: # app/src/main/java/ru/vtosters/lite/music/downloader/M3UDownloader.java # smali/res/xml/preferences_media.xml	2024-03-11 10:10:37 +03:00
gdlbo	e11e97cd29	added download notification for Video Downloader	2024-03-08 20:04:37 +03:00
gdlbo	ab2715456f	fixed freeze download video	2024-03-08 19:07:28 +03:00
gdlbo	68526f0ba2	added encryptor name in decrypt method	2024-03-08 14:37:35 +03:00
gdlbo	b3243f1d41	removed compression in fb lib	2024-03-07 22:17:01 +03:00
gdlbo	175866ddc5	fixed crash and photo upload	2024-03-07 21:38:29 +03:00
gdlbo	f691f8cc9e	updated rounding dialog	2024-03-07 20:01:51 +03:00
gdlbo	305614dae6	fix #1581	2024-03-07 18:05:20 +03:00
gdlbo	4bbcde750a	fixed execute.getAudioServicePackages	2024-03-07 16:50:38 +03:00
gdlbo	e159b4f594	moved native to main inj	2024-03-04 19:31:46 +03:00
gdlbo	204b0c6e2c	moved dockbar editor to main settings	2024-03-03 16:13:45 +03:00
gdlbo	522f6cd42b	removed useless cache buttons	2024-03-03 09:53:02 +03:00
gdlbo	7dd9e5ff3a	more gzip support	2024-03-02 23:33:18 +03:00
Artur Skubei	07f8542f56	SponsorPost vote system (#1562 ) also added gzip support for all methods	2024-03-02 22:24:15 +03:00
Artur Skubei	6b1e6f07c5	Internal VK Proxy Support (#1579 ) thanks @awers24 for tests	2024-03-02 21:47:34 +03:00
gdlbo	5466dd72dd	some lastfm fixes	2024-03-01 22:50:31 +03:00
Artur Skubei	5ac3b9cf6e	Another ndk fix (#1572 )	2024-02-25 22:07:42 +03:00
Artur Skubei	de6edc795a	Update build.yml	2024-02-25 21:46:27 +03:00
Artur Skubei	19d36272cb	ndk fix (#1571 )	2024-02-25 21:43:08 +03:00
gdlbo	d2fe435ad2	added music fragment migration from media content	2024-02-25 19:47:23 +03:00
gdlbo	b6e7d24979	Update VTVerifications.java	2024-02-20 11:48:35 +03:00
gdlbo	d10d5eca4b	fixed auto updating filters	2024-02-19 15:39:41 +03:00
gdlbo	67f1477907	Revert "improve code readability, remove redundant constructions" This reverts commit `b05a239b90`.	2024-02-19 11:38:11 +03:00
gdlbo	18ef4eda21	Revert "rollback to for-loops with improvements" This reverts commit `84cf9ba10a`.	2024-02-19 11:38:10 +03:00
Tahgolov	84cf9ba10a	rollback to for-loops with improvements	2024-02-18 23:07:19 +03:00
Tahgolov	b05a239b90	improve code readability, remove redundant constructions	2024-02-18 23:05:31 +03:00
gdlbo	8959558c64	Fixed 5.1 false coloring and improved coloring speed/app performance (#1566 )	2024-02-18 14:52:22 +03:00
gdlbo	e19ed8845d	fix #1343	2024-02-18 02:08:16 +03:00
gdlbo	b5ae2662db	fix noad	2024-02-17 22:27:56 +03:00
aliveoutside	1a7a0e7f4f	recover accidentally deleted vk ffmpeg libs	2024-02-17 15:02:05 +03:00
aliveoutside	953aa790e3	fix typo in logging	2024-02-16 23:51:14 +03:00
aliveoutside	c1de68893c	implement id3v2.3 tagging	2024-02-16 21:23:57 +03:00
aliveoutside	e0d3f22f16	improve demuxer performance use buffered io for input and output streams reuse single bytebuffer instead of creating it for every packet	2024-02-16 06:32:53 +03:00
gdlbo	d4710663ff	disabler force traffic saver v2	2024-02-16 03:58:30 +03:00
aliveoutside	60e32df046	use java demuxer to extract mp3 from .ts files instead of ffmpeg	2024-02-16 01:13:39 +03:00
sunmisc	bbc4aa98f7	exception is passed to onFailure	2024-02-15 18:49:14 +03:00
sunmisc	287af14589	transfer audio download to ffmpeg	2024-02-15 16:36:29 +03:00
gdlbo	18f40e0da9	fixed useless false visibility vkZ ofc jk (vkx)	2024-02-14 23:12:20 +03:00
gdlbo	9ff8c1d9fe	refactored FoafBase added check for vk messenger accounts rewritten all legacy code	2024-02-14 23:03:19 +03:00
gdlbo	91440e4f8b	refactored VTVerifs speedup processIds + removed getting 1337 verifs (depreciated)	2024-02-14 22:13:22 +03:00
gdlbo	a195e05d7b	refactored sig checker support for new android versions	2024-02-14 22:10:59 +03:00
gdlbo	8866bf90c7	refactored webview injector speedup by runtime injection evaluateJavascript	2024-02-14 22:10:33 +03:00
gdlbo	eab5b7074e	refactored superapp utils removed old vk pay and events	2024-02-14 21:45:31 +03:00
gdlbo	bdee6c08c0	disable events in superapp	2024-02-14 21:16:41 +03:00
gdlbo	0744613aa0	Update preferences_debug.xml	2024-02-14 19:31:02 +03:00
gdlbo	f6de4c5bc9	some toggles fixes probably may fixed slow messages load fixed default feed	2024-02-14 19:11:16 +03:00
gdlbo	f59e93aab6	fix #1551	2024-02-14 19:03:23 +03:00
gdlbo	2d97341886	video-covers disabler	2024-02-14 17:53:05 +03:00
gdlbo	b247c5c090	some config network fixes	2024-02-14 17:06:35 +03:00
gdlbo	fd6e866f6f	fixed bug nonmilk Reported by https://4pda.to/forum/index.php?showuser=1502902	2024-02-14 16:45:45 +03:00
gdlbo	780ebce3ff	disable libverify by default 2fa fix	2024-02-12 12:31:06 +03:00
sunmisc	404594df87	unnecessary atomic	2024-02-10 15:11:30 +03:00
gdlbo	2a85b3a4f0	fixes for whitelists	2024-02-09 15:41:18 +03:00
gdlbo	413701d28e	SponsorPost summ	2024-02-07 16:40:54 +03:00
gdlbo	016bd342c4	added summary for sponsorpost	2024-02-07 16:33:54 +03:00
gdlbo	d04b2249f0	enable metadata by default	2024-02-07 16:07:59 +03:00
gdlbo	8eb7ded6ba	fixed autoupdate filters	2024-02-07 15:49:04 +03:00
gdlbo	1f9c6fd80c	added disabling sponsorpost	2024-02-07 15:47:05 +03:00
gdlbo	4ec84e3754	cleanup build gradle	2024-02-07 14:58:06 +03:00
gdlbo	3b8af6e477	Merge branch 'main' into main	2024-02-07 13:57:33 +03:00
gdlbo	ad3f70f4ac	Sponsorpost integration (#1553 )	2024-02-07 13:55:53 +03:00
gdlbo	611f4d3159	updated run configs	2024-02-06 18:37:30 +03:00
aliveoutside	cb38660a3a	code reformat	2024-02-05 21:37:18 +03:00
aliveoutside	f6f0fb3d08	fix onSuccess not being called on finish	2024-02-05 21:15:10 +03:00
sunmisc	dab50535ef	optimize	2024-02-05 18:28:28 +03:00
sunmisc	d9300fc621	may have fixed the race on CIPHER.init	2024-02-05 18:07:23 +03:00
sunmisc	48eba3ccbb	the track is already being downloaded in another thread	2024-02-05 16:07:24 +03:00
sunmisc	2336da53be	immediately concatenate bytes without creating files	2024-02-05 15:22:45 +03:00
mexanoz	7319714140	fix setting metadata for certain tracks (#1507 )	2024-02-04 15:10:34 +03:00
gdlbo	857db4879a	vkui theming fixes thx @awers24	2024-02-02 14:27:35 +03:00
gdlbo	b5db820733	new feature useless	2024-02-01 23:40:10 +03:00
gdlbo	c668105003	some translations update	2024-01-31 11:46:46 +03:00
gdlbo	dd6bbcbc2c	fix auto translation	2024-01-31 11:42:07 +03:00
gdlbo	4ed0749027	Revert "Profiles/Groups resp fixes (#1532 )" This reverts commit `a6b56e0e87`.	2024-01-31 03:22:06 +03:00
gdlbo	3b834c2688	Update Genius.java	2024-01-31 01:56:10 +03:00
gdlbo	0c5a40bedc	enable stories	2024-01-31 00:46:57 +03:00
gdlbo	8146b863b1	fix crash	2024-01-30 12:21:53 +03:00
gdlbo	c64f8a1b2d	disabler force traffic saver	2024-01-30 11:47:08 +03:00
gdlbo	dd6916c08a	removed random proxy	2024-01-30 11:35:49 +03:00
gdlbo	58c14fbd4f	added all server features disabler for users who doesnt have unlimited internet	2024-01-30 11:28:38 +03:00
gdlbo	3b830f5e2e	added fragile user data pref	2024-01-30 11:08:19 +03:00
gdlbo	c304313be9	updated deps	2024-01-13 19:14:51 +03:00
Denis	3068ff76c1	Fix crash (#1542 )	2023-12-31 13:04:55 +03:00
gdlbo	a6b56e0e87	Profiles/Groups resp fixes (#1532 )	2023-12-13 23:08:32 +03:00
gdlbo	5360ca6c5e	updated translations	2023-12-13 23:07:40 +03:00
gdlbo	f2ac845797	Update FFMpeg.java	2023-10-14 16:05:51 +03:00
gdlbo	a85e55a594	meta data pref	2023-10-12 22:45:43 +03:00
gdlbo	e2775db4e5	fixed english translation	2023-10-12 20:19:17 +03:00
gdlbo	589e8928a0	Bitrate upgrade (#1498 ) libvkmedia.so armv7/arm64	2023-10-12 19:57:00 +03:00
gdlbo	cd189b1dda	fixed id3v2 meta	2023-10-10 23:15:11 +03:00
gdlbo	14c111a3e6	some music fixes	2023-10-10 22:53:16 +03:00
gdlbo	b506c56346	fixed compiling issue	2023-10-07 03:13:24 +03:00
gdlbo	bbbc94e510	added facebook graph disabler	2023-10-07 03:07:31 +03:00
gdlbo	8cb2c380e7	fixed adding "null" to track name	2023-10-06 12:44:55 +03:00
gdlbo	b9879f9ed7	updated appcenter	2023-10-04 19:44:24 +03:00
gdlbo	cf05e051e8	added summary for advanced online info	2023-10-04 13:47:47 +03:00
gdlbo	963c4d81ba	upped ver	2023-10-04 13:37:20 +03:00
gdlbo	099c699702	added vkn online fix disabler	2023-10-04 13:37:07 +03:00
gdlbo	1117fc19d4	added force tablet mode	2023-10-02 16:28:08 +03:00
gdlbo	78dca26063	fix #1489	2023-10-02 14:52:52 +03:00
gdlbo	f5180f61d5	fixed empty text from ssfs	2023-09-30 14:37:49 +03:00
gdlbo	540fffdcc9	fixed download issue	2023-09-30 03:15:14 +03:00
gdlbo	5357c60eaa	Update TelegramStickersGrabber.java	2023-09-30 02:33:52 +03:00
gdlbo	c59f29121f	Refactoted Telegram Stickers downloader and settings (#1485 )	2023-09-29 19:58:33 +03:00
gdlbo	bd38cab377	autoupdated disabler	2023-09-28 17:40:49 +03:00
gdlbo	0058431590	deleted useless summ and updated translation	2023-09-28 17:01:38 +03:00
gdlbo	bf4cf2be53	adfree + free from server connection (#1481 )	2023-09-28 16:10:30 +03:00
gdlbo	aac86a9952	Update InstallGMSFragment.java added inotia00 microg information	2023-09-28 11:09:40 +03:00
gdlbo	ae00e72bac	added more microg instructions	2023-09-27 23:55:56 +03:00
gdlbo	fea984f6fd	fixed null foaf crash app	2023-09-27 23:34:37 +03:00
gdlbo	d870c2f984	Update VTSettings.java	2023-09-27 22:12:12 +03:00