update AS 3.3.2

Author: yale8848

app/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
- compileSdkVersion 27
- buildToolsVersion "27.0.3"
+ compileSdkVersion 28
+ buildToolsVersion "28.0.3"
  defaultConfig {
  applicationId "ren.yale.android.cachewebview"
  minSdkVersion 14
- targetSdkVersion 25
+ targetSdkVersion 21
  versionCode 1
  versionName "1.0"
  testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -26,7 +26,7 @@ dependencies {
  implementation fileTree(include: ['*.jar'], dir: 'libs')
  //implementation 'ren.yale.android:cachewebviewlib:2.1.3'
  implementation project(':cachewebviewlib')
- implementation 'com.android.support:appcompat-v7:27.0.2'
+ implementation 'com.android.support:appcompat-v7:27.1.1'
  implementation 'com.android.support.constraint:constraint-layout:1.1.2'
  implementation 'com.squareup.okhttp3:okhttp:3.10.0'
 }

app/src/main/java/ren/yale/android/cachewebview/MainActivity.java

@@ -1,16 +1,13 @@
 package ren.yale.android.cachewebview;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.view.View;
 import android.webkit.CookieManager;
 import android.webkit.WebResourceError;
 import android.webkit.WebResourceRequest;
-import android.webkit.WebResourceResponse;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -55,7 +52,8 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
  URL = urls[position];
  //mInterceptor.loadUrl(mWebView,URL);
  //URL=URL+"?r="+System.currentTimeMillis();
- WebViewCacheInterceptorInst.getInstance().loadUrl(mWebView,URL);
+ String u="file://"+getFilesDir()+"/Wikipedia.html";
+ WebViewCacheInterceptorInst.getInstance().loadUrl(mWebView,u);
  }
 
  @Override
@@ -67,7 +65,12 @@ public void onNothingSelected(AdapterView<?> parent) {
  mWebView.setWebViewClient(new WebViewClient(){
 
 
- @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+ @Override
+ public void onPageFinished(WebView view, String url) {
+ super.onPageFinished(view, url);
+ }
+
+ /* @TargetApi(Build.VERSION_CODES.LOLLIPOP)
  @Override
  public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
  WebViewCacheInterceptorInst.getInstance().loadUrl(mWebView,request.getUrl().toString());
@@ -91,7 +94,7 @@ public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceReque
  @Override
  public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
  return WebViewCacheInterceptorInst.getInstance().interceptRequest(url);
- }
+ }*/
 
  @Override
  public void onLoadResource(WebView view, String url) {
@@ -103,6 +106,7 @@ public void onLoadResource(WebView view, String url) {
  public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
  int code = error.getErrorCode();
  String resp = error.getDescription().toString();
+ String url = request.getUrl().toString();
  super.onReceivedError(view, request, error);
  }
  });

app/src/main/res/values/arrays.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
  <string-array name="urls">
+ <item>file:///mnt/sdcard/dxh/Wikipedia.html</item>
+ <item>http://aixuetang.whytouch.com/ppt/fba9f758a0f0d3787866e2dedae2996f/index.html?mode=2&amp;taskStudentId=5982574acd0a11e883b600163e100c20</item>
  <item>http://www.ranwena.com/files/article/1/1268/5028890.html</item>
  <item>http://m.mm131.com/xinggan/3320_3.html</item>
  <item>https://mail.qq.com</item>

build.gradle

@@ -6,9 +6,10 @@ buildscript {
  maven {
  url 'https://maven.google.com'
  }
+ google()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.1.1'
+ classpath 'com.android.tools.build:gradle:3.3.2'
  classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
  classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
 

cachewebviewlib/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 
 android {
- compileSdkVersion 27
- buildToolsVersion "27.0.3"
+ compileSdkVersion 28
+ buildToolsVersion "28.0.3"
 
  defaultConfig {
  minSdkVersion 14

cachewebviewlib/src/main/java/ren/yale/android/cachewebviewlib/WebViewCacheInterceptor.java

@@ -9,6 +9,7 @@
 import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -278,6 +279,8 @@ private WebResourceResponse interceptRequest(String url, Map<String, String> hea
  return webResourceResponse;
  }
  }
+
+ String mimeType = MimeTypeMapUtils.getMimeTypeFromUrl(url);
  try {
 
  Request.Builder reqBuilder = new Request.Builder()
@@ -301,7 +304,7 @@ private WebResourceResponse interceptRequest(String url, Map<String, String> hea
  } else {
  CacheWebViewLog.d(String.format("from server: %s", url), mDebug);
  }
- String mimeType = MimeTypeMapUtils.getMimeTypeFromUrl(url);
+
  WebResourceResponse webResourceResponse = new WebResourceResponse(mimeType, "", response.body().byteStream());
  if (response.code() == 504 && !NetUtils.isConnected(mContext)){
  return null;
@@ -322,7 +325,9 @@ private WebResourceResponse interceptRequest(String url, Map<String, String> hea
  } catch (IOException e) {
  e.printStackTrace();
  }
- return null;
+ ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream("".getBytes());
+ WebResourceResponse webResourceResponse = new WebResourceResponse(mimeType, "", byteArrayInputStream);
+ return webResourceResponse;
  }
 
  public static class Builder {

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip