Skip to content

Commit 07dc9d4

Browse files
author
Bootpay
committed
fix method null
1 parent e6b23fe commit 07dc9d4

File tree

47 files changed

+49
-49
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+49
-49
lines changed

bootpay/bootpay.iml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,18 @@
109109
<orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
110110
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
111111
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
112+
<orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
112113
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
113114
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
114-
<orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
115115
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
116116
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
117117
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
118118
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
119119
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
120+
<orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
120121
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
121122
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
122123
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
123124
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
124-
<orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
125125
</component>
126126
</module>
74 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
77 Bytes
Binary file not shown.

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

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -109,26 +109,28 @@ public BootpayWebView(Context context, AttributeSet attrs, int defStyleAttr) {
109109
@Override
110110
public void onPageFinished(WebView view, String url) {
111111
super.onPageFinished(view, url);
112-
if (!isLoaded) {
113-
isLoaded = true;
114-
setDevice();
115-
loadParams(
116-
request(
117-
price(),
118-
application_id(),
119-
name(),
120-
pg(),
121-
method(),
122-
items(),
123-
test_mode(),
124-
params(),
125-
order_id()
126-
),
127-
error(),
128-
cancel(),
129-
confirm(),
130-
done()
131-
);
112+
synchronized (BootpayWebView.class) {
113+
if (!isLoaded) {
114+
isLoaded = true;
115+
setDevice();
116+
loadParams(
117+
request(
118+
price(),
119+
application_id(),
120+
name(),
121+
pg(),
122+
method(),
123+
items(),
124+
test_mode(),
125+
params(),
126+
order_id()
127+
),
128+
error(),
129+
cancel(),
130+
confirm(),
131+
done()
132+
);
133+
}
132134
}
133135
}
134136

@@ -252,8 +254,7 @@ private String pg() {
252254
}
253255

254256
private String method() {
255-
if (isNullOrEmpty(request.getParams())) return "method:''";
256-
else return String.format(locale, "method:'%s'", request.getMethod());
257+
return String.format(locale, "method:'%s'", request.getMethod());
257258
}
258259

259260
private String test_mode() {

0 commit comments

Comments
 (0)