Remove legacy support for 2.X (#65)

* Remove legacy support for 2.X

* Fix bad merge

Author: derme302

src/app/services/bookmark.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { StorageService } from '../services/storage.service';
 
-const BOOKMARK_FEED_LIST = 'bookmark_feed_list';
+const BOOKMARK_FEED_LIST = 'v3_bookmark_feed_list';
 
 @Injectable({
   providedIn: 'root'
@@ -30,7 +30,6 @@ export class BookmarkService {
     this._bookmarkList.push(entry);
     console.log('[BookmarkService] Adding new feed');
     this.storageService.set(BOOKMARK_FEED_LIST, this._bookmarkList);
-    this.feedService.updateBookmarkStatus(entry, true);
   }
 
   public removeEntry(entry: string) {
@@ -40,7 +39,6 @@ export class BookmarkService {
       this._bookmarkList.splice(index, 1);
     }
     this.storageService.set(BOOKMARK_FEED_LIST, this._bookmarkList);
-    this.feedService.updateBookmarkStatus(entry, false);
   }
 
   public getBookmarks() {

src/app/services/feed.service.ts

@@ -5,8 +5,8 @@ import { StorageService } from './storage.service';
 import { SourcesService } from './sources.service';
 import { ISettingsDict, SettingsService } from './settings.service';
 
-const STORAGE_FEED_DATA = 'storage_list_feed_data';
-const STORAGE_FEED_DATA_TIMESTAMP = 'storage_list_feed_data_timestamp';
+const STORAGE_FEED_DATA = 'v3_storage_list_feed_data';
+const STORAGE_FEED_DATA_TIMESTAMP = 'v3_storage_list_feed_data_timestamp';
 
 @Injectable({
   providedIn: 'root'

src/app/services/settings.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { StorageService } from '../services/storage.service';
 
-const SETTINGS_DICT = 'settings_dict';
+const SETTINGS_DICT = 'v3_settings_dict';
 
 export interface ISettingsDict {
     preview: boolean,
@@ -60,11 +60,6 @@ export class SettingsService {
     const storage_feed = await this.storageService.getObjectFromStorage(SETTINGS_DICT);
 
     if (storage_feed !== null) {
-      // Backwards compatible check with <= 2.3.4
-      if (!Array.isArray(storage_feed.mutedWords)) {
-        storage_feed.mutedWords = [];
-      }
-
       this._settingsDict = storage_feed;
     }
     else

src/app/services/sources.service.ts

@@ -8,7 +8,7 @@ import { Subject } from 'rxjs';
 import { BookmarkService } from './bookmark.service';
 declare const RSSParser: any;
 
-const STORAGE_FEED_LIST = 'storage_feed_list';
+const STORAGE_FEED_LIST = 'v3_storage_feed_list';
 
 export interface IFeedDict {
   url: string,

src/app/services/storage.service.ts

@@ -38,7 +38,7 @@ export class StorageService {
       const storage_item = await this.get(list_name);
 
       if (storage_item !== undefined) {
-        const storage_item_json = this.legacyParseJson(storage_item);
+        const storage_item_json = storage_item;
 
         if (storage_item_json !== null) {
           return storage_item_json;
@@ -58,13 +58,4 @@ export class StorageService {
     }
   }
 
-  // Support for legacy single encoded values in version before 2.6.0
-  private legacyParseJson(storage_item: string) {
-    try {
-      return JSON.parse(storage_item);
-    } catch (e) {
-      console.log('[StorageService] Single encoded value, directly returning:', e);
-      return storage_item;
-    }
-  }
 }

src/app/sources/sources.page.ts

@@ -70,10 +70,6 @@ export class SourcesPage {
     }
   }
 
-  public load() {
-    this.sourcesService.loadSourcesList();
-  }
-
   async editUrl(feed: IFeedDict) {
     const temp_feed = feed;
 
@@ -190,8 +186,4 @@ export class SourcesPage {
     input.value = '';
   }
 
-  // removeUrl(url: string) {
-  //   this.sourcesService.removeSource(url);
-  // }
-
 }