From a3c40d10cefa347db2757fdfd070ca7ffb225cb3 Mon Sep 17 00:00:00 2001
From: caneleex <git@mlnr.dev>
Date: Sun, 23 Jan 2022 22:56:16 +0100
Subject: [PATCH] add more disconnects

---
 .../youtube/ryd/requests/RYDRequester.java         |  5 +++++
 .../whitelisting/requests/WhitelistRequester.java  |  1 +
 app/src/main/res/drawable/vanced_yt_sb.xml         | 14 --------------
 app/src/main/res/drawable/vanced_yt_sb_blocked.xml | 14 --------------
 app/src/main/res/drawable/vanced_yt_sb_button.xml  |  6 ------
 5 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 app/src/main/res/drawable/vanced_yt_sb.xml
 delete mode 100644 app/src/main/res/drawable/vanced_yt_sb_blocked.xml
 delete mode 100644 app/src/main/res/drawable/vanced_yt_sb_button.xml

diff --git a/app/src/main/java/fi/vanced/libraries/youtube/ryd/requests/RYDRequester.java b/app/src/main/java/fi/vanced/libraries/youtube/ryd/requests/RYDRequester.java
index da6832a4..9777f335 100644
--- a/app/src/main/java/fi/vanced/libraries/youtube/ryd/requests/RYDRequester.java
+++ b/app/src/main/java/fi/vanced/libraries/youtube/ryd/requests/RYDRequester.java
@@ -48,6 +48,7 @@ public class RYDRequester {
             else if (debug) {
                 Log.d(TAG, "dislikes fetch response was " + connection.getResponseCode());
             }
+            connection.disconnect();
         }
         catch (Exception ex) {
             dislikeCount = null;
@@ -79,6 +80,7 @@ public class RYDRequester {
             else if (debug) {
                 Log.d(TAG, "Registration response was " + connection.getResponseCode());
             }
+            connection.disconnect();
         }
         catch (Exception ex){
             Log.e(TAG, "Failed to register userId", ex);
@@ -118,6 +120,7 @@ public class RYDRequester {
             else if (debug) {
                 Log.d(TAG, "Registration confirmation response was " + connection.getResponseCode());
             }
+            connection.disconnect();
         }
         catch (Exception ex) {
             Log.e(TAG, "Failed to confirm registration", ex);
@@ -157,6 +160,7 @@ public class RYDRequester {
             else if (debug) {
                 Log.d(TAG, "Vote response was " + connection.getResponseCode());
             }
+            connection.disconnect();
         }
         catch (Exception ex) {
             Log.e(TAG, "Failed to send vote", ex);
@@ -191,6 +195,7 @@ public class RYDRequester {
             else if (debug) {
                 Log.d(TAG, "Vote confirmation response was " + connection.getResponseCode());
             }
+            connection.disconnect();
         }
         catch (Exception ex) {
             Log.e(TAG, "Failed to confirm vote", ex);
diff --git a/app/src/main/java/fi/vanced/libraries/youtube/whitelisting/requests/WhitelistRequester.java b/app/src/main/java/fi/vanced/libraries/youtube/whitelisting/requests/WhitelistRequester.java
index 45fd8d17..2d8b0058 100644
--- a/app/src/main/java/fi/vanced/libraries/youtube/whitelisting/requests/WhitelistRequester.java
+++ b/app/src/main/java/fi/vanced/libraries/youtube/whitelisting/requests/WhitelistRequester.java
@@ -81,6 +81,7 @@ public class WhitelistRequester {
                     view.setEnabled(true);
                 });
             }
+            connection.disconnect();
         }
         catch (Exception ex) {
             Log.e(TAG, "Failed to fetch channelId", ex);
diff --git a/app/src/main/res/drawable/vanced_yt_sb.xml b/app/src/main/res/drawable/vanced_yt_sb.xml
deleted file mode 100644
index ba07674e..00000000
--- a/app/src/main/res/drawable/vanced_yt_sb.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="m11.9403,24a2.7465,2.7465 0,0 1,-1.4425 -0.4082c-6.466,-3.9887 -10.3901,-10.8963 -10.4974,-18.4791a2.7427,2.7427 0,0 1,1.4366 -2.4545,22.0799 22.0799,0 0,1 21.0067,0 2.7427,2.7427 0,0 1,1.4366 2.4558c-0.1069,7.5815 -4.031,14.4891 -10.4966,18.4774a2.7465,2.7465 0,0 1,-1.4434 0.4086zM11.9403,0.832a21.2214,21.2214 0,0 0,-10.1062 2.5576,1.9128 1.9128,0 0,0 -1.0014,1.7125c0.1031,7.2959 3.8793,13.9436 10.1015,17.7815a1.9517,1.9517 0,0 0,2.0117 0c6.2222,-3.8387 9.998,-10.4856 10.1015,-17.7815a1.9124,1.9124 0,0 0,-1.0014 -1.7129,21.2222 21.2222,0 0,0 -10.1058,-2.5572z"
-      android:strokeWidth="0.0422534"
-      android:fillColor="?ytTextPrimary"/>
-  <path
-      android:pathData="m12.0301,1.804a20.2774,20.2774 0,0 0,-9.7325 2.4391,0.952 0.952,0 0,0 -0.4943,0.8451c0.1014,7.1763 3.9296,13.4459 9.6405,16.9685a0.9499,0.9499 0,0 0,0.9925 0c5.711,-3.5227 9.5391,-9.7922 9.6405,-16.9685a0.952,0.952 0,0 0,-0.4944 -0.8451,20.2774 20.2774,0 0,0 -9.5524,-2.4391zM9.3134,6.1581 L17.3783,10.8144 9.3134,15.4708z"
-      android:strokeWidth="0.0422534"
-      android:fillColor="?ytTextPrimary"/>
-</vector>
diff --git a/app/src/main/res/drawable/vanced_yt_sb_blocked.xml b/app/src/main/res/drawable/vanced_yt_sb_blocked.xml
deleted file mode 100644
index 2a98161f..00000000
--- a/app/src/main/res/drawable/vanced_yt_sb_blocked.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="m10.7249,0.0335a22.0803,22.0803 0,0 0,-7.8389 1.9415l0.6151,0.6169a21.2217,21.2217 0,0 1,8.4394 -1.7598,21.2225 21.2225,0 0,1 10.1059,2.5573 1.9124,1.9124 0,0 1,1.0014 1.7129c-0.0664,4.6809 -1.6465,9.0932 -4.4123,12.6696l0.5933,0.595c2.916,-3.7317 4.5828,-8.3507 4.6519,-13.2528a2.7427,2.7427 0,0 0,-1.4366 -2.4558,22.0803 22.0803,0 0,0 -11.7191,-2.6248zM1.6261,2.5691a22.0803,22.0803 0,0 0,-0.1892 0.0892,2.7427 2.7427,0 0,0 -1.4366,2.4545c0.1073,7.5829 4.0314,14.4906 10.4976,18.4794a2.7465,2.7465 0,0 0,1.4426 0.4082,2.7465 2.7465,0 0,0 1.4434,-0.4086c1.898,-1.1708 3.5749,-2.5947 5.0027,-4.2118l-0.5895,-0.5912c-1.3818,1.5735 -3.008,2.9583 -4.8509,4.0953a1.9517,1.9517 0,0 1,-2.0118 0c-6.2223,-3.8379 -9.9986,-10.4858 -10.1017,-17.7818a1.9128,1.9128 0,0 1,1.0015 -1.7125,21.2217 21.2217,0 0,1 0.413,-0.1977z"
-      android:strokeWidth="0.0422541"
-      android:fillColor="?ytTextPrimary"/>
-  <path
-      android:pathData="m12.0303,1.804a20.2777,20.2777 0,0 0,-7.8092 1.5316l5.0924,5.1079v-2.2854l8.065,4.6564 -3.6183,2.0891 4.1686,4.1811c2.5489,-3.3367 4.0847,-7.4873 4.1484,-11.9965a0.952,0.952 0,0 0,-0.4944 -0.8451,20.2777 20.2777,0 0,0 -9.5526,-2.4392zM2.9589,3.9275a20.2777,20.2777 0,0 0,-0.6612 0.3158,0.952 0.952,0 0,0 -0.4943,0.8451c0.1014,7.1764 3.9296,13.4461 9.6407,16.9688a0.9499,0.9499 0,0 0,0.9926 0c1.7467,-1.0774 3.3161,-2.4129 4.6578,-3.9516l-4.5096,-4.5232 -3.2711,1.8886v-5.1697z"
-      android:strokeWidth="0.0422541"
-      android:fillColor="?ytTextPrimary"/>
-</vector>
diff --git a/app/src/main/res/drawable/vanced_yt_sb_button.xml b/app/src/main/res/drawable/vanced_yt_sb_button.xml
deleted file mode 100644
index 6bba8187..00000000
--- a/app/src/main/res/drawable/vanced_yt_sb_button.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" android:drawable="@drawable/vanced_yt_sb" />
-    <item android:state_enabled="false" android:drawable="@drawable/vanced_yt_sb_blocked" />
-</selector>
\ No newline at end of file