fix some crashes

Author: buggins

android/src/org/coolreader/crengine/BackgroundThread.java

@@ -180,23 +180,31 @@ public void postGUI( Runnable task )
 	 */
 	public void postGUI(final Runnable task, final long delay)
 	{
-		if ( guiHandler==null ) {
-			synchronized( postedGUI ) {
-				postedGUI.add(task);
+		try {
+			if (guiHandler == null) {
+				synchronized (postedGUI) {
+					postedGUI.add(task);
+				}
+			} else {
+				if (delay > 0) {
+					final int id = ++delayedTaskId;
+					//L.v("posting delayed (" + delay + ") task " + id + " " + task);
+					guiHandler.postDelayed(new Runnable() {
+						@Override
+						public void run() {
+							try {
+								task.run();
+								//L.v("finished delayed (" + delay + ") task " + id + " " + task);
+							} catch (Throwable e) {
+								Log.e("cr3", "Exception while processing task in GUI thread: " + task, e);
+							}
+						}
+					}, delay);
+				} else
+					guiHandler.post(task);
 			}
-		} else {
-			if ( delay>0 ) {
-				final int id = ++delayedTaskId;
-				//L.v("posting delayed (" + delay + ") task " + id + " " + task);
-				guiHandler.postDelayed(new Runnable() {
-					@Override
-					public void run() {
-						task.run();
-						//L.v("finished delayed (" + delay + ") task " + id + " " + task);
-					}
-				}, delay);
-			} else
-				guiHandler.post(task);
+		} catch (Throwable e) {
+			Log.e("cr3", "Exception while posting task to GUI thread: " + task, e);
 		}
 	}
 
@@ -225,14 +233,30 @@ public static boolean isBackgroundThread()
 		return (Thread.currentThread() == instance);
 	}
 
-	public void executeGUI( Runnable task )
+	public void executeGUI( final Runnable task )
 	{
 		//Handler guiHandler = guiTarget.getHandler();
 		//if ( guiHandler!=null && guiHandler.getLooper().getThread()==Thread.currentThread() )
-		if (isGUIThread())
-			task.run(); // run in this thread
-		else
-			postGUI(task);
+		try {
+			if (isGUIThread())
+				task.run(); // run in this thread
+			else {
+				postGUI(new Runnable() {
+					@Override
+					public void run() {
+						try {
+							task.run();
+						} catch (Throwable e) {
+							Log.e("cr3",
+									"Exception while executing task in GUI thread: " + task, e);
+						}
+
+					}
+				});
+			}
+		} catch (Throwable e) {
+			Log.e("cr3", "Exception in executeGUI: " + task, e);
+		}
 	}
 
     public <T> Callable<T> guard( final Callable<T> task )

android/src/org/coolreader/crengine/ReaderView.java

@@ -4901,7 +4901,8 @@ public void fail(Exception e) {
 			mActivity.waitForCRDBService(new Runnable() {
 				@Override
 				public void run() {
-					Services.getHistory().removeBookInfo(mActivity.getDB(), mBookInfo.getFileInfo(), true, false);
+					if (Services.getHistory() != null)
+						Services.getHistory().removeBookInfo(mActivity.getDB(), mBookInfo.getFileInfo(), true, false);
 				}
 			});
 			mBookInfo = null;

android/src/org/coolreader/db/CRDBServiceAccessor.java

@@ -15,8 +15,8 @@
 public class CRDBServiceAccessor {
 	private final static String TAG = "cr3db";
 	private Activity mActivity;
-    private CRDBService.LocalBinder mService;
-    private boolean mServiceBound;
+    private volatile CRDBService.LocalBinder mService;
+    private volatile boolean mServiceBound;
     private MountPathCorrector pathCorrector;
 
     public CRDBService.LocalBinder get() {
@@ -30,7 +30,7 @@ public CRDBServiceAccessor(Activity activity, MountPathCorrector pathCorrector)
 		this.pathCorrector = pathCorrector;
 	}
 
-	public void setPathCorrector(MountPathCorrector pathCorrector) {
+	public synchronized void setPathCorrector(MountPathCorrector pathCorrector) {
 		this.pathCorrector = pathCorrector;
     	if (mService != null && pathCorrector != null)
     		mService.setPathCorrector(pathCorrector);
@@ -40,15 +40,20 @@ public void setPathCorrector(MountPathCorrector pathCorrector) {
 
 	private boolean bindIsCalled;
     public void bind(final Runnable boundCallback) {
-    	if (mService != null) {
-        	Log.v(TAG, "CRDBService is already bound");
-        	if (boundCallback != null)
-        		boundCallback.run();
-    		return;
-    	}
+    	synchronized(this) {
+			if (mService != null) {
+				Log.v(TAG, "CRDBService is already bound");
+				if (boundCallback != null)
+					boundCallback.run();
+				return;
+			}
+		}
     	//Log.v(TAG, "binding CRDBService");
-    	if (boundCallback != null)
-    		onConnectCallbacks.add(boundCallback);
+    	if (boundCallback != null) {
+			synchronized(onConnectCallbacks) {
+				onConnectCallbacks.add(boundCallback);
+			}
+		}
     	if (!bindIsCalled) {
     		bindIsCalled = true;
 	    	if (mActivity.bindService(new Intent(mActivity, 
@@ -73,21 +78,27 @@ public void unbind() {
 
     private ServiceConnection mServiceConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName className, IBinder service) {
-        	mService = ((CRDBService.LocalBinder)service);
-        	Log.i(TAG, "connected to CRDBService");
-        	if (pathCorrector != null)
-        		mService.setPathCorrector(pathCorrector);
-        	if (onConnectCallbacks.size() != 0) {
-        		// run once
-        		for (Runnable callback : onConnectCallbacks)
-        			callback.run();
-        		onConnectCallbacks.clear();
-        	}
+			synchronized(CRDBServiceAccessor.this) {
+				mService = ((CRDBService.LocalBinder) service);
+				Log.i(TAG, "connected to CRDBService");
+				if (pathCorrector != null)
+					mService.setPathCorrector(pathCorrector);
+			}
+        	synchronized(onConnectCallbacks) {
+				if (onConnectCallbacks.size() != 0) {
+					// run once
+					for (Runnable callback : onConnectCallbacks)
+						callback.run();
+					onConnectCallbacks.clear();
+				}
+			}
         }
 
         public void onServiceDisconnected(ComponentName className) {
-            mService = null;
-        	Log.i(TAG, "disconnected from CRDBService");
+        	synchronized(CRDBServiceAccessor.this) {
+				mService = null;
+			}
+			Log.i(TAG, "disconnected from CRDBService");
         }
     };