Skip to content

Commit 0d63439

Browse files
committed
flutter 호환을 위한 리팩토링
1 parent 39989f1 commit 0d63439

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

bootpay/src/main/java/kr/co/bootpay/BootpayBuilder.java

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class BootpayBuilder {
5959
private BootpayDialog dialog;
6060
// private BootpayBioDialog bioDialog;
6161
private ApiPresenter presenter;
62-
boolean isBioIntent = false;
62+
// boolean isBioIntent = false;
6363
// private String
6464

6565

@@ -511,7 +511,7 @@ private void requestBioActivity() {
511511
if(done != null) CurrentBioRequest.getInstance().done = done;
512512
if(error != null) CurrentBioRequest.getInstance().error = error;
513513

514-
isBioIntent = true;
514+
// isBioIntent = true;
515515
CurrentBioRequest.getInstance().request = request;
516516

517517
CurrentBioRequest.getInstance().activity = null;
@@ -601,10 +601,14 @@ private void requestApp2App() {
601601
public void transactionConfirm(String data) {
602602
if (dialog != null)
603603
dialog.transactionConfirm(data);
604-
if(isBioIntent == true) {
605-
if(CurrentBioRequest.getInstance().activity != null)
606-
CurrentBioRequest.getInstance().activity.transactionConfirm(data);
607-
}
604+
605+
if(CurrentBioRequest.getInstance().activity != null)
606+
CurrentBioRequest.getInstance().activity.transactionConfirm(data);
607+
608+
// if(isBioIntent == true) {
609+
// if(CurrentBioRequest.getInstance().activity != null)
610+
// CurrentBioRequest.getInstance().activity.transactionConfirm(data);
611+
// }
608612

609613
// if(bioDialog != null)
610614
// bioDialog.transactionConfirm(data);
@@ -617,10 +621,14 @@ public void removePaymentWindow() {
617621

618622
public void dismiss() {
619623
if(dialog != null) dialog.dismiss();
620-
if(isBioIntent == true) {
621-
if(CurrentBioRequest.getInstance().activity != null)
622-
CurrentBioRequest.getInstance().activity.activityFinish();
623-
}
624+
625+
if(CurrentBioRequest.getInstance().activity != null)
626+
CurrentBioRequest.getInstance().activity.activityFinish();
627+
628+
// if(isBioIntent == true) {
629+
// if(CurrentBioRequest.getInstance().activity != null)
630+
// CurrentBioRequest.getInstance().activity.activityFinish();
631+
// }
624632
// if(bioDialog != null) {
625633
// if(CurrentBioRequest.getInstance().type != CurrentBioRequest.REQUEST_TYPE_OTHER)
626634
// bioDialog.dismiss();

bootpay/src/main/java/kr/co/bootpay/bio/activity/BootpayBioActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
764764
super.onActivityResult(requestCode, resultCode, data);
765765

766766
CurrentBioRequest.getInstance().listener = null;
767+
CurrentBioRequest.getInstance().activity = this;
767768
// CurrentBioRequest.getInstance().webActivity = null;
768769

769770
if(requestCode == 9999 && resultCode > 0) {

0 commit comments

Comments
 (0)