Skip to content

Commit 3eeb1ca

Browse files
apis17apis17
authored
Merge pull request #4 from ashrafamin91/3.33.0
* Added C2P
2 parents 68dce09 + 683a2e3 commit 3eeb1ca

File tree

10 files changed

+678
-666
lines changed

10 files changed

+678
-666
lines changed

‎molpayxdk/src/main/assets/molpay-mobile-xdk-www/fonts/fontawesome-webfont.svg‎

Lines changed: 654 additions & 654 deletions
Loading

‎molpayxdk/src/main/assets/molpay-mobile-xdk-www/images/apple-logo.png‎

9.29 KB
Loading

‎molpayxdk/src/main/assets/molpay-mobile-xdk-www/images/mastercard-logo.png‎

592 Bytes
Loading

‎molpayxdk/src/main/assets/molpay-mobile-xdk-www/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.2f041884.css"> <link rel="stylesheet" href="styles/main.9487ad1d.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-cloak ng-show="isStarting || isLoading" class="text-center"> <br> <p>{{label_preparing}}</p> <p>{{label_pleasewait}}</p> </div> <div class="footer"> </div> <div ng-cloak ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">{{label_loading}}</div> </div> <script src="scripts/vendor.b5b76176.js"></script> <script src="scripts/scripts.92281eb9.js"></script> </body> </html>
1+
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.2f041884.css"> <link rel="stylesheet" href="styles/main.08e504b6.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="debugger" ng-if="isInternalDebugging">...</div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-cloak ng-show="isStarting || isLoading" class="text-center"> <br> <p>{{label_preparing}}</p> <p>{{label_pleasewait}}</p> </div> <div class="footer"> </div> <div ng-cloak ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">{{label_loading}}</div> </div> <div class="iframe-container slide-in" id="mastercardc2pModal" style="display: none;"> <div class="loadingbackground"></div> <iframe class="iframe-checkout" id="mastercardc2pIframe" name="checkout-iframe" title="mastercardc2pIframe" src=""></iframe> </div> <div id="extra"> <!-- <script src="https://sandbox.src.mastercard.com/srci/merchant/2/lib.js?dpaId=b3d12697-975b-47a3-8656-2a81647d8ded&locale=en_US"></script> --> <script type="module" src="https://src.mastercard.com/srci/integration/components/src-ui-kit/src-ui-kit.esm.js"></script> </div> <script src="scripts/vendor.6fadcbba.js"></script> <script src="scripts/scripts.2c67fe65.js"></script> </body> </html>

‎molpayxdk/src/main/assets/molpay-mobile-xdk-www/scripts/scripts.2c67fe65.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎molpayxdk/src/main/assets/molpay-mobile-xdk-www/scripts/scripts.92281eb9.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎molpayxdk/src/main/assets/molpay-mobile-xdk-www/scripts/vendor.6fadcbba.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎molpayxdk/src/main/assets/molpay-mobile-xdk-www/scripts/vendor.b5b76176.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

molpayxdk/src/main/assets/molpay-mobile-xdk-www/styles/main.9487ad1d.css renamed to molpayxdk/src/main/assets/molpay-mobile-xdk-www/styles/main.08e504b6.css

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎molpayxdk/src/main/java/com/molpay/molpayxdk/MOLPayActivity.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import android.webkit.CookieManager;
2727
import android.webkit.ValueCallback;
2828
import android.webkit.WebChromeClient;
29+
import android.webkit.WebSettings;
2930
import android.webkit.WebView;
3031
import android.webkit.WebViewClient;
3132
import android.widget.LinearLayout;
@@ -86,6 +87,8 @@ public class MOLPayActivity extends AppCompatActivity {
8687
public final static String mp_non_3DS = "mp_non_3DS";
8788
public final static String mp_card_list_disabled = "mp_card_list_disabled";
8889
public final static String mp_disabled_channels = "mp_disabled_channels";
90+
public final static String mp_dpa_id = "mp_dpa_id";
91+
public final static String mp_company = "mp_company";
8992

9093
public final static String MOLPAY = "MOLPAY";
9194
private final static String mpopenmolpaywindow = "mpopenmolpaywindow://";
@@ -95,7 +98,7 @@ public class MOLPayActivity extends AppCompatActivity {
9598
private final static String mppinstructioncapture = "mppinstructioncapture://";
9699
private final static String module_id = "module_id";
97100
private final static String wrapper_version = "wrapper_version";
98-
private final static String wrapperVersion = "6";
101+
private final static String wrapperVersion = "0";
99102

100103
private String base64Img;
101104
private String filename;
@@ -179,11 +182,19 @@ protected void onCreate(Bundle savedInstanceState) {
179182
mpMOLPayUI.setVisibility(View.GONE);
180183

181184
// Load the main ui
185+
mpMainUI.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
182186
mpMainUI.getSettings().setAllowUniversalAccessFromFileURLs(true);
183187
mpMainUI.setWebViewClient(new MPMainUIWebClient());
188+
CookieManager cookieManager = CookieManager.getInstance();
189+
cookieManager.setAcceptCookie(true);
190+
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP){
191+
cookieManager.setAcceptThirdPartyCookies(mpMainUI, true);
192+
cookieManager.setAcceptThirdPartyCookies(mpMOLPayUI, true);
193+
}
184194
mpMainUI.loadUrl("file:///android_asset/molpay-mobile-xdk-www/index.html");
185195

186196
// Configure MOLPay ui
197+
mpMOLPayUI.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
187198
mpMOLPayUI.getSettings().setAllowUniversalAccessFromFileURLs(true);
188199
mpMOLPayUI.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);
189200
mpMOLPayUI.getSettings().setSupportMultipleWindows(true);
@@ -368,6 +379,7 @@ public boolean onCreateWindow(WebView view, boolean dialog, boolean userGesture,
368379
mpBankUI = new WebView(MOLPayActivity.this);
369380

370381
mpBankUI.getSettings().setJavaScriptEnabled(true);
382+
mpBankUI.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
371383
mpBankUI.getSettings().setAllowUniversalAccessFromFileURLs(true);
372384
mpBankUI.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);
373385
mpBankUI.getSettings().setSupportMultipleWindows(true);

0 commit comments

Comments
 (0)