diff options
| author | Maxime Biais <maxime.biais@gmail.com> | 2016-05-23 15:47:30 +0200 |
|---|---|---|
| committer | Maxime Biais <maxime.biais@gmail.com> | 2016-05-23 15:47:30 +0200 |
| commit | 79aa2252330bf6b47c5fba197a8eb7ff38728937 (patch) | |
| tree | 453267f1f40f7cacadbd1f2ceb72e5844e1fca6d | |
| parent | b55ca1c1395ca8c413382ddaca53887d1da9c75c (diff) | |
| download | gradle-perf-android-medium-79aa2252330bf6b47c5fba197a8eb7ff38728937.tar.gz | |
Move debug properties to wp.debug.
| -rw-r--r-- | WordPress/gradle.properties-example | 6 | ||||
| -rw-r--r-- | WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java | 6 | ||||
| -rwxr-xr-x | tools/release-checks.sh | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/WordPress/gradle.properties-example b/WordPress/gradle.properties-example index e55f54728..2809bda06 100644 --- a/WordPress/gradle.properties-example +++ b/WordPress/gradle.properties-example @@ -11,5 +11,7 @@ wp.helpshift.api.key = wordpress wp.helpshift.api.domain = wordpress.org wp.helpshift.api.id = wordpress wp.app_license_key = wordpress -wp.dotcom_login_username = -wp.dotcom_login_password =
\ No newline at end of file + +# Optional: used to autofill username and password fields at login on debug build only +wp.debug.dotcom_login_username = +wp.debug.dotcom_login_password = diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java index 2c4b452d2..e88606879 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java @@ -340,8 +340,10 @@ public class SignInFragment extends AbstractFragment implements TextWatcher, Con private void autofillFromBuildConfig() { if (!BuildConfig.DEBUG) return; - String userName = (String) WordPress.getBuildConfigValue(getActivity().getApplication(), "DOTCOM_LOGIN_USERNAME"); - String password = (String) WordPress.getBuildConfigValue(getActivity().getApplication(), "DOTCOM_LOGIN_PASSWORD"); + String userName = (String) WordPress.getBuildConfigValue(getActivity().getApplication(), + "DEBUG_DOTCOM_LOGIN_USERNAME"); + String password = (String) WordPress.getBuildConfigValue(getActivity().getApplication(), + "DEBUG_DOTCOM_LOGIN_PASSWORD"); if (!TextUtils.isEmpty(userName)) { mUsernameEditText.setText(userName); AppLog.d(T.NUX, "Autofilled username from build config"); diff --git a/tools/release-checks.sh b/tools/release-checks.sh index de7fc2193..b25014e9c 100755 --- a/tools/release-checks.sh +++ b/tools/release-checks.sh @@ -91,7 +91,7 @@ function printVersion() { function checkGradleProperties() { /bin/echo -n "Check WordPress/gradle.properties..." - checksum=`cat WordPress/gradle.properties|grep "^wp."|tr "[A-Z]" "[a-z]"|sed "s/ //g"|sort|sha1sum |cut -d- -f1| sed "s/ //g"` + checksum=`cat WordPress/gradle.properties | grep -v "^wp.debug." | grep "^wp."|tr "[A-Z]" "[a-z]" | sed "s/ //g" | sort | sha1sum | cut -d- -f1 | sed "s/ //g"` known_checksum="4058cdf3d784e4b79f63514d4780e92c28b5ab78" if [ x$checksum != x$known_checksum ]; then pFail |