Browse Source

Before changing api interface

master
preyearegmi 6 years ago
parent
commit
2a3d8bc6a4
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. BIN
      .idea/caches/gradle_models.ser
  3. 6
      app/build.gradle
  4. 3
      app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2Presenter.java
  5. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2PresenterInterface.java
  6. 6
      app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java
  7. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java

BIN
.idea/caches/build_file_checksums.ser

BIN
.idea/caches/gradle_models.ser

6
app/build.gradle

@ -63,6 +63,7 @@ android {
release { release {
manifestPlaceholders.fileProvider = "com.gmeremit.online.gmeremittance_native.fileprovider" manifestPlaceholders.fileProvider = "com.gmeremit.online.gmeremittance_native.fileprovider"
buildConfigField 'String', 'BASE_URL', '"https://mobileapi.gmeremit.com:8002/api/"' buildConfigField 'String', 'BASE_URL', '"https://mobileapi.gmeremit.com:8002/api/"'
buildConfigField 'String', 'API_VERSION', '"v1"'
buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"' buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
debuggable false debuggable false
minifyEnabled true minifyEnabled true
@ -73,6 +74,7 @@ android {
debug { debug {
manifestPlaceholders.fileProvider = "com.gmeremit.online.gmeremittance_native.fileprovider" manifestPlaceholders.fileProvider = "com.gmeremit.online.gmeremittance_native.fileprovider"
buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5012/api/"' buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5012/api/"'
buildConfigField 'String', 'API_VERSION', '"v1"'
buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"' buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
signingConfig signingConfigs.debug signingConfig signingConfigs.debug
debuggable true debuggable true
@ -84,6 +86,7 @@ android {
applicationIdSuffix ".stag" applicationIdSuffix ".stag"
signingConfig signingConfigs.debug signingConfig signingConfigs.debug
buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5022/api/"' buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5022/api/"'
buildConfigField 'String', 'API_VERSION', '"v1"'
buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"' buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
debuggable true debuggable true
minifyEnabled false minifyEnabled false
@ -94,7 +97,7 @@ android {
applicationIdSuffix ".uat" applicationIdSuffix ".uat"
signingConfig signingConfigs.debug signingConfig signingConfigs.debug
buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5012/api/"' buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5012/api/"'
// buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5029/api/"'
buildConfigField 'String', 'API_VERSION', '"v1"'
buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"' buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
debuggable true debuggable true
minifyEnabled false minifyEnabled false
@ -103,6 +106,7 @@ android {
kftc { kftc {
manifestPlaceholders.fileProvider = "com.gmeremit.online.gmeremittance_native.fileprovider" manifestPlaceholders.fileProvider = "com.gmeremit.online.gmeremittance_native.fileprovider"
buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5022/api/"' buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5022/api/"'
buildConfigField 'String', 'API_VERSION', '"v1"'
buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"' buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
debuggable false debuggable false
minifyEnabled true minifyEnabled true

3
app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2Presenter.java

@ -213,17 +213,20 @@ public class ExchangeRateV2Presenter extends BasePresenter implements ExchangeRa
view.updateExchangeRates(recipientAmount, sendAmount, transferDisplay, exRateDisplay); view.updateExchangeRates(recipientAmount, sendAmount, transferDisplay, exRateDisplay);
} }
else { else {
view.clearExrateAndServiceCharge();
view.showPopUpMessage(exchangeCalculationApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED, null); view.showPopUpMessage(exchangeCalculationApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
} }
} }
@Override @Override
public void onFailed(String message) { public void onFailed(String message) {
view.clearExrateAndServiceCharge();
view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
} }
@Override @Override
protected void onConnectionNotEstablished(String message) { protected void onConnectionNotEstablished(String message) {
view.clearExrateAndServiceCharge();
view.showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, alertType -> view.exitView()); view.showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, alertType -> view.exitView());
} }

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2PresenterInterface.java

@ -32,5 +32,7 @@ public interface ExchangeRateV2PresenterInterface extends BasePresenterInterface
void updateReceivingAmountAndFetchExchangeRate(String amount); void updateReceivingAmountAndFetchExchangeRate(String amount);
void fallbackToSendingAmountAndFetchExchangeRate(); void fallbackToSendingAmountAndFetchExchangeRate();
void clearExrateAndServiceCharge();
} }
} }

6
app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/view/ExchangeMethodV2Activity.java

@ -236,6 +236,12 @@ public class ExchangeMethodV2Activity extends BaseActivity implements PaymentMod
showPaymentService(true, this.selectedCountryPaymentService.getServiceAvailable()); showPaymentService(true, this.selectedCountryPaymentService.getServiceAvailable());
} }
@Override
public void clearExrateAndServiceCharge() {
transferFeeTxtView.setText("");
exchangeRateTxtView.setText("");
}
private void showSelectedRecipient(String selectedCountryCode, String selectedCountryCurrency) { private void showSelectedRecipient(String selectedCountryCode, String selectedCountryCurrency) {
int flagResId = CountryFlagMapper.getFlagFromCountryCode(selectedCountryCode); int flagResId = CountryFlagMapper.getFlagFromCountryCode(selectedCountryCode);
if (flagResId != -1) if (flagResId != -1)

4
app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java

@ -50,8 +50,8 @@ public class SplashScreenPresenter extends BasePresenter implements SplashScreen
} }
private boolean hasRootAccess() { private boolean hasRootAccess() {
return false;
// return rootBeer.isRootedWithoutBusyBoxCheck();
// return false;
return rootBeer.isRootedWithoutBusyBoxCheck();
} }
@Override @Override

Loading…
Cancel
Save