map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Added passing gdpr flags to the passport server

Browse source
This commit is contained in:
Alexander Zatsepin 2018-05-15 19:31:44 +03:00 • committed by Aleksey Belousov
parent a7a02ec9d8
commit 63dda0ee72
3 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/src/com/mapswithme/maps/auth/Authorizer.java
View file

@ -102,13 +102,15 @@ public class Authorizer implements AuthorizationListener
{
@Framework.AuthTokenType
int type = data.getIntExtra(Constants.EXTRA_TOKEN_TYPE, Framework.SOCIAL_TOKEN_INVALID);
boolean privacyAccepted = data.getBooleanExtra(Constants.EXTRA_PRIVACY_POLICY_ACCEPTED, false);
boolean termsOfUseAccepted = data.getBooleanExtra(Constants.EXTRA_TERMS_OF_USE_ACCEPTED, false);
boolean promoAccepted = data.getBooleanExtra(Constants.EXTRA_PROMO_ACCEPTED, false);
mIsAuthorizationInProgress = true;
if (mCallback != null)
mCallback.onAuthorizationStart();
//TODO: support privacy policy, terms of use and promo offers.
Framework.nativeAuthenticateUser(socialToken, type, false /* privacyAccepted */,
false /* termsAccepted */, false /* promoAccepted */, this);
Framework.nativeAuthenticateUser(socialToken, type, privacyAccepted, termsOfUseAccepted,
promoAccepted, this);
}
}

3
android/src/com/mapswithme/maps/auth/Constants.java
View file

@ -13,6 +13,9 @@ class Constants
static final String EXTRA_TOKEN_TYPE = "extra_token_type";
static final String EXTRA_AUTH_ERROR = "extra_auth_error";
static final String EXTRA_IS_CANCEL = "extra_is_cancel";
static final String EXTRA_PRIVACY_POLICY_ACCEPTED = "extra_privacy_policy_accepted";
static final String EXTRA_TERMS_OF_USE_ACCEPTED = "extra_terms_of_use_accepted";
static final String EXTRA_PROMO_ACCEPTED = "extra_promo_accepted";
static final List<String> FACEBOOK_PERMISSIONS =
Arrays.asList("email", "user_friends");
}

19
android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java
View file

@ -74,6 +74,9 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
@SuppressWarnings("NullableProblems")
@NonNull
private CheckBox mTermOfUseCheck;
@SuppressWarnings("NullableProblems")
@NonNull
private CheckBox mPromoCheck;
@NonNull
@Override
@ -113,6 +116,7 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
View phoneButton = view.findViewById(R.id.phone_button);
phoneButton.setOnClickListener(mPhoneClickListener);
mPromoCheck = view.findViewById(R.id.newsCheck);
mPrivacyPolicyCheck = view.findViewById(R.id.privacyPolicyCheck);
mPrivacyPolicyCheck.setOnCheckedChangeListener((buttonView, isChecked) -> {
setButtonAvailability(view, isChecked && mTermOfUseCheck.isChecked(),
@ -133,7 +137,7 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
private static void linkifyPolicyViews(@NonNull View root, @IdRes int... ids)
{
for(int id: ids)
for (int id : ids)
{
TextView policyView = root.findViewById(id);
policyView.setMovementMethod(LinkMovementMethod.getInstance());
@ -142,11 +146,11 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
private static void setButtonAvailability(@NonNull View root, boolean available, @IdRes int... ids)
{
for(int id: ids)
{
View button = root.findViewById(id);
button.setEnabled(available);
}
for (int id : ids)
{
View button = root.findViewById(id);
button.setEnabled(available);
}
}
@Override
@ -169,6 +173,9 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
data.putExtra(Constants.EXTRA_TOKEN_TYPE, type);
data.putExtra(Constants.EXTRA_AUTH_ERROR, error);
data.putExtra(Constants.EXTRA_IS_CANCEL, isCancel);
data.putExtra(Constants.EXTRA_PRIVACY_POLICY_ACCEPTED, mPrivacyPolicyCheck.isChecked());
data.putExtra(Constants.EXTRA_TERMS_OF_USE_ACCEPTED, mTermOfUseCheck.isChecked());
data.putExtra(Constants.EXTRA_PROMO_ACCEPTED, mPromoCheck.isChecked());
caller.onActivityResult(Constants.REQ_CODE_GET_SOCIAL_TOKEN, resultCode, data);
}