Skip to content

Commit

Permalink
Add California Privacy Laws Notice of Collection to Card Form (#425)
Browse files Browse the repository at this point in the history
* Add California Privacy Laws Notice of Collection to Card Form
  • Loading branch information
jaxdesmarais authored Aug 2, 2023
1 parent 97c1cdf commit d9499a9
Show file tree
Hide file tree
Showing 37 changed files with 89 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Braintree Android Drop-In Release Notes

## unreleased

* Add California Privacy Laws notice of collection to credit card form

## 6.10.0

* Bump braintree_android module dependency versions to `4.33.0`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import androidx.activity.OnBackPressedCallback;
import androidx.annotation.Nullable;
Expand Down Expand Up @@ -53,6 +54,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
supportedCardTypesView = view.findViewById(R.id.bt_supported_card_types);
animatedButtonView = view.findViewById(R.id.bt_animated_button_view);

TextView textView = view.findViewById(R.id.bt_privacy_policy);
String noticeOfCollection = getString(R.string.bt_notice_of_collection);
NoticeOfCollectionHelper.setNoticeOfCollectionText(textView, noticeOfCollection);

animatedButtonView.setClickListener(v -> onCardFormSubmit());

cardForm.getCardEditText().displayCardTypeIcon(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
import android.widget.TextView;

import androidx.activity.OnBackPressedCallback;
import androidx.annotation.VisibleForTesting;
Expand Down Expand Up @@ -75,6 +76,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,

animatedButtonView.setClickListener(v -> onCardFormSubmit());

TextView textView = view.findViewById(R.id.bt_privacy_policy);
String noticeOfCollection = getString(R.string.bt_notice_of_collection);
NoticeOfCollectionHelper.setNoticeOfCollectionText(textView, noticeOfCollection);

dropInViewModel = new ViewModelProvider(requireActivity()).get(DropInViewModel.class);

dropInViewModel.getCardTokenizationError().observe(getViewLifecycleOwner(), error -> {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.braintreepayments.api;

import android.graphics.Color;
import android.text.Html;
import android.text.method.LinkMovementMethod;
import android.widget.TextView;

public class NoticeOfCollectionHelper {

private NoticeOfCollectionHelper() {}

static void setNoticeOfCollectionText(TextView textView, String noticeOfCollectionText) {
String privacyPolicyUrlString = "https://www.paypal.com/us/legalhub/home";
String html = String.format("<a href=\"%s\">%s</a>", privacyPolicyUrlString, noticeOfCollectionText);

if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
textView.setText(Html.fromHtml(html, Html.FROM_HTML_MODE_COMPACT));
} else {
textView.setText(Html.fromHtml(html));
}

textView.setMovementMethod(LinkMovementMethod.getInstance());

Integer linkBlueColor = Color.parseColor("#2489F6");
textView.setLinkTextColor(linkBlueColor);
}
}
9 changes: 9 additions & 0 deletions Drop-In/src/main/res/layout/bt_fragment_add_card.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,15 @@
android:layout_marginTop="48dp"
app:bt_buttonText="@string/bt_next" />

<TextView
android:id="@+id/bt_privacy_policy"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="35dp"
android:linksClickable="true"
android:text="@string/bt_notice_of_collection" />

</LinearLayout>

</ScrollView>
Expand Down
8 changes: 8 additions & 0 deletions Drop-In/src/main/res/layout/bt_fragment_card_details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@
android:layout_marginTop="40dp"
app:bt_buttonText="@string/bt_add_card" />

<TextView
android:id="@+id/bt_privacy_policy"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="35dp"
android:linksClickable="true"
android:text="@string/bt_notice_of_collection" />
</LinearLayout>

</ScrollView>
Expand Down
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">وسائل الدفع المدعومة</string>
<string name="bt_edit_button_description">تحرير وسائل الدفع المحفوظة</string>
<string name="bt_card_already_exists">هذه البطاقة الائتمانية محفوظة وسيلة للدفع.</string>
<string name="bt_notice_of_collection">عندما أدفع ببطاقتي، فأنا أوافق على \"بيان الخصوصية لدى PayPal\".</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Podporované způsoby platby</string>
<string name="bt_edit_button_description">Upravit uložené způsoby platby</string>
<string name="bt_card_already_exists">Tato kreditní karta je již jako způsob platby uložena.</string>
<string name="bt_notice_of_collection">Zaplacením kartou vyjadřuji souhlas s prohlášením o ochraně osobních údajů společnosti PayPal.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Understøttede betalingsmetoder</string>
<string name="bt_edit_button_description">Rediger gemte betalingsmetoder</string>
<string name="bt_card_already_exists">Dette betalingskort er allerede gemt som betalingsmetode.</string>
<string name="bt_notice_of_collection">Når jeg betaler med mit kort, accepterer jeg PayPals erklæring om personlige oplysninger.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Unterstützte Zahlungsquellen</string>
<string name="bt_edit_button_description">Gespeicherte Zahlungsquellen bearbeiten</string>
<string name="bt_card_already_exists">Diese Kreditkarte ist bereits als gespeicherte Zahlungsquelle vorhanden.</string>
<string name="bt_notice_of_collection">Indem ich mit meiner Karte bezahle, stimme ich der PayPal-Datenschutzerklärung zu.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Υποστηριζόμενες μέθοδοι πληρωμής</string>
<string name="bt_edit_button_description">Επεξεργασία αποθηκευμένων μεθόδων πληρωμής</string>
<string name="bt_card_already_exists">Αυτή η πιστωτική κάρτα υπάρχει ήδη ως αποθηκευμένη μέθοδος πληρωμής.</string>
<string name="bt_notice_of_collection">Πληρώνοντας με την κάρτα μου, αποδέχομαι τη Δήλωση απορρήτου της PayPal.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-es-rXC/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Formas de pago admitidas</string>
<string name="bt_edit_button_description">Editar formas de pago guardadas</string>
<string name="bt_card_already_exists">Esta tarjeta de crédito ya existe como forma de pago guardada.</string>
<string name="bt_notice_of_collection">Al pagar con mi tarjeta, acepto el Aviso de Privacidad de PayPal.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Formas de pago admitidas</string>
<string name="bt_edit_button_description">Editar formas de pago guardadas</string>
<string name="bt_card_already_exists">Esta tarjeta de crédito ya existe como forma de pago guardada.</string>
<string name="bt_notice_of_collection">Al pagar con mi tarjeta, acepto la Declaración de privacidad de PayPal.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Tuetut maksutavat</string>
<string name="bt_edit_button_description">Muokkaa tallennettuja maksutapoja</string>
<string name="bt_card_already_exists">Tämä luottokortti on jo tallennettu maksutavaksi.</string>
<string name="bt_notice_of_collection">Maksamalla kortillani hyväksyn PayPal tietosuojaselosteen.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-fr-rCA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Modes de paiement pris en charge</string>
<string name="bt_edit_button_description">Modifier les modes de paiement enregistrés</string>
<string name="bt_card_already_exists">Cette carte de crédit est déjà liée en tant que mode de paiement.</string>
<string name="bt_notice_of_collection">En payant avec ma carte, j’accepte la Politique de confidentialité de PayPal.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-fr-rXC/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Modes de paiement pris en charge</string>
<string name="bt_edit_button_description">Modifier les modes de paiement enregistrés</string>
<string name="bt_card_already_exists">Cette carte bancaire existe déjà en tant que mode de paiement enregistré.</string>
<string name="bt_notice_of_collection">En payant avec ma carte, j\'accepte la Politique de confidentialité de PayPal.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Modes de paiement pris en charge</string>
<string name="bt_edit_button_description">Modifier les modes de paiement enregistrés</string>
<string name="bt_card_already_exists">Cette carte bancaire existe déjà en tant que mode de paiement enregistré.</string>
<string name="bt_notice_of_collection">En payant avec ma carte, j\'accepte la Politique de confidentialité de PayPal.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-he/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">שיטות תשלום נתמכות</string>
<string name="bt_edit_button_description">עריכת שיטות תשלום שמורות</string>
<string name="bt_card_already_exists">כרטיס אשראי זה כבר שמור כשיטת תשלום.</string>
<string name="bt_notice_of_collection">בכך שאני משלם/ת באמצעות כרטיס האשראי שלי, אני מסכים/ה להצהרת הפרטיות של PayPal.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Támogatott fizetési módok</string>
<string name="bt_edit_button_description">Mentett fizetési módok szerkesztése</string>
<string name="bt_card_already_exists">Ez a hitelkártya már meg van adva mentett fizetési módként.</string>
<string name="bt_notice_of_collection">A kártyámmal történő fizetés révén elfogadom a PayPal Adatvédelmi nyilatkozatát.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-id/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Metode pembayaran yang didukung</string>
<string name="bt_edit_button_description">Edit metode pembayaran tersimpan</string>
<string name="bt_card_already_exists">Kartu kredit ini telah ada sebelumnya sebagai metode pembayaran tersimpan.</string>
<string name="bt_notice_of_collection">Dengan membayar menggunakan kartu, saya menyetujui Pernyataan Privasi PayPal.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Metodi di pagamento supportati</string>
<string name="bt_edit_button_description">Modifica metodi di pagamento salvati</string>
<string name="bt_card_already_exists">Questa carta di credito esiste già come metodo di pagamento salvato.</string>
<string name="bt_notice_of_collection">Pagando con la carta, accetto la Dichiarazione sulla privacy di PayPal.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-iw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">שיטות תשלום נתמכות</string>
<string name="bt_edit_button_description">עריכת שיטות תשלום שמורות</string>
<string name="bt_card_already_exists">כרטיס אשראי זה כבר שמור כשיטת תשלום.</string>
<string name="bt_notice_of_collection">בכך שאני משלם/ת באמצעות כרטיס האשראי שלי, אני מסכים/ה להצהרת הפרטיות של PayPal.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">サポートされている支払方法</string>
<string name="bt_edit_button_description">保存済みの支払方法を編集する</string>
<string name="bt_card_already_exists">このクレジットカードは、保存済みの支払方法としてすでに登録されています。</string>
<string name="bt_notice_of_collection">カードで支払うことにより、PayPalプライバシーステートメントに同意したものとみなされます。</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-ko/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">지원되는 결제수단</string>
<string name="bt_edit_button_description">저장된 결제수단 편집</string>
<string name="bt_card_already_exists">이 신용카드는 이미 저장된 결제수단으로 설정되어 있습니다.</string>
<string name="bt_notice_of_collection">자신의 카드로 결제함으로써 사용자는 PayPal 개인정보 취급방침에 동의합니다.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-nb/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Støttede betalingsmetoder</string>
<string name="bt_edit_button_description">Rediger lagrede betalingsmetoder</string>
<string name="bt_card_already_exists">Dette betalingskortet finnes allerede som en lagret betalingsmetode.</string>
<string name="bt_notice_of_collection">Ved å betale med kortet godtar jeg PayPals personvernerklæring.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Ondersteunde betaalmethoden</string>
<string name="bt_edit_button_description">Opgeslagen betaalmethoden bewerken</string>
<string name="bt_card_already_exists">Deze creditcard bestaat al als opgeslagen betaalmethode.</string>
<string name="bt_notice_of_collection">Door met mijn kaart te betalen, ga ik akkoord met de PayPal Privacyverklaring.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Obsługiwane źródła finansowania płatności</string>
<string name="bt_edit_button_description">Edytuj zapisane źródła finansowania płatności</string>
<string name="bt_card_already_exists">Ta karta kredytowa istnieje jako zapisana forma płatności.</string>
<string name="bt_notice_of_collection">Dokonując płatności kartą, akceptuję Informacje dotyczące zasad ochrony danych firmy PayPal.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Meios de pagamento suportados</string>
<string name="bt_edit_button_description">Editar meios de pagamento guardados</string>
<string name="bt_card_already_exists">Este cartão de crédito já existe como meio de pagamento guardado.</string>
<string name="bt_notice_of_collection">Ao pagar com o meu cartão, aceito a Declaração de Privacidade da PayPal.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Поддерживаемые способы оплаты</string>
<string name="bt_edit_button_description">Изменить сохраненные способы оплаты</string>
<string name="bt_card_already_exists">Данная кредитная карта уже существует как сохраненный способ оплаты.</string>
<string name="bt_notice_of_collection">Выполняя оплату с помощью карты, я соглашаюсь с условиями Положения о конфиденциальности PayPal.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-sk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Podporované spôsoby platby</string>
<string name="bt_edit_button_description">Upraviť uložené spôsoby platby</string>
<string name="bt_card_already_exists">Táto kreditná karta už existuje ako uložený spôsob platby.</string>
<string name="bt_notice_of_collection">Zaplatením kartou vyjadrujem súhlas s Vyhlásením spoločnosti PayPal o ochrane osobných údajov.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-sv/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Betalningsmetoder som stöds</string>
<string name="bt_edit_button_description">Ändra sparade betalningsmetoder</string>
<string name="bt_card_already_exists">Det här kreditkortet finns redan som en sparad betalningsmetod.</string>
<string name="bt_notice_of_collection">Genom att betala med mitt kort godkänner jag PayPals sekretessmeddelande.</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-th/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">วิธีการชําระเงินที่รองรับ</string>
<string name="bt_edit_button_description">แก้ไขวิธีการชําระเงินที่บันทึกไว้</string>
<string name="bt_card_already_exists">บัตรเครดิตนี้เป็นวิธีการชำระเงินที่บันทึกไว้แล้ว</string>
<string name="bt_notice_of_collection">การชําระเงินด้วยบัตรนี้ถือว่าข้าพเจ้ายอมรับนโยบายความเป็นส่วนตัวของ PayPal</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">受支持的付款方式</string>
<string name="bt_edit_button_description">编辑已保存的付款方式</string>
<string name="bt_card_already_exists">此信用卡已存在于已保存的付款方式。</string>
<string name="bt_notice_of_collection">使用我的卡付款即表示我同意PayPal隐私声明。</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-zh-rHK/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">支援的付款方式</string>
<string name="bt_edit_button_description">編輯已儲存的付款方式</string>
<string name="bt_card_already_exists">此信用卡為已儲存的付款方式。</string>
<string name="bt_notice_of_collection">一經使用信用卡付款,即表示我同意 PayPal 的《私隱權聲明》。</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">支援的付款方式</string>
<string name="bt_edit_button_description">編輯儲存的付款方式</string>
<string name="bt_card_already_exists">此信用卡已經是儲存的付款方式。</string>
<string name="bt_notice_of_collection">使用我的卡片付款,即表示我同意「PayPal 隱私權聲明」。</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values-zh-rXC/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">受支持的付款方式</string>
<string name="bt_edit_button_description">编辑已保存的付款方式</string>
<string name="bt_card_already_exists">此信用卡已存在于已保存的付款方式中。</string>
<string name="bt_notice_of_collection">使用我的卡付款即表示我同意PayPal隐私声明。</string>
</resources>
1 change: 1 addition & 0 deletions Drop-In/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@
<string name="bt_supported_payments">Supported payment methods</string>
<string name="bt_edit_button_description">Edit saved payment methods</string>
<string name="bt_card_already_exists">This credit card already exists as a saved payment method.</string>
<string name="bt_notice_of_collection">By paying with my card, I agree to the PayPal Privacy Statement.</string>
</resources>

0 comments on commit d9499a9

Please sign in to comment.