From cff137ededd472762102b886e2ca73357bf60b64 Mon Sep 17 00:00:00 2001 From: "luca0N\\!" Date: Wed, 10 Mar 2021 00:23:36 -0300 Subject: [PATCH] Detect empty server addresses If the app detects an empty server URL, it will change it to the default server address. --- .../com/luca0n/joguitos/pluck/trivia/TriviaQuery.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/luca0n/joguitos/pluck/trivia/TriviaQuery.java b/app/src/main/java/com/luca0n/joguitos/pluck/trivia/TriviaQuery.java index 3ad82ad..f9a0767 100644 --- a/app/src/main/java/com/luca0n/joguitos/pluck/trivia/TriviaQuery.java +++ b/app/src/main/java/com/luca0n/joguitos/pluck/trivia/TriviaQuery.java @@ -92,11 +92,16 @@ public class TriviaQuery implements Serializable { // Load custom server URL. Context c = PluckApplication.getAppContext(); SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(c); - String key = c.getResources().getString(R.string.pref_network_server); + String serverKey = c.getResources().getString(R.string.pref_network_server); // Load default server URL in case the player did not specify a custom server URL. String defaultServer = c.getResources().getString(R.string.pref_network_server_default); + String base = sp.getString(serverKey, defaultServer) + "?"; // append "?" to the end of the URL so we can specify GET parameters. - String base = sp.getString(key, defaultServer) + "?"; // append "?" to the end of the URL so we can specify GET parameters. + // Check if the custom server URL preference was empty. If it was, change it to the default URL. + if (base.equals("?")){ + base = defaultServer + "?"; + sp.edit().putString(serverKey, defaultServer).commit(); + } url.append(base); url.append("amount=").append(this.amount);