Improved error messages in gallery for images that can not be loaded

[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 285b152..f66980c 100644 (file)
--- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -35,7 +35,7 @@ import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.SynchronizeFolderOperation;\r
 import com.owncloud.android.operations.UpdateOCVersionOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.operations.SynchronizeFolderOperation;\r
 import com.owncloud.android.operations.UpdateOCVersionOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r

-import com.owncloud.android.ui.activity.ExplanationActivity;\r
+import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;\r

 import android.accounts.Account;\r
 import android.app.Notification;\r
 import android.app.NotificationManager;\r
 import android.accounts.Account;\r
 import android.app.Notification;\r
 import android.app.NotificationManager;\r


@@ -346,23 +346,20 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         notification.flags |= Notification.FLAG_AUTO_CANCEL;\r
 \r
         /// includes a pending intent in the notification showing a more detailed explanation\r
         notification.flags |= Notification.FLAG_AUTO_CANCEL;\r
 \r
         /// includes a pending intent in the notification showing a more detailed explanation\r

-        Intent explanationIntent = new Intent(getContext(), ExplanationActivity.class);\r
-        String message = String.format(getContext().getString(R.string.sync_foreign_files_forgotten_explanation), getContext().getString(R.string.app_name), getAccount().name);\r
-        explanationIntent.putExtra(ExplanationActivity.MESSAGE, message);\r
+        Intent explanationIntent = new Intent(getContext(), ErrorsWhileCopyingHandlerActivity.class);\r
+        explanationIntent.putExtra(ErrorsWhileCopyingHandlerActivity.EXTRA_ACCOUNT, getAccount());\r

         ArrayList<String> remotePaths = new ArrayList<String>();\r
         ArrayList<String> localPaths = new ArrayList<String>();\r
         ArrayList<String> remotePaths = new ArrayList<String>();\r
         ArrayList<String> localPaths = new ArrayList<String>();\r

-        for (String remote : mForgottenLocalFiles.keySet()) {\r
-           remotePaths.add(getContext().getString(R.string.sync_foreign_files_forgotten_remote_prefix) + remote);\r
-           localPaths.add(getContext().getString(R.string.sync_foreign_files_forgotten_local_prefix) + mForgottenLocalFiles.get(remote));\r
-        }\r
-        explanationIntent.putExtra(ExplanationActivity.EXTRA_LIST, localPaths);\r
-        explanationIntent.putExtra(ExplanationActivity.EXTRA_LIST_2, remotePaths);  \r
+        remotePaths.addAll(mForgottenLocalFiles.keySet());\r
+        localPaths.addAll(mForgottenLocalFiles.values());\r
+        explanationIntent.putExtra(ErrorsWhileCopyingHandlerActivity.EXTRA_LOCAL_PATHS, localPaths);\r
+        explanationIntent.putExtra(ErrorsWhileCopyingHandlerActivity.EXTRA_REMOTE_PATHS, remotePaths);  \r

         explanationIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
         \r
         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
         explanationIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
         \r
         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
                                         notification.contentIntent);\r
         ((NotificationManager) getContext().getSystemService(Context.NOTIFICATION_SERVICE)).notify(R.string.sync_foreign_files_forgotten_ticker, notification);\r
         \r