AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #83 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/yy_temp

Browse Source 
T2P upload data newss
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-20 18:19:24 +05:30
committed by GitHub
parent f7d800efc6 32f6197a10
commit 4b744740d9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
+1 -1
View File
@@ -41,7 +41,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+7 -7
View File
@@ -268,17 +268,17 @@ public class LoginActivity extends AppCompatActivity {
// There was an error; don't attempt login and focus the first // There was an error; don't attempt login and focus the first
// form field with an error. // form field with an error.
focusView.requestFocus(); focusView.requestFocus();
} else if (!isuseridValid(userid)) {
Snackbar.make(museridView, getString(R.string.error_incorrect_username), Snackbar.LENGTH_SHORT).show(); } else if(!isuseridValid(userid)){
} else if (!isPasswordValid(password)) { Snackbar.make(museridView,getString(R.string.error_incorrect_username),Snackbar.LENGTH_SHORT).show();
Snackbar.make(museridView, getString(R.string.error_incorrect_password), Snackbar.LENGTH_SHORT).show(); }else if(!isPasswordValid(password)){
} else { Snackbar.make(museridView,getString(R.string.error_incorrect_password),Snackbar.LENGTH_SHORT).show();
}else{
// Show a progress spinner, and kick off a background task to // Show a progress spinner, and kick off a background task to
// perform the user login attempt. // perform the user login attempt.
new AuthenticateTask().execute(); new AuthenticateTask().execute();
} }
} }
@@ -302,7 +302,7 @@ public class LoginActivity extends AppCompatActivity {
String pw = preferences.getString(CommonString.KEY_PASSWORD, ""); String pw = preferences.getString(CommonString.KEY_PASSWORD, "");
if (!pw.equals("") && !password.equals(pw)) { if(!pw.equals("") &&!password.equals(pw)){
flag = false; flag = false;
} }