Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265094
Change subject: Use production RESTBase URI for empty dev inputs
......................................................................
Use production RESTBase URI for empty dev inputs
It's very inconvenient to type the production Content Service URI if
previously testing with a different instance. Previously, if an empty
URI was specified, the app would crash. Now we check for a blank input
and use the production value in that case.
Change-Id: I06a87481cf7d1b4eac8e06f33927ee180e806881
---
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/java/org/wikipedia/util/StringUtil.java
2 files changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/94/265094/1
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 9395574..ba72355 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -9,6 +9,7 @@
import org.wikipedia.data.TabUnmarshaller;
import org.wikipedia.page.tabs.Tab;
import org.wikipedia.theme.Theme;
+import org.wikipedia.util.StringUtil;
import retrofit.RestAdapter;
@@ -293,8 +294,10 @@
}
}
+ @NonNull
public static String getRestbaseUriFormat() {
- return getString(R.string.preference_key_restbase_uri_format,
"%1$s://%2$s/api/rest_v1");
+ return
StringUtil.defaultIfBlank(getString(R.string.preference_key_restbase_uri_format,
null),
+ "%1$s://%2$s/api/rest_v1");
}
public static long getLastRunTime(@NonNull String task) {
diff --git a/app/src/main/java/org/wikipedia/util/StringUtil.java
b/app/src/main/java/org/wikipedia/util/StringUtil.java
index 9985916..4cd3fa5 100644
--- a/app/src/main/java/org/wikipedia/util/StringUtil.java
+++ b/app/src/main/java/org/wikipedia/util/StringUtil.java
@@ -16,6 +16,14 @@
public final class StringUtil {
private static final String CSV_DELIMITER = ",";
+ public static boolean isBlank(@Nullable String str) {
+ return str == null || !TextUtils.isGraphic(str);
+ }
+
+ public static String defaultIfBlank(@Nullable String value, @Nullable
String defaultValue) {
+ return isBlank(value) ? defaultValue : value;
+ }
+
@NonNull
public static String emptyIfNull(@Nullable String value) {
return defaultIfNull(value, "");
--
To view, visit https://gerrit.wikimedia.org/r/265094
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I06a87481cf7d1b4eac8e06f33927ee180e806881
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
