From a9e7a34a8dd503b7b54fb1fb11f30a086a5c5128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aliberk=20Sand=C4=B1k=C3=A7=C4=B1?= Date: Fri, 27 Dec 2024 14:01:06 +0300 Subject: [PATCH] WIP: build error fix (still has 2) --- .../YouTubeAccountSettingsFragment.java | 27 ++++++++------- .../views/YouTubeLoginWebViewActivity.java | 34 +++++++++++-------- checkstyle/suppressions.xml | 3 ++ 3 files changed, 37 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/settings/YouTubeAccountSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/YouTubeAccountSettingsFragment.java index 44c243562..1931bd9aa 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/YouTubeAccountSettingsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/YouTubeAccountSettingsFragment.java @@ -14,19 +14,19 @@ public class YouTubeAccountSettingsFragment extends BasePreferenceFragment { @Override public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) { addPreferencesFromResource(R.xml.account_settings_youtube); - Preference login = findPreference(getString(R.string.login_key)); - Preference logout = findPreference(getString(R.string.logout_key)); + final Preference login = findPreference(getString(R.string.login_key)); + final Preference logout = findPreference(getString(R.string.logout_key)); login.setOnPreferenceClickListener(preference -> { // Open a webview to login and then get cookies // and save them to the shared preferences - Intent intent = new Intent(this.getContext(), YouTubeLoginWebViewActivity.class); + final Intent intent = new Intent(this.getContext(), YouTubeLoginWebViewActivity.class); startActivityForResult(intent, REQUEST_LOGIN); return true; }); logout.setOnPreferenceClickListener(preference -> { // Clear cookies - defaultPreferences.edit().putString(getString(R.string.youtube_cookies_key), "").apply(); -// defaultPreferences.edit().putString(getString(R.string.youtube_po_token), "").apply(); + defaultPreferences.edit().putString(getString(R.string.youtube_cookies_key), "").apply(); +// defaultPreferences.edit().putString(getString(R.string.youtube_po_token), "").apply(); return true; }); if (defaultPreferences.getString(getString(R.string.youtube_cookies_key), "").equals("")) { @@ -35,17 +35,20 @@ public class YouTubeAccountSettingsFragment extends BasePreferenceFragment { login.setEnabled(false); } -// Preference override_cookies_niconico_value = findPreference(getString(R.string.override_cookies_youtube_value_key)); -// override_cookies_niconico_value.setEnabled(defaultPreferences.getBoolean(getString(R.string.override_cookies_youtube_key), false)); +// Preference override_cookies_niconico_value = +// findPreference(getString(R.string.override_cookies_youtube_value_key)); +// override_cookies_niconico_value.setEnabled( +// defaultPreferences.getBoolean(getString(R.string.override_cookies_youtube_key), false)); } @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { + public void onActivityResult(final int requestCode, final int resultCode, final Intent data) { if (requestCode == REQUEST_LOGIN && resultCode == RESULT_OK) { - String cookies = data.getStringExtra("cookies"); - String pot = data.getStringExtra("pot"); + final String cookies = data.getStringExtra("cookies"); + final String pot = data.getStringExtra("pot"); // save cookies to shared preferences - defaultPreferences.edit().putString(getString(R.string.youtube_cookies_key), cookies).apply(); -// defaultPreferences.edit().putString(getString(R.string.youtube_po_token), pot).apply(); + defaultPreferences.edit().putString( + getString(R.string.youtube_cookies_key), cookies).apply(); +// defaultPreferences.edit().putString(getString(R.string.youtube_po_token), pot).apply(); } } diff --git a/app/src/main/java/org/schabi/newpipe/views/YouTubeLoginWebViewActivity.java b/app/src/main/java/org/schabi/newpipe/views/YouTubeLoginWebViewActivity.java index 1bfb67b45..44e539215 100644 --- a/app/src/main/java/org/schabi/newpipe/views/YouTubeLoginWebViewActivity.java +++ b/app/src/main/java/org/schabi/newpipe/views/YouTubeLoginWebViewActivity.java @@ -1,11 +1,11 @@ package org.schabi.newpipe.views; -import android.app.AlertDialog; -import android.content.DialogInterface; +//import android.app.AlertDialog; +//import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.webkit.*; +//import android.webkit.*; import androidx.appcompat.app.AppCompatActivity; import org.schabi.newpipe.R; @@ -14,15 +14,17 @@ public class YouTubeLoginWebViewActivity extends AppCompatActivity { String cookies; @Override - protected void onCreate(Bundle savedInstanceState) { + protected void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.login_webview); - WebView webView = findViewById(R.id.login_webview); + final WebView webView = findViewById(R.id.login_webview); this.webView = webView; - WebSettings webSettings = webView.getSettings(); + final WebSettings webSettings = webView.getSettings(); webSettings.setJavaScriptEnabled(true); - webSettings.setUserAgentString("Mozilla/5.0 (Linux; Android 10; Mobile) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.120 Mobile Safari/537.36"); + webSettings.setUserAgentString("Mozilla/5.0 (Linux; Android 10; Mobile) " + + "AppleWebKit/537.36 (KHTML, like Gecko) " + + "Chrome/91.0.4472.120 Mobile Safari/537.36"); webView.setWebViewClient(new MyWebViewClient()); webView.loadUrl("https://www.youtube.com/signin"); @@ -30,22 +32,24 @@ public class YouTubeLoginWebViewActivity extends AppCompatActivity { private class MyWebViewClient extends WebViewClient { @Override - public void onPageFinished(WebView view, String url) { + public void onPageFinished(final WebView view, final String url) { super.onPageFinished(view, url); - if (url.equals("https://m.youtube.com/?noapp=1") || url.equals("https://m.youtube.com/")) { + if (url.equals("https://m.youtube.com/?noapp=1") + || url.equals("https://m.youtube.com/")) { setCookies(CookieManager.getInstance().getCookie(url)); webView.loadUrl("https://music.youtube.com/watch?v=09839DpTctU"); } } @Override - public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) { - String url = request.getUrl().toString(); + public WebResourceResponse shouldInterceptRequest( + final WebView view, final WebResourceRequest request) { + final String url = request.getUrl().toString(); // Filter specific requests if (url.contains("googlevideo.com/videoplayback")) { - Uri uri = Uri.parse(url); - String pot = uri.getQueryParameter("pot"); - Intent intent = new Intent(); + final Uri uri = Uri.parse(url); + final String pot = uri.getQueryParameter("pot"); + final Intent intent = new Intent(); intent.putExtra("cookies", cookies); intent.putExtra("pot", pot); setResult(RESULT_OK, intent); @@ -72,7 +76,7 @@ public class YouTubeLoginWebViewActivity extends AppCompatActivity { // dialog.show(); // } - public void setCookies(String cookies) { + public void setCookies(final String cookies) { this.cookies = cookies; } diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml index 3f31de48a..663f3e133 100644 --- a/checkstyle/suppressions.xml +++ b/checkstyle/suppressions.xml @@ -10,4 +10,7 @@ + +