From: masensio <masensio@solidgear.es>
Date: Thu, 6 Feb 2014 10:23:30 +0000 (+0100)
Subject: Merge branch 'share_link__new_share' into share_link__unshare_file
X-Git-Tag: oc-android-1.5.5~35^2~22
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1bdf1e60f1c18762d0a77543f74a2c28fb859557?hp=de29fd38ce3bdd53ec5f3d798ed16bd8e078ae09

Merge branch 'share_link__new_share' into share_link__unshare_file
---

diff --git a/owncloud-android-library b/owncloud-android-library
index f166bcdd..e9a1ee81 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit f166bcdd8b52a64c3ad0c8725ed64ba768c1eeb5
+Subproject commit e9a1ee81ca37182963467f85476de0fbc216d2e7
diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java
index 316657c4..80149f63 100644
--- a/src/com/owncloud/android/services/OperationsService.java
+++ b/src/com/owncloud/android/services/OperationsService.java
@@ -228,7 +228,14 @@ public class OperationsService extends Service {
                     Log_OC.e(TAG, "Error while trying to get autorization for " + mLastTarget.mAccount.name, e);
                 }
                 result = new RemoteOperationResult(e);
-                
+            } catch (Exception e) {
+                if (mLastTarget.mAccount == null) {
+                    Log_OC.e(TAG, "Unexpected error for a NULL account", e);
+                } else {
+                    Log_OC.e(TAG, "Unexpected error for " + mLastTarget.mAccount.name, e);
+                }
+                result = new RemoteOperationResult(e);
+            
             } finally {
                 synchronized(mPendingOperations) {
                     mPendingOperations.poll();