wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2737 from k9mail/GH-2699_disable_caching_for_inline_images

Browse source 
Disable WebView caching of inline images on API 21+
This commit is contained in:
Vincent Breitmoser 2017-09-06 19:12:22 +02:00 committed by GitHub
commit de2f772f07
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
k9mail/src/main/java/com/fsck/k9/view/K9WebViewClient.java
View file

@ -2,6 +2,8 @@ package com.fsck.k9.view;
import java.io.InputStream;
import java.util.Collections;
import java.util.Map;
import android.annotation.TargetApi;
import android.content.ActivityNotFoundException;
@ -20,7 +22,6 @@ import android.webkit.WebResourceResponse;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import com.fsck.k9.K9;
import com.fsck.k9.mailstore.AttachmentResolver;
import com.fsck.k9.view.MessageWebView.OnPageFinishedListener;
@ -84,6 +85,8 @@ abstract class K9WebViewClient extends WebViewClient {
protected abstract void addActivityFlags(Intent intent);
protected abstract void addCacheControlHeader(WebResourceResponse response);
protected WebResourceResponse shouldInterceptRequest(WebView webView, Uri uri) {
if (!CID_SCHEME.equals(uri.getScheme())) {
return RESULT_DO_NOT_INTERCEPT;
@ -109,7 +112,9 @@ abstract class K9WebViewClient extends WebViewClient {
String mimeType = contentResolver.getType(attachmentUri);
InputStream inputStream = contentResolver.openInputStream(attachmentUri);
return new WebResourceResponse(mimeType, null, inputStream);
WebResourceResponse webResourceResponse = new WebResourceResponse(mimeType, null, inputStream);
addCacheControlHeader(webResourceResponse);
return webResourceResponse;
} catch (Exception e) {
Timber.e(e, "Error while intercepting URI: %s", uri);
return RESULT_DUMMY_RESPONSE;
@ -143,6 +148,11 @@ abstract class K9WebViewClient extends WebViewClient {
protected void addActivityFlags(Intent intent) {
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
}
@Override
protected void addCacheControlHeader(WebResourceResponse response) {
// Sadly, adding headers is not supported prior to Lollipop
}
}
@TargetApi(VERSION_CODES.LOLLIPOP)
@ -160,5 +170,11 @@ abstract class K9WebViewClient extends WebViewClient {
protected void addActivityFlags(Intent intent) {
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
}
@Override
protected void addCacheControlHeader(WebResourceResponse response) {
Map<String, String> headers = Collections.singletonMap("Cache-Control", "no-store");
response.setResponseHeaders(headers);
}
}
}