From f673f04f912f55b8c26c44c270c8c32340d6f0a5 Mon Sep 17 00:00:00 2001 From: androidacy-user Date: Tue, 25 Apr 2023 16:08:48 -0400 Subject: [PATCH] (misc) cleanup Signed-off-by: androidacy-user --- .gitignore | 1 + app/build.gradle.kts | 4 ++ .../java/com/fox2code/mmm/MainActivity.java | 3 +- .../mmm/androidacy/AndroidacyActivity.java | 9 +++ .../mmm/settings/SettingsActivity.java | 68 +++++++++++-------- 5 files changed, 54 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 9cf81e5..1c5e6a4 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ /app/build /app/default /app/fdroid +/app/play /captures .externalNativeBuild .cxx diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b0eb589..26fca50 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -432,6 +432,7 @@ dependencies { // ksp implementation("com.google.devtools.ksp:symbol-processing-api:1.8.20-1.0.10") + // encryption implementation("androidx.security:security-crypto:1.1.0-alpha06") // some utils @@ -443,6 +444,9 @@ dependencies { // annotations implementation("org.jetbrains:annotations-java5:24.0.1") + + // debugging + debugImplementation("com.squareup.leakcanary:leakcanary-android:2.10") } android { diff --git a/app/src/main/java/com/fox2code/mmm/MainActivity.java b/app/src/main/java/com/fox2code/mmm/MainActivity.java index c937df9..f6f0938 100644 --- a/app/src/main/java/com/fox2code/mmm/MainActivity.java +++ b/app/src/main/java/com/fox2code/mmm/MainActivity.java @@ -204,6 +204,7 @@ public class MainActivity extends FoxActivity implements SwipeRefreshLayout.OnRe }); // clear search view this.searchView.setQuery("", false); + this.searchView.clearFocus(); } else if (item.getItemId() == R.id.installed_menu_item) { TrackHelper.track().event("view_list", "installed_modules").with(MainApplication.getINSTANCE().getTracker()); // set module_list_online as gone and module_list as visible. fade in/out @@ -218,6 +219,7 @@ public class MainActivity extends FoxActivity implements SwipeRefreshLayout.OnRe }); // set search view to cleared this.searchView.setQuery("", false); + this.searchView.clearFocus(); } return true; }); @@ -435,7 +437,6 @@ public class MainActivity extends FoxActivity implements SwipeRefreshLayout.OnRe this.overScrollInsetBottom = bottomInset; // set root_container to have zero padding findViewById(R.id.root_container).setPadding(0, statusBarHeight, 0, 0); - Timber.i("(" + this.searchCard.getHeight() + ")"); } private void updateBlurState() { diff --git a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyActivity.java b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyActivity.java index 8d3fe5d..5807695 100644 --- a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyActivity.java +++ b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyActivity.java @@ -5,10 +5,12 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.net.Uri; +import android.net.http.SslError; import android.os.Bundle; import android.view.View; import android.webkit.ConsoleMessage; import android.webkit.CookieManager; +import android.webkit.SslErrorHandler; import android.webkit.ValueCallback; import android.webkit.WebChromeClient; import android.webkit.WebResourceRequest; @@ -250,6 +252,13 @@ public final class AndroidacyActivity extends FoxActivity { this.onReceivedError(request.getUrl().toString(), error.getErrorCode()); } } + + @Override + public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) { + super.onReceivedSslError(view, handler, error); + // log the error and url of its request + Timber.tag("JSLog").e(error.toString()); + } }); // logic for swipe to refresh swipeRefreshLayout.setOnRefreshListener(() -> { diff --git a/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java b/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java index 4d4a6ab..e8b91c6 100644 --- a/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java +++ b/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java @@ -848,38 +848,46 @@ public class SettingsActivity extends FoxActivity implements LanguageActivity { }); LongClickablePreference pref_donate_fox = findPreference("pref_donate_fox"); - pref_donate_fox.setOnPreferenceClickListener(p -> { - // open fox - IntentHelper.openUrl(getFoxActivity(this), "https://paypal.me/fox2code"); - return true; - }); - // handle long click on pref_donate_fox - pref_donate_fox.setOnPreferenceLongClickListener(p -> { - // copy to clipboard - String toastText = requireContext().getString(R.string.link_copied); - clipboard.setPrimaryClip(ClipData.newPlainText(toastText, "https://paypal.me/fox2code")); - Toast.makeText(requireContext(), toastText, Toast.LENGTH_SHORT).show(); - return true; - }); + if (BuildConfig.FLAVOR.equals("play")) { + pref_donate_fox.setOnPreferenceClickListener(p -> { + // open fox + IntentHelper.openUrl(getFoxActivity(this), "https://paypal.me/fox2code"); + return true; + }); + // handle long click on pref_donate_fox + pref_donate_fox.setOnPreferenceLongClickListener(p -> { + // copy to clipboard + String toastText = requireContext().getString(R.string.link_copied); + clipboard.setPrimaryClip(ClipData.newPlainText(toastText, "https://paypal.me/fox2code")); + Toast.makeText(requireContext(), toastText, Toast.LENGTH_SHORT).show(); + return true; + }); + } else { + pref_donate_fox.setVisible(false); + } // now handle pref_donate_androidacy LongClickablePreference pref_donate_androidacy = findPreference("pref_donate_androidacy"); - pref_donate_androidacy.setOnPreferenceClickListener(p -> { - // copy FOX2CODE promo code to clipboard and toast user that they can use it for half off any subscription - String toastText = requireContext().getString(R.string.promo_code_copied); - clipboard.setPrimaryClip(ClipData.newPlainText(toastText, "FOX2CODE")); - Toast.makeText(requireContext(), toastText, Toast.LENGTH_SHORT).show(); - // open androidacy - IntentHelper.openUrl(getFoxActivity(this), "https://www.androidacy.com/membership-join/?utm_source=foxmmm&utm_medium=app&utm_campaign=donate"); - return true; - }); - // handle long click on pref_donate_androidacy - pref_donate_androidacy.setOnPreferenceLongClickListener(p -> { - // copy to clipboard - String toastText = requireContext().getString(R.string.link_copied); - clipboard.setPrimaryClip(ClipData.newPlainText(toastText, "https://www.androidacy.com/membership-join/?utm_source=foxmmm&utm_medium=app&utm_campaign=donate")); - Toast.makeText(requireContext(), toastText, Toast.LENGTH_SHORT).show(); - return true; - }); + if (BuildConfig.FLAVOR.equals("play")) { + pref_donate_androidacy.setOnPreferenceClickListener(p -> { + // copy FOX2CODE promo code to clipboard and toast user that they can use it for half off any subscription + String toastText = requireContext().getString(R.string.promo_code_copied); + clipboard.setPrimaryClip(ClipData.newPlainText(toastText, "FOX2CODE")); + Toast.makeText(requireContext(), toastText, Toast.LENGTH_SHORT).show(); + // open androidacy + IntentHelper.openUrl(getFoxActivity(this), "https://www.androidacy.com/membership-join/?utm_source=foxmmm&utm_medium=app&utm_campaign=donate"); + return true; + }); + // handle long click on pref_donate_androidacy + pref_donate_androidacy.setOnPreferenceLongClickListener(p -> { + // copy to clipboard + String toastText = requireContext().getString(R.string.link_copied); + clipboard.setPrimaryClip(ClipData.newPlainText(toastText, "https://www.androidacy.com/membership-join/?utm_source=foxmmm&utm_medium=app&utm_campaign=donate")); + Toast.makeText(requireContext(), toastText, Toast.LENGTH_SHORT).show(); + return true; + }); + } else { + pref_donate_androidacy.setVisible(false); + } } private void openFragment(Fragment fragment, @StringRes int title) {