Redirect app to login screen when any operation started from a foreground component...

[pub/Android/ownCloud.git] / src / com / owncloud / android / syncadapter / FileSyncAdapter.java

diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index e112347..46c088b 100644 (file)
--- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -37,6 +37,9 @@ import com.owncloud.android.operations.UpdateOCVersionOperation;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;\r
 import android.accounts.Account;\r
+import android.accounts.AccountsException;\r
+import android.accounts.AuthenticatorException;\r
+import android.accounts.OperationCanceledException;\r
 import android.app.Notification;\r
 import android.app.NotificationManager;\r
 import android.app.PendingIntent;\r
@@ -102,7 +105,12 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         this.setStorageManager(new FileDataStorageManager(account, getContentProvider()));\r
         try {\r
             this.initClientForCurrentAccount();\r
-        } catch (UnknownHostException e) {\r
+        } catch (IOException e) {\r
+            /// the account is unknown for the Synchronization Manager, or unreachable for this context; don't try this again\r
+            mSyncResult.tooManyRetries = true;\r
+            notifyFailedSynchronization();\r
+            return;\r
+        } catch (AccountsException e) {\r
             /// the account is unknown for the Synchronization Manager, or unreachable for this context; don't try this again\r
             mSyncResult.tooManyRetries = true;\r
             notifyFailedSynchronization();\r
@@ -359,7 +367,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         notification.contentIntent = PendingIntent.getActivity(getContext().getApplicationContext(), (int)System.currentTimeMillis(), explanationIntent, 0);\r
         notification.setLatestEventInfo(getContext().getApplicationContext(), \r
                                         getContext().getString(R.string.sync_foreign_files_forgotten_ticker), \r
-                                        String.format(getContext().getString(R.string.sync_foreign_files_forgotten_content), mForgottenLocalFiles.size()), \r
+                                        String.format(getContext().getString(R.string.sync_foreign_files_forgotten_content), mForgottenLocalFiles.size(), getContext().getString(R.string.app_name)), \r
                                         notification.contentIntent);\r
         ((NotificationManager) getContext().getSystemService(Context.NOTIFICATION_SERVICE)).notify(R.string.sync_foreign_files_forgotten_ticker, notification);\r
         \r