Browse Source

Minor fixes in login

master
Preyea Regmi 4 years ago
parent
commit
e27f54656b
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 27
      app/src/main/AndroidManifest.xml
  3. 20
      app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java
  4. 6
      app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2PresenterInterface.java
  5. 21
      app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java

BIN
.idea/caches/build_file_checksums.ser

27
app/src/main/AndroidManifest.xml

@ -329,16 +329,16 @@
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustResize" >
<!-- <intent-filter>-->
<!-- <action android:name="HOME" />-->
<intent-filter>
<action android:name="HOME" />
<!-- <category android:name="android.intent.category.DEFAULT" />-->
<!-- </intent-filter>-->
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<!-- <category android:name="android.intent.category.LAUNCHER" />-->
<!-- </intent-filter>-->
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".registerV2.view.RegisterV2Activity"
@ -376,17 +376,6 @@
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="HOME" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="com.theartofdev.edmodo.cropper.CropImageActivity"

20
app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java

@ -139,6 +139,7 @@ public class LoginV2Presenter extends BaseViewModel implements LoginV2PresenterI
.setListener(new GMEAuthManager.GMEAuthListener() {
@Override
public void onGMEAuthSuccess(GMEAuthSuccessResult result) {
}
@Override
@ -180,11 +181,11 @@ public class LoginV2Presenter extends BaseViewModel implements LoginV2PresenterI
private boolean validateUserId(CharSequence userID) {
if (userID == null || userID.length() < 1) {
loginViewLiveData.setUserIdInputLiveData(new FormInputStateDTO(false, getStringfromStringId(R.string.user_id_empty_error)));
loginViewLiveData.setUserIdInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.user_id_empty_error)));
this.userId = null;
return false;
} else {
loginViewLiveData.setUserIdInputLiveData(new FormInputStateDTO(true, ""));
loginViewLiveData.setUserIdInputLiveData(new FormInputStateDTO<>(true, ""));
this.userId = userID.toString();
return true;
}
@ -193,11 +194,11 @@ public class LoginV2Presenter extends BaseViewModel implements LoginV2PresenterI
private boolean validatePassword(CharSequence password) {
if (password == null || password.length() < 1) {
loginViewLiveData.setPasswordInputLiveData(new FormInputStateDTO(false, getStringfromStringId(R.string.password_empty_error)));
loginViewLiveData.setPasswordInputLiveData(new FormInputStateDTO<>(false, getStringfromStringId(R.string.password_empty_error)));
this.password = null;
return false;
} else {
loginViewLiveData.setPasswordInputLiveData(new FormInputStateDTO(true, ""));
loginViewLiveData.setPasswordInputLiveData(new FormInputStateDTO<>(true, ""));
this.password = password.toString();
return true;
}
@ -209,13 +210,14 @@ public class LoginV2Presenter extends BaseViewModel implements LoginV2PresenterI
public class LoginObserver extends GenericApiObserverResponse<LoginModelV2> {
@Override
protected void onSuccess(LoginModelV2 loginResponse) {
if (gmeAuthManager.isBiometricSupportedByDevice())
gmeAuthManager.persistUserCredentialForFingerprintAuth(loginValidator.userId, loginValidator.password)
.doOnSubscribe(sub->view.showProgressBar(true,""))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.doFinally(()->view.showProgressBar(false,""))
.subscribe(new CompletableObserver() {
@Override
public void onSubscribe(Disposable d) {
@ -254,15 +256,9 @@ public class LoginV2Presenter extends BaseViewModel implements LoginV2PresenterI
}
}
private void clearExistingFormData() {
view.showInvalidPassword(null);
view.showInvalidUserId(null);
view.clearUserName();
view.clearPassword();
}
private void onLoginSuccess() {
clearExistingFormData();
setSessionEnabled();
view.redirectToDashboard();

6
app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2PresenterInterface.java

@ -25,11 +25,9 @@ public interface LoginV2PresenterInterface extends BasePresenterInterface {
interface LoginV2ContractInterface extends BaseContractInterface {
void showInvalidUserId(String message);
void showInvalidPassword(String message);
void redirectToDashboard();
boolean isFingerPrintIconShown();
Context getContext();
@ -39,8 +37,6 @@ public interface LoginV2PresenterInterface extends BasePresenterInterface {
void redirectToPennyTestView(int requestCode);
void clearUserName();
void clearPassword();
}
}

21
app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java

@ -237,14 +237,7 @@ public class LoginV2Activity extends BaseActivity implements View.OnClickListene
}
@Override
public void clearUserName() {
usernameId.setText("");
}
@Override
public void clearPassword() {
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
@ -273,16 +266,6 @@ public class LoginV2Activity extends BaseActivity implements View.OnClickListene
}
@Override
public void showInvalidUserId(String message) {
usernameIdTxtInputLayout.setError(message);
}
@Override
public void showInvalidPassword(String message) {
passwordTxtInputLayout.setError(message);
}
@Override
public void redirectToDashboard() {
Intent intent = new Intent(this, HomeActivityV2.class);
@ -292,10 +275,6 @@ public class LoginV2Activity extends BaseActivity implements View.OnClickListene
finish();
}
@Override
public boolean isFingerPrintIconShown() {
return fingerprintScannerView.getVisibility() == View.VISIBLE;
}
@Override
public Context getContext() {

Loading…
Cancel
Save