simplify percentage and errors delivering

danikula · danikula · commit 7f22a669415c · 2015-09-09T17:31:51.000+03:00
diff --git a/library/src/main/java/com/danikula/videocache/ProxyCache.java b/library/src/main/java/com/danikula/videocache/ProxyCache.java
@@ -2,6 +2,7 @@
 
 import android.os.Handler;
 import android.os.Looper;
+import android.os.Message;
 import android.util.Log;
 
 import java.util.concurrent.atomic.AtomicInteger;
@@ -25,7 +26,7 @@ public class ProxyCache {
     private final Source source;
     private final Cache cache;
     private final Object wc;
-    private final Handler handler;
+    private final ListenerHandler handler;
     private volatile Thread sourceReaderThread;
     private volatile boolean stopped;
     private final AtomicInteger readSourceErrorsCount;
@@ -37,7 +38,7 @@ public ProxyCache(Source source, Cache cache, boolean logEnabled) {
         this.cache = checkNotNull(cache);
         this.logEnabled = logEnabled;
         this.wc = new Object();
-        this.handler = new Handler(Looper.getMainLooper());
+        this.handler = new ListenerHandler();
         this.readSourceErrorsCount = new AtomicInteger();
     }
 
@@ -93,7 +94,6 @@ public void shutdown() {
     }
 
     private void readSourceAsync() throws ProxyCacheException {
-
         boolean readingInProgress = sourceReaderThread != null && sourceReaderThread.getState() != Thread.State.TERMINATED;
         if (!stopped && !cache.isCompleted() && !readingInProgress) {
             sourceReaderThread = new Thread(new SourceReaderRunnable(), "Source reader for ProxyCache");
@@ -111,15 +111,8 @@ private void waitForSourceData() throws ProxyCacheException {
         }
     }
 
-    private void notifyNewCacheDataAvailable(final int cachePercentage) {
-        handler.post(new Runnable() {
-            @Override
-            public void run() {
-                if (cacheListener != null) {
-                    cacheListener.onCacheDataAvailable(cachePercentage);
-                }
-            }
-        });
+    private void notifyNewCacheDataAvailable(int cachePercentage) {
+        handler.deliverCachePercentage(cachePercentage);
 
         synchronized (wc) {
             wc.notifyAll();
@@ -165,7 +158,7 @@ private void closeSource() {
 
     protected final void onError(final Throwable e) {
         Log.e(LOG_TAG, "ProxyCache error", e);
-        handler.post(new ErrorDeliverer(e));
+        handler.deliverError(e);
     }
 
     protected boolean isLogEnabled() {
@@ -180,22 +173,53 @@ public void run() {
         }
     }
 
-    private class ErrorDeliverer implements Runnable {
+    private final class ListenerHandler extends Handler {
+
+        private static final int MSG_ERROR = 1;
+        private static final int MSG_CACHE_PERCENTAGE = 2;
 
-        private final Throwable error;
+        public ListenerHandler() {
+            super(Looper.getMainLooper());
+        }
 
-        public ErrorDeliverer(Throwable error) {
-            this.error = error;
+        public void deliverCachePercentage(int percents) {
+            if (cacheListener != null) {
+                send(MSG_CACHE_PERCENTAGE, percents, null);
+            }
+        }
+
+        public void deliverError(Throwable error) {
+            if (isFatalError(error) || cacheListener != null) {
+                send(MSG_ERROR, 0, error);
+            }
+        }
+
+        private boolean isFatalError(Throwable error) {
+            return !(error instanceof ProxyCacheException);
+        }
+
+        private void send(int what, int arg1, Object data) {
+            Message message = obtainMessage(what);
+            message.arg1 = arg1;
+            message.obj = data;
+            sendMessage(message);
         }
 
         @Override
-        public void run() {
-            if (error instanceof ProxyCacheException) {
-                if (cacheListener != null) {
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_CACHE_PERCENTAGE:
+                    cacheListener.onCacheDataAvailable(msg.arg1);
+                    break;
+                case MSG_ERROR:
+                    Throwable error = (Throwable) msg.obj;
+                    if (isFatalError(error)) {
+                        throw new RuntimeException("Unexpected error!", error);
+                    }
                     cacheListener.onError((ProxyCacheException) error);
-                }
-            } else {
-                throw new RuntimeException("Unexpected error!", error);
+                    break;
+                default:
+                    throw new RuntimeException("Unknown message " + msg);
             }
         }
     }
diff --git a/sample/src/main/java/com/danikula/videocache/sample/MultipleVideosActivity.java b/sample/src/main/java/com/danikula/videocache/sample/MultipleVideosActivity.java
@@ -1,7 +1,6 @@
 package com.danikula.videocache.sample;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 
 import org.androidannotations.annotations.EActivity;
@@ -22,10 +21,9 @@ protected void onCreate(Bundle state) {
     }
 
     private void addVideoFragment(Video video, int containerViewId) {
-        Fragment fragment = VideoFragment.build(video.url, video.getCacheFile(this).getAbsolutePath());
         getSupportFragmentManager()
                 .beginTransaction()
-                .add(containerViewId, fragment)
+                .add(containerViewId, VideoFragment.build(this, video))
                 .commit();
     }
 }
diff --git a/sample/src/main/java/com/danikula/videocache/sample/SharedCacheActivity.java b/sample/src/main/java/com/danikula/videocache/sample/SharedCacheActivity.java
@@ -1,12 +1,11 @@
 package com.danikula.videocache.sample;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 
 import org.androidannotations.annotations.EActivity;
 
-@EActivity(R.layout.activity_shared_cache)
+@EActivity(R.layout.activity_multiple_videos)
 public class SharedCacheActivity extends FragmentActivity {
 
     @Override
@@ -16,14 +15,15 @@ protected void onCreate(Bundle state) {
         if (state == null) {
             addVideoFragment(Video.ORANGE_1, R.id.videoContainer0);
             addVideoFragment(Video.ORANGE_1, R.id.videoContainer1);
+            addVideoFragment(Video.ORANGE_1, R.id.videoContainer2);
+            addVideoFragment(Video.ORANGE_1, R.id.videoContainer3);
         }
     }
 
     private void addVideoFragment(Video video, int containerViewId) {
-        Fragment fragment = VideoFragment.build(video.url, video.getCacheFile(this).getAbsolutePath());
         getSupportFragmentManager()
                 .beginTransaction()
-                .add(containerViewId, fragment)
+                .add(containerViewId, VideoFragment.build(this, video))
                 .commit();
     }
 }
diff --git a/sample/src/main/res/layout/activity_shared_cache.xml b/sample/src/main/res/layout/activity_shared_cache.xml

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package com.danikula.videocache.sample;`
`2`	`2`
`3`	`3`	`import android.os.Bundle;`
`4`		`-import android.support.v4.app.Fragment;`
`5`	`4`	`import android.support.v4.app.FragmentActivity;`
`6`	`5`
`7`	`6`	`import org.androidannotations.annotations.EActivity;`
`@@ -22,10 +21,9 @@ protected void onCreate(Bundle state) {`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`private void addVideoFragment(Video video, int containerViewId) {`
`25`		`- Fragment fragment = VideoFragment.build(video.url, video.getCacheFile(this).getAbsolutePath());`
`26`	`24`	`getSupportFragmentManager()`
`27`	`25`	`.beginTransaction()`
`28`		`- .add(containerViewId, fragment)`
	`26`	`+ .add(containerViewId, VideoFragment.build(this, video))`
`29`	`27`	`.commit();`
`30`	`28`	`}`
`31`	`29`	`}`