Skip to content

Feature/4263 replace optimizely with mixpanel #4264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxme merged 14 commits into from
Aug 5, 2016
Merged

Feature/4263 replace optimizely with mixpanel #4264

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ccdd7cc
Removing Optimizely from gradle file
kwonye Jun 23, 2016
6c4eb04
Removing all uses of Optimizely
kwonye Jun 23, 2016
1a7e7a8
Adding Magic Links A/B test boolean variable
kwonye Jun 23, 2016
9d5f8a7
Merge branch 'develop' into feature/4263-replace-optimizely-with-mixp…
kwonye Jun 23, 2016
6dc6d91
Removing magic link mixpanel boolean tweak (always showing regular si…
kwonye Jun 24, 2016
9942661
Removing imports for Mixpanel A/B testing
kwonye Jun 24, 2016
5ff0a04
Merge branch 'develop' into feature/4263-replace-optimizely-with-mixp…
kwonye Aug 1, 2016
d5736aa
Adding logic to show magic links
kwonye Aug 1, 2016
aaa00ed
Merge branch 'develop' into feature/4263-replace-optimizely-with-mixp…
kwonye Aug 4, 2016
7be64de
Removing magic links login A/B test as we won't use it.
kwonye Aug 4, 2016
60d0fc4
Making sure always return false for now
kwonye Aug 4, 2016
f893956
Removing extra semi-colon
kwonye Aug 5, 2016
030390a
Removing unused imports
kwonye Aug 5, 2016
4a88ee7
Removing optimizely token key
kwonye Aug 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ public static void newBlogForResult(Activity activity) {
}

public static void showSignInForResult(Activity activity) {
if (WPActivityUtils.isEmailClientAvailable(activity)) {
if (shouldShowMagicLinksLogin(activity);) {
Copy link
Copy Markdown
Contributor

@maxme maxme Aug 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The extra ; here breaks the build.

Copy link
Copy Markdown
Contributor Author

@kwonye kwonye Aug 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... no excuses here, sorry about that.

Intent intent = new Intent(activity, MagicLinkSignInActivity.class);
activity.startActivityForResult(intent, RequestCodes.ADD_ACCOUNT);
} else {
Expand Down Expand Up @@ -298,4 +298,10 @@ public static void addSelfHostedSiteForResult(Activity activity) {
intent.putExtra(SignInActivity.EXTRA_START_FRAGMENT, SignInActivity.ADD_SELF_HOSTED_BLOG);
activity.startActivityForResult(intent, RequestCodes.ADD_ACCOUNT);
}

public static boolean shouldShowMagicLinksLogin(Activity activity) {
boolean isMagicLinksEnabled = false;

return isMagicLinksEnabled && WPActivityUtils.isEmailClientAvailable(activity);
}
}
⚡