From 5ea6840cee7584240d10381b481cc7c9b17fc145 Mon Sep 17 00:00:00 2001 From: androidacy-user Date: Tue, 4 Apr 2023 21:39:36 -0400 Subject: [PATCH] update custom repo impl Signed-off-by: androidacy-user --- .../java/com/fox2code/mmm/MainActivity.java | 6 ------ .../mmm/androidacy/AndroidacyWebAPI.java | 2 +- .../fox2code/mmm/settings/SettingsActivity.java | 17 ++++++++++++++++- app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/fox2code/mmm/MainActivity.java b/app/src/main/java/com/fox2code/mmm/MainActivity.java index aae099c..39ca8a2 100644 --- a/app/src/main/java/com/fox2code/mmm/MainActivity.java +++ b/app/src/main/java/com/fox2code/mmm/MainActivity.java @@ -114,12 +114,6 @@ public class MainActivity extends FoxActivity implements SwipeRefreshLayout.OnRe BackgroundUpdateChecker.onMainActivityCreate(this); super.onCreate(savedInstanceState); // log all shared preferences that are present - // first, get every shared preference - Map allPrefs = MainApplication.getPreferences("mmm").getAll(); - // then, log them - for (Map.Entry entry : allPrefs.entrySet()) { - Timber.d("Shared preference: %s = %s", entry.getKey(), entry.getValue()); - } if (!isOfficial) { Timber.w("You may be running an untrusted build."); // Show a toast to warn the user diff --git a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java index 3847219..b0f6161 100644 --- a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java +++ b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java @@ -35,7 +35,7 @@ import java.nio.charset.StandardCharsets; import timber.log.Timber; -@SuppressWarnings("SameReturnValue") +@SuppressWarnings({"unused", "SameReturnValue"}) @Keep public class AndroidacyWebAPI { public static final int COMPAT_UNSUPPORTED = 0; 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 b29a882..c78e4f7 100644 --- a/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java +++ b/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java @@ -1169,7 +1169,22 @@ public class SettingsActivity extends FoxActivity implements LanguageActivity { input.setValidator(new AutoCompleteTextView.Validator() { @Override public boolean isValid(CharSequence charSequence) { - return customRepoManager.canAddRepo(charSequence.toString()); + // show error if string is empty, does not start with https://, or contains spaces + if (charSequence.toString().isEmpty()) { + input.setError(getString(R.string.empty_field)); + return false; + } else if (!charSequence.toString().matches("^https://.*")) { + input.setError(getString(R.string.invalid_repo_url)); + return false; + } else if (charSequence.toString().contains(" ")) { + input.setError(getString(R.string.invalid_repo_url)); + return false; + } else if (!customRepoManager.canAddRepo(charSequence.toString())) { + input.setError(getString(R.string.repo_already_added)); + return false; + } else { + return true; + } } @Override diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 29ea016..4c0574b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -394,4 +394,6 @@ This may include device identifiers and IP addresses. No data will be used for any other purpose besides analyzing crashes and improving performance. Error accessing WebView. Functionality may be impacted. To enable the finish button, please scroll down and view all the options. + URL is required + Repo already exists.