Syncmanager: use the journalId as the unique collection id.

app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java

@@ -45,7 +45,7 @@ public class CalendarSyncManager extends SyncManager {
     final private HttpUrl remote;
 
     public CalendarSyncManager(Context context, Account account, AccountSettings settings, Bundle extras, String authority, SyncResult result, LocalCalendar calendar, HttpUrl remote) throws InvalidAccountException {
-        super(context, account, settings, extras, authority, result, "calendar/" + calendar.getId(), CollectionInfo.Type.CALENDAR);
+        super(context, account, settings, extras, authority, result, calendar.getName(), CollectionInfo.Type.CALENDAR);
         localCollection = calendar;
         this.remote = remote;
     }

app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.java

@@ -61,7 +61,7 @@ public class ContactsSyncManager extends SyncManager {
     final private CollectionInfo info;
 
     public ContactsSyncManager(Context context, Account account, AccountSettings settings, Bundle extras, String authority, ContentProviderClient provider, SyncResult result, HttpUrl principal, CollectionInfo info) throws InvalidAccountException {
-        super(context, account, settings, extras, authority, result, "addressBook", CollectionInfo.Type.ADDRESS_BOOK);
+        super(context, account, settings, extras, authority, result, info.url, CollectionInfo.Type.ADDRESS_BOOK);
         this.provider = provider;
         this.remote = principal;
         this.info = info;

app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.java

@@ -52,7 +52,7 @@ import static com.etesync.syncadapter.Constants.KEY_ACCOUNT;
 
 abstract public class SyncManager {
     protected final NotificationHelper notificationManager;
-    protected final String uniqueCollectionId;
+    protected final String journalUid;
 
     protected final Context context;
     protected final Account account;
@@ -92,7 +92,7 @@ abstract public class SyncManager {
     private List<LocalResource> localDeleted;
     private LocalResource[] localDirty;
 
-    public SyncManager(Context context, Account account, AccountSettings settings, Bundle extras, String authority, SyncResult syncResult, String uniqueCollectionId, CollectionInfo.Type serviceType) throws InvalidAccountException {
+    public SyncManager(Context context, Account account, AccountSettings settings, Bundle extras, String authority, SyncResult syncResult, String journalUid, CollectionInfo.Type serviceType) throws InvalidAccountException {
         this.context = context;
         this.account = account;
         this.settings = settings;
@@ -105,8 +105,8 @@ abstract public class SyncManager {
         httpClient = HttpClient.create(context, account);
 
         // dismiss previous error notifications
-        this.uniqueCollectionId = uniqueCollectionId;
-        notificationManager = new NotificationHelper(context, uniqueCollectionId, notificationId());
+        this.journalUid = journalUid;
+        notificationManager = new NotificationHelper(context, journalUid, notificationId());
         notificationManager.cancel();
 
         data = ((App) context.getApplicationContext()).getData();