-
Notifications
You must be signed in to change notification settings - Fork 4
feat: Disable sign up for xandylearning subdomain- #547 #548
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.
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
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,11 +46,13 @@ | |
|
|
||
| import java.io.IOException; | ||
| import java.security.PublicKey; | ||
| import java.util.Arrays; | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
| import java.util.List; | ||
| import java.util.concurrent.Executor; | ||
| import java.util.concurrent.Executors; | ||
|
|
||
| import javax.inject.Inject; | ||
| import in.testpress.testpress.core.Constants; | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
| import in.testpress.core.TestpressCallback; | ||
| import in.testpress.core.TestpressException; | ||
| import in.testpress.core.TestpressSDKDatabase; | ||
|
|
@@ -68,6 +70,7 @@ | |
| import in.testpress.testpress.models.DaoSession; | ||
| import in.testpress.testpress.models.InstituteSettings; | ||
| import in.testpress.testpress.models.InstituteSettingsDao; | ||
| import in.testpress.testpress.util.AppChecker; | ||
| import in.testpress.testpress.models.PostDao; | ||
| import in.testpress.testpress.ui.DeviceNotAllowedActivity; | ||
| import in.testpress.testpress.ui.MainActivity; | ||
|
|
@@ -450,7 +453,11 @@ private void updateInstituteSpecificFields() { | |
| ViewUtils.setGone(googleLoginButton, !instituteSettings.getGoogleLoginEnabled()); | ||
| ViewUtils.setGone(socialLoginLayout, !instituteSettings.getFacebookLoginEnabled() && | ||
| !instituteSettings.getGoogleLoginEnabled()); | ||
| ViewUtils.setGone(signUpButton, !instituteSettings.getAllowSignup()); | ||
| boolean allowSignup = instituteSettings.getAllowSignup() != null && instituteSettings.getAllowSignup(); | ||
| if (AppChecker.INSTANCE.isSignupDisabledForSubdomain(this)) { | ||
| allowSignup = false; | ||
| } | ||
| ViewUtils.setGone(signUpButton, !allowSignup); | ||
| } | ||
|
|
||
|
|
||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This changes the shared default
config.json(currently whatmasterbuilds as "sandbox") to point atxandylearningand bumpsversion_codefrom9to123. A couple of concerns:testpress_site_subdomainis now"xandylearning"butpackage_name(in.testpress.sandbox) andapp_name("Testpress Sandbox") are unchanged — is that intentional, or should this branch's config only be used for a client-specific build rather than merged intomaster's default config?version_codejump from9to123looks unrelated to the "disable signup" feature — please confirm this is intentional and not a leftover from local testing.If this repo builds a single app per branch/tag from
config.json, merging this tomasterwould change what everyone building frommastergets by default. Worth double-checking before merge.