From 9b5193c38f66ff0757cfa8a8ce1bb6c18cbaac85 Mon Sep 17 00:00:00 2001 From: Alexey Danilov Date: Sat, 3 Dec 2016 12:08:25 +0300 Subject: [PATCH] :package: release 2.6.4: hide closing output stream error stacktrace --- README.md | 5 +---- library/build.gradle | 6 +++--- .../videocache/HttpProxyCacheServer.java | 16 ++++++++-------- sample/build.gradle | 2 +- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index b0fc0c4..bd94b78 100644 --- a/README.md +++ b/README.md @@ -32,11 +32,8 @@ Note `AndroidVideoCache` works only with **direct urls** to media file, it [**d ## Get started Just add dependency (`AndroidVideoCache` is available in jcenter): ``` -repositories { - jcenter() -} dependencies { - compile 'com.danikula:videocache:2.6.3' + compile 'com.danikula:videocache:2.6.4' } ``` diff --git a/library/build.gradle b/library/build.gradle index ea19b12..79cb79c 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -18,8 +18,8 @@ android { defaultConfig { minSdkVersion 9 targetSdkVersion 23 - versionCode 19 - versionName '2.6.3' + versionCode 20 + versionName '2.6.4' } compileOptions { @@ -43,7 +43,7 @@ publish { userOrg = 'alexeydanilov' groupId = 'com.danikula' artifactId = 'videocache' - publishVersion = '2.6.3' + publishVersion = android.defaultConfig.versionName description = 'Cache support for android VideoView' website = 'https://github.com/danikula/AndroidVideoCache' } diff --git a/library/src/main/java/com/danikula/videocache/HttpProxyCacheServer.java b/library/src/main/java/com/danikula/videocache/HttpProxyCacheServer.java index ed9d4ec..ab68d2b 100644 --- a/library/src/main/java/com/danikula/videocache/HttpProxyCacheServer.java +++ b/library/src/main/java/com/danikula/videocache/HttpProxyCacheServer.java @@ -36,16 +36,16 @@ *

  * public onCreate(Bundle state) {
  *      super.onCreate(state);
- * 

+ * * HttpProxyCacheServer proxy = getProxy(); * String proxyUrl = proxy.getProxyUrl(VIDEO_URL); * videoView.setVideoPath(proxyUrl); * } - *

+ * * private HttpProxyCacheServer getProxy() { * // should return single instance of HttpProxyCacheServer shared for whole app. * } - *

+ * * * @author Alexey Danilov (danikula@gmail.com). */ @@ -291,7 +291,7 @@ private void closeSocketOutput(Socket socket) { socket.shutdownOutput(); } } catch (IOException e) { - onError(new ProxyCacheException("Error closing socket output stream", e)); + LOG.warn("Failed to close socket on proxy side: {}. It seems client have already closed connection.", e.getMessage()); } } @@ -359,11 +359,11 @@ public Builder(Context context) { /** * Overrides default cache folder to be used for caching files. - *

+ *

* By default AndroidVideoCache uses * '/Android/data/[app_package_name]/cache/video-cache/' if card is mounted and app has appropriate permission * or 'video-cache' subdirectory in default application's cache directory otherwise. - *

+ *

* Note directory must be used only for AndroidVideoCache files. * * @param file a cache directory, can't be null. @@ -387,9 +387,10 @@ public Builder fileNameGenerator(FileNameGenerator fileNameGenerator) { /** * Sets max cache size in bytes. + *

* All files that exceeds limit will be deleted using LRU strategy. * Default value is 512 Mb. - *

+ *

* Note this method overrides result of calling {@link #maxCacheFilesCount(int)} * * @param maxSize max cache size in bytes. @@ -403,7 +404,6 @@ public Builder maxCacheSize(long maxSize) { /** * Sets max cache files count. * All files that exceeds limit will be deleted using LRU strategy. - *

* Note this method overrides result of calling {@link #maxCacheSize(long)} * * @param count max cache files count. diff --git a/sample/build.gradle b/sample/build.gradle index 5104e14..0a26abd 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -38,7 +38,7 @@ dependencies { // compile project(':library') compile 'com.android.support:support-v4:23.1.0' compile 'org.androidannotations:androidannotations-api:3.3.2' - compile 'com.danikula:videocache:2.6.3' + compile 'com.danikula:videocache:2.6.4' compile 'com.viewpagerindicator:library:2.4.2-SNAPSHOT@aar' apt 'org.androidannotations:androidannotations:3.3.2' }