fix: make login more robust

InfinityLoop1308 · InfinityLoop1308 · commit f2ffe7211018 · 2025-06-25T10:31:15.000+08:00
diff --git a/app/src/main/java/org/schabi/newpipe/settings/BiliBiliAccountSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/BiliBiliAccountSettingsFragment.java
@@ -3,6 +3,7 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.widget.Toast;
 import androidx.preference.Preference;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.ServiceHelper;
@@ -18,6 +19,16 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
         addPreferencesFromResource(R.xml.account_settings_bilibili);
         Preference login = findPreference(getString(R.string.login_key));
         Preference logout = findPreference(getString(R.string.logout_key));
+        Preference override_switch = findPreference(getString(R.string.override_cookies_bilibili_key));
+        Preference override_value = findPreference(getString(R.string.override_cookies_bilibili_value_key));
+        override_value.setOnPreferenceClickListener(preference -> {
+            ServiceHelper.initServices(this.getContext());
+            return true;
+        });
+        override_switch.setOnPreferenceClickListener(preference -> {
+            ServiceHelper.initServices(this.getContext());
+            return true;
+        });
         login.setOnPreferenceClickListener(preference -> {
             // Open a webview to login and then get cookies
             // and save them to the shared preferences
@@ -29,6 +40,10 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
             // Clear cookies
             defaultPreferences.edit().putString(getString(R.string.bilibili_cookies_key), "").apply();
             ServiceHelper.initServices(this.getContext());
+            Toast.makeText(requireContext(), R.string.success, Toast.LENGTH_SHORT)
+                    .show();
+            login.setEnabled(true);
+            logout.setEnabled(false);
             return true;
         });
         if (defaultPreferences.getString(getString(R.string.bilibili_cookies_key), "").equals("")) {
@@ -53,6 +68,12 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             // save cookies to shared preferences
             defaultPreferences.edit().putString(getString(R.string.bilibili_cookies_key), cookies).apply();
             ServiceHelper.initServices(this.getContext());
+            Toast.makeText(requireContext(), R.string.success, Toast.LENGTH_SHORT)
+                    .show();
+            Preference login = findPreference(getString(R.string.login_key));
+            Preference logout = findPreference(getString(R.string.logout_key));
+            login.setEnabled(false);
+            logout.setEnabled(true);
         }
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/settings/NicoNicoAccountSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/NicoNicoAccountSettingsFragment.java
@@ -3,6 +3,7 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.widget.Toast;
 import androidx.preference.Preference;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.ServiceHelper;
@@ -20,6 +21,16 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
         addPreferencesFromResource(R.xml.account_settings_niconico);
         Preference login = findPreference(getString(R.string.login_key));
         Preference logout = findPreference(getString(R.string.logout_key));
+        Preference override_switch = findPreference(getString(R.string.override_cookies_niconico_key));
+        Preference override_value = findPreference(getString(R.string.override_cookies_niconico_value_key));
+        override_value.setOnPreferenceClickListener(preference -> {
+            ServiceHelper.initServices(this.getContext());
+            return true;
+        });
+        override_switch.setOnPreferenceClickListener(preference -> {
+            ServiceHelper.initServices(this.getContext());
+            return true;
+        });
         login.setOnPreferenceClickListener(preference -> {
             // Open a webview to login and then get cookies
             // and save them to the shared preferences
@@ -31,6 +42,10 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
             // Clear cookies
             defaultPreferences.edit().putString(getString(R.string.niconico_cookies_key), "").apply();
             ServiceHelper.initServices(this.getContext());
+            Toast.makeText(requireContext(), R.string.success, Toast.LENGTH_SHORT)
+                    .show();
+            login.setEnabled(true);
+            logout.setEnabled(false);
             return true;
         });
         if (defaultPreferences.getString(getString(R.string.niconico_cookies_key), "").equals("")) {
@@ -55,6 +70,12 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             // save cookies to shared preferences
             defaultPreferences.edit().putString(getString(R.string.niconico_cookies_key), cookies).apply();
             ServiceHelper.initServices(this.getContext());
+            Toast.makeText(requireContext(), R.string.success, Toast.LENGTH_SHORT)
+                    .show();
+            Preference login = findPreference(getString(R.string.login_key));
+            Preference logout = findPreference(getString(R.string.logout_key));
+            login.setEnabled(false);
+            logout.setEnabled(true);
         }
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/settings/YouTubeAccountSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/YouTubeAccountSettingsFragment.java
@@ -6,9 +6,12 @@
 import android.widget.Toast;
 import androidx.preference.Preference;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper;
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.views.YouTubeLoginWebViewActivity;
 
+import java.security.NoSuchAlgorithmException;
+
 import static android.app.Activity.RESULT_OK;
 
 public class YouTubeAccountSettingsFragment extends BasePreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
@@ -31,6 +34,10 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
             defaultPreferences.edit().putString(getString(R.string.youtube_cookies_key), "").apply();
             defaultPreferences.edit().putString(getString(R.string.youtube_po_token_key), "").apply();
             ServiceHelper.initServices(this.getContext());
+            Toast.makeText(requireContext(), R.string.success, Toast.LENGTH_SHORT)
+                    .show();
+            login.setEnabled(true);
+            logout.setEnabled(false);
             return true;
         });
         if (defaultPreferences.getString(getString(R.string.youtube_cookies_key), "").equals("")) {
@@ -70,8 +77,21 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             defaultPreferences.edit().putString(getString(R.string.youtube_cookies_key), cookies).apply();
             defaultPreferences.edit().putString(getString(R.string.youtube_po_token_key), pot).apply();
             ServiceHelper.initServices(this.getContext());
+
+            try {
+                YoutubeParsingHelper.getAuthorizationHeader(cookies);
+            } catch (Exception e) {
+                Toast.makeText(requireContext(), R.string.try_again, Toast.LENGTH_SHORT)
+                        .show();
+               return;
+            }
+
             Toast.makeText(requireContext(), R.string.success, Toast.LENGTH_SHORT)
                     .show();
+            Preference login = findPreference(getString(R.string.login_key));
+            Preference logout = findPreference(getString(R.string.logout_key));
+            login.setEnabled(false);
+            logout.setEnabled(true);
         }
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/views/BiliBiliLoginWebViewActivity.java b/app/src/main/java/org/schabi/newpipe/views/BiliBiliLoginWebViewActivity.java
@@ -44,12 +44,26 @@ private class MyWebViewClient extends WebViewClient {
         @Override
         public void onPageFinished(WebView view, String url) {
             super.onPageFinished(view, url);
-            if (url.contains("https://m.bilibili.com")) {
-                String cookies = CookieManager.getInstance().getCookie(url);
+            String cookies = CookieManager.getInstance().getCookie(url);
+            if (cookies != null && cookies.contains("SESSDATA=")) {
                 Intent intent = new Intent();
                 intent.putExtra("cookies", cookies);
                 setResult(RESULT_OK, intent);
-                finish();
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        // Now you are safely on the main UI thread
+                        if (!isFinishing()) {
+                            // It's also a good idea to tell the WebView to stop what it's doing
+                            view.stopLoading();
+                            view.loadUrl("about:blank");
+                            view.onPause();
+                            view.removeAllViews();
+                            view.destroy();
+                            finish();
+                        }
+                    }
+                });
                 // may need a clearHistory() here
             }
         }
diff --git a/app/src/main/java/org/schabi/newpipe/views/NicoNicoLoginWebViewActivity.java b/app/src/main/java/org/schabi/newpipe/views/NicoNicoLoginWebViewActivity.java
@@ -24,12 +24,26 @@ private class MyWebViewClient extends WebViewClient {
         @Override
         public void onPageFinished(WebView view, String url) {
             super.onPageFinished(view, url);
-            if (url.equals("https://sp.nicovideo.jp/")) {
-                String cookies = CookieManager.getInstance().getCookie(url);
+            String cookies = CookieManager.getInstance().getCookie(url);
+            if (cookies != null && cookies.contains("user_session")) {
                 Intent intent = new Intent();
                 intent.putExtra("cookies", cookies);
                 setResult(RESULT_OK, intent);
-                finish();
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        // Now you are safely on the main UI thread
+                        if (!isFinishing()) {
+                            // It's also a good idea to tell the WebView to stop what it's doing
+                            view.stopLoading();
+                            view.loadUrl("about:blank");
+                            view.onPause();
+                            view.removeAllViews();
+                            view.destroy();
+                            finish();
+                        }
+                    }
+                });
             }
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/views/YouTubeLoginWebViewActivity.java b/app/src/main/java/org/schabi/newpipe/views/YouTubeLoginWebViewActivity.java
@@ -11,7 +11,6 @@
 
 public class YouTubeLoginWebViewActivity extends AppCompatActivity {
     WebView webView;
-    String cookies;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -29,11 +28,13 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private class MyWebViewClient extends WebViewClient {
+        boolean hasLoaded = false;
         @Override
         public void onPageFinished(WebView view, String url) {
             super.onPageFinished(view, url);
-            if (url.equals("https://m.youtube.com/?noapp=1") || url.equals("https://m.youtube.com/")) {
-                setCookies(CookieManager.getInstance().getCookie(url));
+            String cookies = CookieManager.getInstance().getCookie(url);
+            if (!hasLoaded && cookies != null && cookies.contains("SID=")) {
+                hasLoaded = true;
                 webView.loadUrl("https://music.youtube.com/watch?v=09839DpTctU");
             }
         }
@@ -46,10 +47,25 @@ public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceReque
                 Uri uri = Uri.parse(url);
                 String pot = uri.getQueryParameter("pot");
                 Intent intent = new Intent();
+                String cookies = CookieManager.getInstance().getCookie("https://music.youtube.com/watch");
                 intent.putExtra("cookies", cookies);
                 intent.putExtra("pot", pot);
                 setResult(RESULT_OK, intent);
-                finish();
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        // Now you are safely on the main UI thread
+                        if (!isFinishing()) {
+                            // It's also a good idea to tell the WebView to stop what it's doing
+                            view.stopLoading();
+                            view.loadUrl("about:blank");
+                            view.onPause();
+                            view.removeAllViews();
+                            view.destroy();
+                            finish();
+                        }
+                    }
+                });
             }
             // Return null to allow the WebView to load the request as usual
             return null;
@@ -71,12 +87,4 @@ public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceReque
 //        dialog.setCanceledOnTouchOutside(false); // Prevents dismissal when touching outside
 //        dialog.show();
 //    }
-
-    public void setCookies(String cookies) {
-        this.cookies = cookies;
-    }
-
-    public String getCookies() {
-        return cookies;
-    }
 }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -977,4 +977,5 @@
 <string name="need_login_hint"> Dieser Inhalt erfordert ein Konto, um angezeigt zu werden. Melden Sie sich über die Einstellungen an, um fortzufahren.</string>
 <string name="exit_app_confirmation_message">Zeigen Sie einen "Drücken Sie erneut zurück, um zu beenden" Toast, um versehentliches Beenden zu vermeiden</string>
 <string name="exit_app_confirmation_title">Bestätigung zum Beenden der App</string>
+<string name="try_again">Bitte versuchen Sie es erneut</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -1040,4 +1040,5 @@
 <string name="need_login_hint"> Este contenido requiere una cuenta para ver. Inicia sesión a través de la configuración para continuar.</string>
 <string name="exit_app_confirmation_message">Mostrar un toast de "presiona atrás de nuevo para salir" para evitar salir accidentalmente</string>
 <string name="exit_app_confirmation_title">Confirmación de salida de la aplicación</string>
+<string name="try_again">Por favor, inténtalo de nuevo</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -930,4 +930,5 @@ Vous devez l\'accepter pour nous envoyer le rapport de bug.</string>
 <string name="need_login_hint"> Ce contenu nécessite un compte pour être consulté. Connectez-vous via les paramètres pour continuer.</string>
 <string name="exit_app_confirmation_message">Afficher un toast "appuyez à nouveau sur retour pour quitter" pour éviter de quitter accidentellement</string>
 <string name="exit_app_confirmation_title">Confirmation de sortie de l\'application</string>
+<string name="try_again">Veuillez réessayer</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -897,4 +897,5 @@
 <string name="need_login_hint"> Questo contenuto richiede un account per essere visualizzato. Accedi tramite le impostazioni per continuare.</string>
 <string name="exit_app_confirmation_message">Mostra un toast "premi di nuovo indietro per uscire" per evitare uscite accidentali</string>
 <string name="exit_app_confirmation_title">Conferma uscita dall\'app</string>
+<string name="try_again">Per favore riprova</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -993,4 +993,5 @@
 <string name="need_login_hint"> このコンテンツを表示するにはアカウントが必要です。設定からログインして続行してください。</string>
 <string name="exit_app_confirmation_message">「もう一度戻るボタンを押すと終了します」というトーストを表示して、誤って終了するのを防ぎます</string>
 <string name="exit_app_confirmation_title">アプリ終了の確認</string>
+<string name="try_again">もう一度お試しください</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
@@ -1083,4 +1083,5 @@ nSự khác biệt giữa hai loại này là cái nào nhanh thường thiếu
 <string name="need_login_hint"> Nội dung này yêu cầu tài khoản để xem. Đăng nhập qua cài đặt để tiếp tục.</string>
 <string name="exit_app_confirmation_message">Hiển thị thông báo "nhấn quay lại lần nữa để thoát" để tránh thoát nhầm</string>
 <string name="exit_app_confirmation_title">Xác nhận thoát ứng dụng</string>
+<string name="try_again">Vui lòng thử lại</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1039,4 +1039,5 @@
 <string name="need_login_hint"> 此内容需要账户才能查看。通过设置登录以继续。</string>
 <string name="exit_app_confirmation_message">显示“再次按返回键退出”提示以避免意外退出</string>
 <string name="exit_app_confirmation_title">退出应用确认</string>
+<string name="try_again">请再试一次</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1031,4 +1031,5 @@
 <string name="need_login_hint"> 此內容需要帳戶才能查看。通過設置登錄以繼續。</string>
 <string name="exit_app_confirmation_message">顯示“再次按返回退出”的提示，以避免意外退出</string>
 <string name="exit_app_confirmation_title">退出應用程式確認</string>
+<string name="try_again">請再試一次</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1081,4 +1081,5 @@
 <string name="need_login_hint"> This content requires an account to view. Login through settings to continue.</string>
 <string name="exit_app_confirmation_message">Show a "press back again to quit" toast to avoid accidental quiting</string>
 <string name="exit_app_confirmation_title">Exit app confirmation</string>
+<string name="try_again">Please try again</string>
 </resources>
