Fix duplicates

Signed-off-by: Mario Danic <mario@lovelyhq.com>

src/main/java/com/owncloud/android/ui/activity/FolderSyncActivity.java

@@ -194,8 +194,6 @@ public class FolderSyncActivity extends FileActivity implements FolderSyncAdapte
                 mediaFolders.addAll(MediaProvider.getVideoFolders(getContentResolver(), perFolderMediaItemLimit));
                 Log_OC.w(TAG, "Picture+Video Folders: " + mediaFolders.size());
 
-                //TODO properly merge image and video lists to remove duplicates
-
                 List<SyncedFolder> syncedFolderArrayList = mSyncedFolderProvider.getSyncedFolders();
                 List<SyncedFolder> currentAccountSyncedFoldersList = new ArrayList<>();
                 Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(FolderSyncActivity.this);
@@ -250,11 +248,6 @@ public class FolderSyncActivity extends FileActivity implements FolderSyncAdapte
             }
         }
 
-        // No media folder and thus always a custom folder
-        for (SyncedFolder syncedFolder : syncedFoldersMap.values()) {
-            result.add(createSyncedFolderWithoutMediaFolder(syncedFolder));
-        }
-
         return result;
     }