From d39160a8ea2c9bdb9e91a437df02e7e3ebc0935e Mon Sep 17 00:00:00 2001
From: Matthew Finkel <sysrqb@torproject.org>
Date: Thu, 18 Feb 2021 00:06:13 +0000
Subject: [PATCH] fixup! Bug 40138: Add feedback survey card
Bug 40148: Create survey banner on about:tor for Snowflake
---
.../mozilla/fenix/settings/SupportUtils.kt | 2 +-
.../main/res/drawable/tor_survey_icon_3x.png | Bin 1603 -> 1545 bytes
.../main/res/layout/tor_feedback_survey.xml | 4 ++--
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
index c3419dc107..bb5e79ae45 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
@@ -37,7 +37,7 @@ object SupportUtils {
const val DONATE_URL = "https://donate.torproject.org/"
const val TB_MANUAL_URL = "https://tb-manual.torproject.org/mobile-tor"
const val TOR_RELEASES = "https://www.torproject.org/releases/"
- const val TOR_FEEDBACK_SURVEY_URL = "http://bogdyardcfurxcle.onion/index.php/217469"
+ const val TOR_FEEDBACK_SURVEY_URL = "http://bogdyardcfurxcle.onion/index.php/491436"
enum class SumoTopic(internal val topicStr: String) {
FENIX_MOVING("sync-delist"),
diff --git a/app/src/main/res/drawable/tor_survey_icon_3x.png b/app/src/main/res/drawable/tor_survey_icon_3x.png
index 3b6ccd41870da5239a5e5b6d96934b272e6ae3f5..123ac776adccb36763cc342eedcd24631bb61bf7 100644
GIT binary patch
delta 1512
zcmV<E1sD3m42cYoB!AveOjJbx002PGuSm<YNz1lL%eG0&xJk>lNy@iL%eYC)w@J&l
zNXoTJ%(qC#w@J*hNzAuO%D79+w@J&mO3J!L%C##lQX~pHEjn6A%(q0dr!PigC?ZQK
zB1%cfwnC?%C?ZNSQfVd@LqD3BICg<MgNZ(mkR}#FJA;Tqr)-}{%C|OZc{_rLK%1CI
z%eOacc}dK+Nz1lJzpp{2pgxX}M6#znj*v87aXW&EICg+Y%(qa_uSv?bNy@cI$+t<%
zxGOGGGE!<XQ))=cwmEl!HD7T?%(g8$TQO2<NzArAkCD@^?AZVS07;V}0TX}UZ(olv
zF#rGmU;qFA|8W2R|NsC0|NsC0|6u?B|3LpxumAu5|NsC0|DO<$kg(7H|No%>|4{$`
zkb7O9{{R34kx4{BRCocb&&2@)K?ns<7{}K8uQj>H2(zz%FW`eIm)iQEr_s5VoDlAU
zqMhDoDhAUqGkw969f|3uy2O9ScXC+;BDO&e;fmDBAzWdV{-y?Q`=9{#2|Ot1Kya{5
zVXMJU=b#De1wZVMV$E{BaU_VM3af_6t(BSC!^{lt|3WKoZD(@QAot+?5%WFig8oV%
zQ8kPyB&vUEieEe`n?)(AmN9MjU8s}nFGc0rJr5{*Tnq>a@hO}AvT}blgDwGEf76g*
zbCeLJn}MK@jU_0+`kP5v{qYcP?OvbiIGHNp6rlby8CHM$;wbl4>mK|8khvx3OY0v3
z$W>p*-H<TA67;3@2Y|Za`Y$8~u!QYP>rX&D(M|$}%aQ;kw5Jut`U5auuHtF9gpXHl
zUCP*4sXqW){2CTV(ExufS(hNFKLEPCr9c}17$6&Q0+gWs0O;4Jr9fAs8D?FQQ27&}
z{`1(D;j{qjl7!nrK)_$}z2E{^mjkD20Vv>)B?J}#!uC%LprXH%g*yU)VB&y~KMU!u
zoYB4eL#xrQfCs}<J;day{+C5%_jxJ`cw`(smNVLOQ~boZ>bidb1`#TqG-HBZ8&`ua
z0a5?96Qj!ljr;xOf9k7j$GHHl|Nc2K-+SjH^t2cSI?e(3`>X61UHPty+(+dB_bd_!
z2>AEdn9nM}F;g5Q5D@gQ#9n)jCTPS777+En%_Qtg0>J{}{%q!sq!1KP=Z{W!AqfNp
zB>2lqZbY?&Eg*lzUtY0~YYEk#L5jb;&Q2tSpsMpno#v82NcNXJ!+}7{N_|?C0`LJo
zv9I3983AB^k^UZ_@uMN)y9EHbc=Xm(YTOGYdC>Ldf96f{Ns50u;c9lA;y=|!OCVgx
z?)v=;um4=P3J}l=O2Ag}!t4J|y#Bh`r4U|bofLlsq!52P*(Swb0V#w{_B_R30V#w%
zj@A$2{uU4?46s{g*?UeEVSfN(1dJ^lyzadX)u#XuCd_-&4;;Lh1d9FySi;jMs$r!^
z)q_Bno#A&mH5B}J7=B02@QY5kXMFxC<9k~eA&pTKFp&^Imd4RXCqj(Tq;U5CbuFN|
zJk^*Rk!pVv$!|RXwM2cYJ&dgfga|yD&<WP(=X$_n_5)IE^*j&N{}%#QC`1LU*l}Ed
z)j_~t2w34{hy@4<TtFZTrTU8k;I9M#d;~1OEu^LT6QKS|AV3Mrzyegf<gr$N1$57B
z<s?{u62>CfN2$xq^LRNI3n=|31p$z9xvsgAun>Pr2+*vTJgsQ~p%SIOMgW{DEFl8;
znz?#@5(aRpumk|=Pc1VI06gGSaY`T{mH^ew0N{b)RPmkgr26ws9NnaEEYa(&VZ)s&
zl+eESR%Zli;TU7fpvuWTDb#=0ODqSl3=se+nxz1McN6>(rO@@FhEVnKp>CpDQ<dNR
zJC|@8spnti2lbWx71rX17LhL!E?B>pWF0X)zj_f@H%a!Xh@8d$s}WZZe)u+&J4f~Q
z7dF|?=<?!1)cyZ|{wEplkA3DRmlnV94xP=x%cBeS_MhXUmj|02&Hn|=4Y+>3*4Kyt
O0000<MNUMnLSTaQ*61ey
delta 1586
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
diff --git a/app/src/main/res/layout/tor_feedback_survey.xml b/app/src/main/res/layout/tor_feedback_survey.xml
index 6c4be23734..8366e006e9 100644
--- a/app/src/main/res/layout/tor_feedback_survey.xml
+++ b/app/src/main/res/layout/tor_feedback_survey.xml
@@ -43,7 +43,7 @@
android:textAlignment="viewStart"
android:textColor="?primaryText"
android:textSize="20sp"
- android:text="We’d love your feedback" />
+ android:text="Do you use Snowflake?" />
</LinearLayout>
<TextView
@@ -61,7 +61,7 @@
android:textAlignment="viewStart"
android:textColor="?primaryText"
android:textSize="16sp"
- android:text="We put our users at the center of our development process. You can help us improve Tor Browser by completing this short survey about your experience:" />
+ android:text="Snowflake is a pluggable transport available in Tor Browser. Help us improve it by completing this short survey about your browsing experience:" />
<Button
style="@style/PositiveButton"
--
GitLab