Merge pull request #10 from milanperera/master

Changed the port number from the welcome page
wso2 · Jan 19, 2017 · 9dce314 · 9dce314
2 parents e905815 + 7a50aca
commit 9dce314
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/client/client/src/main/java/org/wso2/emm/agent/AuthenticationActivity.java b/client/client/src/main/java/org/wso2/emm/agent/AuthenticationActivity.java
@@ -345,8 +345,7 @@ private void initializeIDPLib(String clientKey, String clientSecret) {
 			if (tenantDomain != null && !tenantDomain.toString().trim().isEmpty()) {
 				username =
 						etUsername.getText().toString().trim() +
-						context.getResources().getString(R.string.intent_extra_at) +
-						tenantDomain.toString().trim();
+						context.getResources().getString(R.string.intent_extra_at) + tenantDomain.toString().trim();
 
 			} else {
 				username = etUsername.getText().toString().trim();

diff --git a/client/client/src/main/res/values/strings.xml b/client/client/src/main/res/values/strings.xml
@@ -358,7 +358,7 @@
     <string name="title_activity_log">LogActivity</string>
 
     <!-- Headings -->
-    <string name="registration_heading">Set your server address here to continue, i.e : www.abc.com. If your server runs on a different port than the default ports (80 or 443), server address should be in following format. i.e : www.abc.com:9763</string>
+    <string name="registration_heading">Set your server address here to continue, i.e : www.abc.com. If your server runs on a different port than the default ports (80 or 443), server address should be in following format. i.e : www.abc.com:8280</string>
     <string name="enable_work_profile_heading">Your device supports Android For Work. Set-up the work-profile first and let the Agent Control the Work Profile.</string>
 
     <!-- Validation Errors -->