Skip to content

Commit 111fc3c

Browse files
committed
parcelable issue로 listener 객체 제거
1 parent 5e9fadc commit 111fc3c

3 files changed

Lines changed: 8 additions & 26 deletions

File tree

library/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ android {
1616
versionCode rootProject.ext.versionCode
1717
versionName rootProject.ext.versionName
1818
vectorDrawables.useSupportLibrary = true
19+
20+
javaCompileOptions {
21+
annotationProcessorOptions {
22+
includeCompileClasspath false
23+
arguments = ['library': 'true']
24+
}
25+
}
1926
}
2027

2128
lintOptions {

library/src/main/java/com/thefinestartist/finestwebview/FinestWebView.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.thefinestartist.Base;
1818
import com.thefinestartist.finestwebview.enums.Position;
1919
import com.thefinestartist.finestwebview.listeners.BroadCastManager;
20-
import com.thefinestartist.finestwebview.listeners.OnWebViewClientListener;
2120
import com.thefinestartist.finestwebview.listeners.WebViewListener;
2221
import com.thefinestartist.utils.content.Ctx;
2322
import com.thefinestartist.utils.content.Res;
@@ -158,7 +157,6 @@ public static class Builder implements Serializable {
158157
protected Integer webViewCacheMode;
159158
protected Integer webViewMixedContentMode;
160159
protected Boolean webViewOffscreenPreRaster;
161-
protected OnWebViewClientListener webViewClientListener;
162160

163161
protected String injectJavaScript;
164162

@@ -867,11 +865,6 @@ public Builder webViewUserAgentString(String webViewUserAgentString, boolean isA
867865
return this;
868866
}
869867

870-
public Builder webViewClientListener(OnWebViewClientListener listener) {
871-
this.webViewClientListener = listener;
872-
return this;
873-
}
874-
875868
public Builder webViewNeedInitialFocus(boolean webViewNeedInitialFocus) {
876869
this.webViewNeedInitialFocus = webViewNeedInitialFocus;
877870
return this;

library/src/main/java/com/thefinestartist/finestwebview/FinestWebViewActivity.java

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ public class FinestWebViewActivity extends AppCompatActivity
193193
protected Integer webViewCacheMode;
194194
protected Integer webViewMixedContentMode;
195195
protected Boolean webViewOffscreenPreRaster;
196-
protected OnWebViewClientListener webViewClientListener = null;
197196

198197
protected String injectJavaScript;
199198

@@ -441,7 +440,6 @@ protected void initializeOptions() {
441440
webViewCacheMode = builder.webViewCacheMode;
442441
webViewMixedContentMode = builder.webViewMixedContentMode;
443442
webViewOffscreenPreRaster = builder.webViewOffscreenPreRaster;
444-
webViewClientListener = builder.webViewClientListener;
445443

446444
injectJavaScript = builder.injectJavaScript;
447445

@@ -641,7 +639,7 @@ protected void initializeViews() {
641639

642640
{ // WebView
643641
webView.setWebChromeClient(new MyWebChromeClient());
644-
webView.setWebViewClient(new MyWebViewClient(this.webViewClientListener));
642+
webView.setWebViewClient(new MyWebViewClient());
645643
webView.setDownloadListener(downloadListener);
646644

647645
WebSettings settings = webView.getSettings();
@@ -1305,20 +1303,12 @@ public void onCloseWindow(WebView window) {
13051303

13061304
public class MyWebViewClient extends WebViewClient {
13071305

1308-
private OnWebViewClientListener callback = null;
1309-
1310-
public MyWebViewClient(@Nullable OnWebViewClientListener callback) {
1311-
this.callback = callback;
1312-
}
1313-
13141306
@Override
13151307
public void onPageStarted(WebView view, String url, Bitmap favicon) {
13161308
BroadCastManager.onPageStarted(FinestWebViewActivity.this, key, url);
13171309
if (!url.contains("docs.google.com") && url.endsWith(".pdf")) {
13181310
webView.loadUrl("http://docs.google.com/gview?embedded=true&url=" + url);
13191311
}
1320-
1321-
if (callback != null) callback.onPageStarted(view, url, favicon);
13221312
}
13231313

13241314
@Override
@@ -1342,10 +1332,6 @@ public void onPageFinished(WebView view, String url) {
13421332
if (injectJavaScript != null) {
13431333
webView.evaluateJavascript(injectJavaScript, null);
13441334
}
1345-
1346-
if (callback != null) {
1347-
callback.onPageFinished(view, url);
1348-
}
13491335
}
13501336

13511337
public static final String INTENT_PROTOCOL_START = "intent:";
@@ -1356,10 +1342,6 @@ public void onPageFinished(WebView view, String url) {
13561342
@Override
13571343
public boolean shouldOverrideUrlLoading(WebView view, String url) {
13581344

1359-
if (callback != null) {
1360-
callback.shouldOverrideUrlLoading(view, url);
1361-
}
1362-
13631345
if (url.endsWith(".mp4")) {
13641346
Intent intent = new Intent(Intent.ACTION_VIEW);
13651347
intent.setDataAndType(Uri.parse(url), "video/*");

0 commit comments

Comments
 (0)