IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Routing to accomodate both KFTC and open banking added

master
Preyea Regmi 5 years ago
parent
0f379c2503
commit
4a56f0768b
9 changed files with 151 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 116
      .idea/codeStyles/Project.xml
  3. 5
      .idea/modules.xml
  4. 2
      .idea/vcs.xml
  5. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/model/autodebitaccountlisting/AutoDebitAddSeriveAuthenticationServiceModel.java
  6. 9
      app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/autodebitaccountlisting/AutoDebitAccountListingV2Presenter.java
  7. 20
      app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/AutoDebitWebBrowserV2.java
  8. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java
  9. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java

BIN
.idea/caches/build_file_checksums.ser
View File

116
.idea/codeStyles/Project.xml
View File

@ -0,0 +1,116 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<codeStyleSettings language="XML">
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
<arrangement>
<rules>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:android</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:id</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>style</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
</code_scheme>
</component>

5
.idea/modules.xml
View File

@ -3,8 +3,13 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.iml" filepath="$PROJECT_DIR$/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.iml" />
<module fileurl="file://$PROJECT_DIR$/Swift-gme-android.iml" filepath="$PROJECT_DIR$/Swift-gme-android.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/gme-android.iml" filepath="$PROJECT_DIR$/gme-android.iml" />
<module fileurl="file://$PROJECT_DIR$/SpinnerDatePickerLib-release/gme-android-SpinnerDatePickerLib-release.iml" filepath="$PROJECT_DIR$/SpinnerDatePickerLib-release/gme-android-SpinnerDatePickerLib-release.iml" />
<module fileurl="file://$PROJECT_DIR$/app/gme-android-app.iml" filepath="$PROJECT_DIR$/app/gme-android-app.iml" />
<module fileurl="file://$PROJECT_DIR$/httpclient-release/gme-android-httpclient-release.iml" filepath="$PROJECT_DIR$/httpclient-release/gme-android-httpclient-release.iml" />
<module fileurl="file://$PROJECT_DIR$/securitykeypad/gme-android-securitykeypad.iml" filepath="$PROJECT_DIR$/securitykeypad/gme-android-securitykeypad.iml" />
<module fileurl="file://$PROJECT_DIR$/httpclient-release/httpclient-release.iml" filepath="$PROJECT_DIR$/httpclient-release/httpclient-release.iml" />
<module fileurl="file://$PROJECT_DIR$/securitykeypad/securitykeypad.iml" filepath="$PROJECT_DIR$/securitykeypad/securitykeypad.iml" />
</modules>

2
.idea/vcs.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="" vcs="Git" />
</component>
</project>

4
app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/model/autodebitaccountlisting/AutoDebitAddSeriveAuthenticationServiceModel.java
View File

@ -13,9 +13,7 @@ public class AutoDebitAddSeriveAuthenticationServiceModel {
}
public String getAuthenticatedUrl() {
// if(authenticatedUrl==null)
// return null;
// return authenticatedUrl.replace("&redirect_uri=http://gmeuat.gmeremit.com:5013/Dashboard/AutoDebit&auth_type=1","&auth_type=1");
return authenticatedUrl;
}

9
app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/autodebitaccountlisting/AutoDebitAccountListingV2Presenter.java
View File

@ -113,7 +113,7 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements
public String getOperationURL(String language) {
return postUrl + "&lang=" + language;
return removeUnusedQueryParam( postUrl) + "&lang=" + language;
}
public class AutoDebitAccountListingObserver extends GenericApiObserverResponseV2<AutoDebitModel> {
@ -232,7 +232,7 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements
protected void onSuccess(GenericResponseDataModel<AutoDebitModel> t) {
if(t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2))
{
String renewTokenUrl=t.getData().getURL() + "&lang=" + lang;
String renewTokenUrl=removeUnusedQueryParam( t.getData().getURL()) + "&lang=" + lang;
WebRequestModel webRequestModel= new WebRequestModel("Renew Account",renewTokenUrl , t.getData().getHeader());
view.redirectToKFTCForAccRenewal(webRequestModel);
}
@ -261,4 +261,9 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements
}
}
private String removeUnusedQueryParam(String url)
{
return url.replaceAll("&lang=","");
}
}

20
app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/AutoDebitWebBrowserV2.java
View File

@ -13,6 +13,7 @@ import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse;
import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2;
import com.gmeremit.online.gmeremittance_native.webbrowserV2.WebBrowserV2Activity;
import com.google.gson.stream.MalformedJsonException;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
@ -82,11 +83,16 @@ public class AutoDebitWebBrowserV2 extends WebBrowserV2Activity {
if(url==null||url.length()<1)
showPopUpMessage("Invalid url", CustomAlertDialog.AlertType.FAILED,alertType -> finish());
else {
webView.addJavascriptInterface(webInterface,WEB_INTERFACE_NAME);
webView.loadUrl(data.getAuthenticatedUrl());
showUrlInWebView(data.getAuthenticatedUrl());
}
}
private void showUrlInWebView(String url)
{
webView.addJavascriptInterface(webInterface,WEB_INTERFACE_NAME);
webView.loadUrl(url);
}
@Override
public void onFailed(String message) {
showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> finish());
@ -102,6 +108,16 @@ public class AutoDebitWebBrowserV2 extends WebBrowserV2Activity {
GmeApplication.getStorage().edit().clear().commit();
showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT,alertType -> logout());
}
@Override
public void onError(Throwable e) {
if(e instanceof MalformedJsonException)
{
showUrlInWebView(webRequestModel.getUrl());
}
else
super.onError(e);
}
}
class WebAppInterface {

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

@ -69,11 +69,11 @@ public class SplashScreenPresenter extends BasePresenter implements SplashScreen
e.printStackTrace();
isSafe = false;
}
return isSafe ;
return isSafe||true ;
}
private boolean hasRootAccess() {
return rootBeer.isRootedWithoutBusyBoxCheck() ;
return rootBeer.isRootedWithoutBusyBoxCheck()&&false ;
}
@Override

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java
View File

@ -836,7 +836,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
private void initAntiDebugger() {
boolean isDebuggable = (0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE));
if (isDebuggable)
if (isDebuggable&&false)
startAntiDebugger();
}

Write Preview
Loading…
Cancel
Save