jenkins-bot has submitted this change and it was merged.
Change subject: Add provenance parameter when sharing text.
......................................................................
Add provenance parameter when sharing text.
A bit late to the party, but still a nice thing to have.
Bug: T112146
Change-Id: I7a544551774e10d264d9250d1e045724b8612a99
---
M app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
M app/src/main/java/org/wikipedia/util/ShareUtil.java
M app/src/main/java/org/wikipedia/util/UriUtil.java
M app/src/main/res/values/strings_no_translate.xml
4 files changed, 27 insertions(+), 12 deletions(-)
Approvals:
Sniedzielski: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
b/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
index d142c31..3f9fd6e 100755
--- a/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
+++ b/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
@@ -38,6 +38,7 @@
import org.json.JSONException;
import org.json.JSONObject;
+import org.wikipedia.util.UriUtil;
import org.wikipedia.util.log.L;
import org.wikipedia.wiktionary.WiktionaryDialog;
@@ -147,9 +148,6 @@
final String selectedText = sanitizeText(input.toString());
final PageTitle title = curPageFragment.getTitle();
- final String introText =
activity.getString(R.string.snippet_share_intro,
- title.getDisplayText(),
- title.getCanonicalUri() + "?wprov=sfia1"); // See
https://wikitech.wikimedia.org/wiki/Provenance;
(new
ImageLicenseFetchTask(WikipediaApp.getInstance().getAPIForSite(title.getSite()),
title.getSite(),
@@ -171,8 +169,7 @@
if (shareDialog != null) {
shareDialog.dismiss();
}
- shareDialog = new PreviewDialog(activity, snippetBitmap,
title.getDisplayText(), introText,
- selectedText, funnel);
+ shareDialog = new PreviewDialog(activity, snippetBitmap,
title, selectedText, funnel);
shareDialog.show();
}
@@ -321,9 +318,8 @@
class PreviewDialog extends BottomDialog {
private boolean completed = false;
- PreviewDialog(final PageActivity activity, final Bitmap resultBitmap,
- final String title, final String introText, final String
selectedText,
- final ShareAFactFunnel funnel) {
+ PreviewDialog(final PageActivity activity, final Bitmap resultBitmap,
final PageTitle title,
+ final String selectedText, final ShareAFactFunnel funnel) {
super(activity, R.layout.dialog_share_preview);
ImageView previewImage = (ImageView)
getDialogLayout().findViewById(R.id.preview_img);
previewImage.setImageBitmap(resultBitmap);
@@ -331,7 +327,11 @@
.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- ShareUtil.shareImage(activity, resultBitmap, title,
title, introText, false);
+ String introText =
activity.getString(R.string.snippet_share_intro,
+ title.getDisplayText(),
+ UriUtil.getUrlWithProvenance(activity, title,
R.string.prov_share_image));
+ ShareUtil.shareImage(activity, resultBitmap,
title.getDisplayText(),
+ title.getDisplayText(), introText, false);
funnel.logShareIntent(selectedText, ShareMode.image);
completed = true;
}
@@ -340,7 +340,11 @@
.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- ShareUtil.shareText(activity, title,
constructShareText(selectedText, introText));
+ String introText =
activity.getString(R.string.snippet_share_intro,
+ title.getDisplayText(),
+ UriUtil.getUrlWithProvenance(activity, title,
R.string.prov_share_text));
+ ShareUtil.shareText(activity, title.getDisplayText(),
+ constructShareText(selectedText, introText));
funnel.logShareIntent(selectedText, ShareMode.text);
completed = true;
}
@@ -350,7 +354,7 @@
public void onDismiss(DialogInterface dialog) {
resultBitmap.recycle();
if (!completed) {
- funnel.logAbandoned(title);
+ funnel.logAbandoned(title.getDisplayText());
}
}
});
diff --git a/app/src/main/java/org/wikipedia/util/ShareUtil.java
b/app/src/main/java/org/wikipedia/util/ShareUtil.java
index d822ec0..73870a3 100644
--- a/app/src/main/java/org/wikipedia/util/ShareUtil.java
+++ b/app/src/main/java/org/wikipedia/util/ShareUtil.java
@@ -50,7 +50,7 @@
}
public static void shareText(final Context context, final PageTitle title)
{
- shareText(context, title.getDisplayText(), title.getCanonicalUri());
+ shareText(context, title.getDisplayText(),
UriUtil.getUrlWithProvenance(context, title, R.string.prov_share_link));
}
/**
diff --git a/app/src/main/java/org/wikipedia/util/UriUtil.java
b/app/src/main/java/org/wikipedia/util/UriUtil.java
index 81a7e95..6316827 100644
--- a/app/src/main/java/org/wikipedia/util/UriUtil.java
+++ b/app/src/main/java/org/wikipedia/util/UriUtil.java
@@ -8,12 +8,14 @@
import android.location.Location;
import android.net.Uri;
import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
import android.support.v7.app.AlertDialog;
import android.text.TextUtils;
import android.util.Log;
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.settings.Prefs;
import java.io.UnsupportedEncodingException;
@@ -112,6 +114,10 @@
}
}
+ public static String getUrlWithProvenance(Context context, PageTitle
title, @StringRes int provId) {
+ return title.getCanonicalUri() + "?wprov=" + context.getString(provId);
+ }
+
private UriUtil() {
}
diff --git a/app/src/main/res/values/strings_no_translate.xml
b/app/src/main/res/values/strings_no_translate.xml
index 93bc2d8..cbcba40 100644
--- a/app/src/main/res/values/strings_no_translate.xml
+++ b/app/src/main/res/values/strings_no_translate.xml
@@ -9,6 +9,11 @@
<string
name="zero_webpage_url">https://m.wikimediafoundation.org/wiki/Wikipedia_Zero_App_FAQ</string>
<string
name="donate_url">https://donate.wikimedia.org/?utm_medium=WikipediaApp&utm_campaign=Android&utm_source=%1$s&uselang=%2$s</string>
+ <!-- Provenance parameters for sharing URLs
(https://wikitech.wikimedia.org/wiki/Provenance) -->
+ <string name="prov_share_image">sfia1</string>
+ <string name="prov_share_text">sfta1</string>
+ <string name="prov_share_link">sfla1</string>
+
<!-- Search -->
<string name="intent_share_search_label">@string/search_hint</string>
--
To view, visit https://gerrit.wikimedia.org/r/266248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a544551774e10d264d9250d1e045724b8612a99
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: Sniedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
