Make bookmark-service less browser-specific, enabling more browsers (including mobile)

src/modules/android/android-shared/android-bookmark/android-bookmark.service.ts

@@ -30,6 +30,10 @@ export default class AndroidBookmarkService implements BookmarkService {
     return bookmarks;
   }
 
+  identifySupportedContainers(): ng.IPromise<void> {
+    return this.methodNotApplicable();
+  }
+
   methodNotApplicable(): ng.IPromise<any> {
     // Unused for this platform
     return this.$q.resolve();

src/modules/app/app-settings/backup-restore-settings/backup-restore-settings.component.ts

@@ -287,7 +287,7 @@ export default class BackupRestoreSettingsComponent implements OnInit {
       })
       .then((bookmarks) => {
         // Clean bookmarks for export
-        return cleanRecursive(this.bookmarkHelperSvc.removeEmptyContainers(bookmarks));
+        return cleanRecursive(bookmarks.filter((container) => container.children?.length));
       });
   }
 

src/modules/shared/bookmark/bookmark-helper/bookmark-helper.service.ts

@@ -213,15 +213,8 @@ export default class BookmarkHelperService {
   }
 
   getBookmarkType(bookmark: Bookmark): BookmarkType {
-    const bookmarkType = BookmarkType.Bookmark;
-
     // Check if container
-    if (
-      bookmark.title === BookmarkContainer.Menu ||
-      bookmark.title === BookmarkContainer.Mobile ||
-      bookmark.title === BookmarkContainer.Other ||
-      bookmark.title === BookmarkContainer.Toolbar
-    ) {
+    if (Object.values(BookmarkContainer).includes(bookmark.title as BookmarkContainer)) {
       return BookmarkType.Container;
     }
 
@@ -235,7 +228,7 @@ export default class BookmarkHelperService {
       return BookmarkType.Separator;
     }
 
-    return bookmarkType;
+    return BookmarkType.Bookmark;
   }
 
   getCachedBookmarks(): ng.IPromise<Bookmark[] | undefined> {
@@ -522,32 +515,6 @@ export default class BookmarkHelperService {
     return this.$q.resolve(updatedBookmarks);
   }
 
-  removeEmptyContainers(bookmarks: Bookmark[]): Bookmark[] {
-    const menuContainer = this.getContainer(BookmarkContainer.Menu, bookmarks);
-    const mobileContainer = this.getContainer(BookmarkContainer.Mobile, bookmarks);
-    const otherContainer = this.getContainer(BookmarkContainer.Other, bookmarks);
-    const toolbarContainer = this.getContainer(BookmarkContainer.Toolbar, bookmarks);
-    const removeArr: Bookmark[] = [];
-
-    if (!menuContainer?.children?.length) {
-      removeArr.push(menuContainer);
-    }
-
-    if (!mobileContainer?.children?.length) {
-      removeArr.push(mobileContainer);
-    }
-
-    if (!otherContainer?.children?.length) {
-      removeArr.push(otherContainer);
-    }
-
-    if (!toolbarContainer?.children?.length) {
-      removeArr.push(toolbarContainer);
-    }
-
-    return bookmarks.filter((x) => !removeArr.includes(x));
-  }
-
   searchBookmarks(query: any): ng.IPromise<Bookmark[]> {
     if (!query) {
       query = { keywords: [] };

src/modules/shared/bookmark/bookmark.enum.ts

@@ -6,6 +6,9 @@ enum BookmarkChangeType {
   Remove = 'remove'
 }
 
+// when adding a new container, add a translation to bookmark-helper.service.ts getBookmarkTitleForDisplay(...)
+// do NOT reference any of these constants unless you absolutely have to
+// (e.g. .Toolbar in conjunction with SettingsSvc.syncBookmarksToolbar() )
 enum BookmarkContainer {
   Menu = '[xbs] Menu',
   Mobile = '[xbs] Mobile',

src/modules/shared/bookmark/bookmark.interface.ts

@@ -41,6 +41,7 @@ export interface BookmarkService {
   clearNativeBookmarks: () => ng.IPromise<void>;
   createNativeBookmarksFromBookmarks: (bookmarks: Bookmark[]) => ng.IPromise<number>;
   ensureContainersExist: (bookmarks: Bookmark[]) => Bookmark[];
+  identifySupportedContainers(): ng.IPromise<void>;
   processNativeChangeOnBookmarks: (changeInfo: BookmarkChange, bookmarks: Bookmark[]) => ng.IPromise<Bookmark[]>;
   processChangeOnNativeBookmarks: (
     id: number,

src/modules/shared/sync/bookmark-sync-provider/bookmark-sync-provider.service.ts

@@ -137,24 +137,26 @@ export default class BookmarkSyncProviderService implements SyncProvider {
   }
 
   processSync(sync: Sync): ng.IPromise<ProcessSyncResult> {
-    // Process sync
-    switch (sync.type) {
-      // Sync native bookmarks to service
-      case SyncType.Remote:
-        return this.processRemoteSync(sync);
-      // Overwrite native bookmarks with synced bookmarks
-      case SyncType.Local:
-        return this.processLocalSync(sync);
-      // Sync bookmarks to service and overwrite native bookmarks
-      case SyncType.LocalAndRemote:
-        return this.processLocalAndRemoteSync(sync);
-      // Upgrade sync to current version
-      case SyncType.Upgrade:
-        return this.processUpgradeSync();
-      // Ambiguous sync
-      default:
-        throw new Exceptions.AmbiguousSyncRequestException();
-    }
+    return this.bookmarkSvc.identifySupportedContainers().then(() => {
+      // Process sync
+      switch (sync.type) {
+        // Sync native bookmarks to service
+        case SyncType.Remote:
+          return this.processRemoteSync(sync);
+        // Overwrite native bookmarks with synced bookmarks
+        case SyncType.Local:
+          return this.processLocalSync(sync);
+        // Sync bookmarks to service and overwrite native bookmarks
+        case SyncType.LocalAndRemote:
+          return this.processLocalAndRemoteSync(sync);
+        // Upgrade sync to current version
+        case SyncType.Upgrade:
+          return this.processUpgradeSync();
+        // Ambiguous sync
+        default:
+          throw new Exceptions.AmbiguousSyncRequestException();
+      }
+    });
   }
 
   processLocalAndRemoteSync(sync: Sync): ng.IPromise<ProcessSyncResult> {

src/modules/shared/utility/utility.service.ts

@@ -16,6 +16,10 @@ import NetworkService from '../network/network.service';
 import { StoreKey } from '../store/store.enum';
 import StoreService from '../store/store.service';
 
+declare global {
+  const opr: any;
+}
+
 @autobind
 @Injectable('UtilityService')
 export default class UtilityService {
@@ -157,6 +161,23 @@ export default class UtilityService {
     return !angular.isUndefined(window.navigator.brave);
   }
 
+  // as per https://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser/9851769#9851769
+  // Opera 20 - 74
+  isOperaBrowser(): boolean {
+    const windowsAny: any = window;
+    // eslint-disable-next-line no-undef
+    return (!!windowsAny.opr && !!opr.addons) || navigator.userAgent.indexOf(' OPR/') >= 0;
+  }
+  // Chrome 1 - 88
+  isChromeLikeBrowser(): boolean {
+    const windowsAny: any = window;
+    return !!windowsAny.chrome && (!!windowsAny.chrome.webstore || !!windowsAny.chrome.runtime);
+  }
+  // Edge (based on chromium) detection
+  isEdgeChromiumBrowser(): boolean {
+    return this.isChromeLikeBrowser() && navigator.userAgent.indexOf('Edg') !== -1;
+  }
+
   isMobilePlatform(platformName: string): boolean {
     return platformName === PlatformType.Android;
   }