Yashasvi has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403457 )
Change subject: create EventLogging dev setting ...................................................................... create EventLogging dev setting Bug: T167314 Change-Id: I8159005584f2233783eea6d9fb7a303991d113c7 --- M app/src/main/java/org/wikipedia/analytics/EventLoggingService.java M app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java M app/src/main/java/org/wikipedia/settings/Prefs.java M app/src/main/res/values/preference_keys.xml M app/src/main/res/xml/developer_preferences.xml 5 files changed, 44 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/57/403457/1 diff --git a/app/src/main/java/org/wikipedia/analytics/EventLoggingService.java b/app/src/main/java/org/wikipedia/analytics/EventLoggingService.java index 735d974..230eee6 100644 --- a/app/src/main/java/org/wikipedia/analytics/EventLoggingService.java +++ b/app/src/main/java/org/wikipedia/analytics/EventLoggingService.java @@ -2,10 +2,12 @@ import android.net.Uri; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.wikipedia.concurrency.SaneAsyncTask; import org.wikipedia.crash.RemoteLogException; import org.wikipedia.dataclient.okhttp.OkHttpConnectionFactory; +import org.wikipedia.settings.Prefs; import org.wikipedia.util.ReleaseUtil; import org.wikipedia.util.log.L; @@ -19,8 +21,7 @@ private static final RequestBody EMPTY_REQ = RequestBody.create(null, new byte[0]); private static final String EVENTLOG_URL_PROD = "https://meta.wikimedia.org/beacon/event"; private static final String EVENTLOG_URL_DEV = "https://deployment.wikimedia.beta.wmflabs.org/beacon/event"; - private static final String EVENTLOG_URL = ReleaseUtil.isPreBetaRelease() - ? EVENTLOG_URL_DEV : EVENTLOG_URL_PROD; + private static String EVENTLOG_URL; // https://github.com/wikimedia/mediawiki-extensions-EventLogging/blob/8b3cb1b/modules/ext.eventLogging.core.js#L57 private static final int MAX_URL_LEN = 2000; @@ -78,5 +79,18 @@ } } - private EventLoggingService() { } + private EventLoggingService() { + setEventLogginURL(); + } + + private void setEventLogginURL() { + String eventLoggingURLFromPrefs = Prefs.getEventLoggingURL(); + if (!StringUtils.isBlank(eventLoggingURLFromPrefs)) { + EVENTLOG_URL = eventLoggingURLFromPrefs; + } else if (ReleaseUtil.isPreBetaRelease()) { + EVENTLOG_URL = EVENTLOG_URL_DEV; + } else { + EVENTLOG_URL = EVENTLOG_URL_PROD; + } + } } diff --git a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java index fefa66f..dc80d94 100644 --- a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java +++ b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java @@ -6,7 +6,9 @@ import android.support.v7.preference.PreferenceCategory; import android.support.v7.preference.PreferenceFragmentCompat; import android.support.v7.preference.TwoStatePreference; +import android.text.TextUtils; +import org.apache.commons.lang3.StringUtils; import org.wikipedia.R; import org.wikipedia.WikipediaApp; import org.wikipedia.crash.RemoteLogException; @@ -14,6 +16,7 @@ import org.wikipedia.readinglist.database.ReadingList; import org.wikipedia.readinglist.database.ReadingListDbHelper; import org.wikipedia.readinglist.database.ReadingListPage; +import org.wikipedia.util.StringUtil; import org.wikipedia.util.log.L; import java.util.ArrayList; @@ -100,6 +103,14 @@ return true; }); + findPreference(R.string.preference_key_event_logging_url) + .setOnPreferenceChangeListener((preference, newValue) -> { + if (!StringUtils.isBlank(newValue.toString())) { + Prefs.setEventLoggingURL(newValue.toString()); + } + return true; + }); + findPreference(R.string.preference_key_add_articles) .setOnPreferenceChangeListener((preference, newValue) -> { if (!newValue.toString().trim().equals("") && !newValue.toString().trim().equals("0")) { diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java b/app/src/main/java/org/wikipedia/settings/Prefs.java index 9fc5396..98861b5 100644 --- a/app/src/main/java/org/wikipedia/settings/Prefs.java +++ b/app/src/main/java/org/wikipedia/settings/Prefs.java @@ -623,5 +623,14 @@ setBoolean(R.string.preference_key_feed_customize_onboarding_card_enabled, enabled); } + @Nullable + public static String getEventLoggingURL() { + return getString(R.string.preference_key_event_logging_url, null); + } + + public static void setEventLoggingURL(@NonNull String eventLoggingURL) { + setString(R.string.preference_key_event_logging_url, eventLoggingURL); + } + private Prefs() { } } diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml index 9fe5b32..898fb11 100644 --- a/app/src/main/res/values/preference_keys.xml +++ b/app/src/main/res/values/preference_keys.xml @@ -12,6 +12,8 @@ <string name="preference_key_text_size_multiplier">textSizeMultiplier</string> <string name="preference_key_color_theme">colorTheme</string> <string name="preference_key_app_channel">channel</string> + <string name="preference_key_event_logging_url">eventLoggingURL</string> + <string name="preference_key_event_logging_url_title">Event Logging URL</string> <string name="preference_key_language_mru">languageMru</string> <string name="preference_key_select_text_tutorial_enabled">selectTextTutorialEnabled</string> <string name="preference_key_share_tutorial_enabled">shareTutorialEnabled</string> diff --git a/app/src/main/res/xml/developer_preferences.xml b/app/src/main/res/xml/developer_preferences.xml index 8248b78..c33cec2 100644 --- a/app/src/main/res/xml/developer_preferences.xml +++ b/app/src/main/res/xml/developer_preferences.xml @@ -76,6 +76,11 @@ android:key="@string/preference_key_app_channel" android:title="@string/preference_key_app_channel" /> + <org.wikipedia.settings.EditTextAutoSummarizePreference + style="@style/EditTextAutoSummarizePreference" + android:key="@string/preference_key_event_logging_url" + android:title="@string/preference_key_event_logging_url_title" /> + </PreferenceCategory> <PreferenceCategory android:title="@string/preferences_developer_misc_heading"> -- To view, visit https://gerrit.wikimedia.org/r/403457 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8159005584f2233783eea6d9fb7a303991d113c7 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Yashasvi <yash.gird...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits