From e99b83dfdcf45832fa8ac9458f19d68c1c573a6c Mon Sep 17 00:00:00 2001
From: Eugene Pankov <john.pankov@gmail.com>
Date: Wed, 5 Feb 2020 14:15:51 +0300
Subject: [PATCH] recovery fixes

---
 terminus-core/src/services/tabRecovery.service.ts |  4 +++-
 .../src/components/settingsTab.component.ts       |  4 ----
 terminus-settings/src/index.ts                    |  4 +---
 terminus-settings/src/recoveryProvider.ts         | 15 ---------------
 4 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 terminus-settings/src/recoveryProvider.ts

diff --git a/terminus-core/src/services/tabRecovery.service.ts b/terminus-core/src/services/tabRecovery.service.ts
index 49be0a47..bf9161a4 100644
--- a/terminus-core/src/services/tabRecovery.service.ts
+++ b/terminus-core/src/services/tabRecovery.service.ts
@@ -25,7 +25,9 @@ export class TabRecoveryService {
                         let token = tab.getRecoveryToken()
                         if (token) {
                             token = token.then(r => {
-                                r.tabColor = tab.color
+                                if (r) {
+                                    r.tabColor = tab.color
+                                }
                                 return r
                             })
                         }
diff --git a/terminus-settings/src/components/settingsTab.component.ts b/terminus-settings/src/components/settingsTab.component.ts
index d934ef89..0a7b3d15 100644
--- a/terminus-settings/src/components/settingsTab.component.ts
+++ b/terminus-settings/src/components/settingsTab.component.ts
@@ -99,10 +99,6 @@ export class SettingsTabComponent extends BaseTabComponent {
         this.isShellIntegrationInstalled = await this.shellIntegration.isInstalled()
     }
 
-    async getRecoveryToken (): Promise<any> {
-        return null
-    }
-
     ngOnDestroy () {
         this.configSubscription.unsubscribe()
         this.config.save()
diff --git a/terminus-settings/src/index.ts b/terminus-settings/src/index.ts
index 29445bae..5ffb63fa 100644
--- a/terminus-settings/src/index.ts
+++ b/terminus-settings/src/index.ts
@@ -3,7 +3,7 @@ import { BrowserModule } from '@angular/platform-browser'
 import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 
-import TerminusCorePlugin, { ToolbarButtonProvider, TabRecoveryProvider, HotkeyProvider, ConfigProvider } from 'terminus-core'
+import TerminusCorePlugin, { ToolbarButtonProvider, HotkeyProvider, ConfigProvider } from 'terminus-core'
 
 import { HotkeyInputModalComponent } from './components/hotkeyInputModal.component'
 import { MultiHotkeyInputComponent } from './components/multiHotkeyInput.component'
@@ -11,7 +11,6 @@ import { SettingsTabComponent } from './components/settingsTab.component'
 import { SettingsTabBodyComponent } from './components/settingsTabBody.component'
 
 import { ButtonProvider } from './buttonProvider'
-import { RecoveryProvider } from './recoveryProvider'
 import { SettingsHotkeyProvider } from './hotkeys'
 import { SettingsConfigProvider } from './config'
 
@@ -25,7 +24,6 @@ import { SettingsConfigProvider } from './config'
     ],
     providers: [
         { provide: ToolbarButtonProvider, useClass: ButtonProvider, multi: true },
-        { provide: TabRecoveryProvider, useClass: RecoveryProvider, multi: true },
         { provide: ConfigProvider, useClass: SettingsConfigProvider, multi: true },
         { provide: HotkeyProvider, useClass: SettingsHotkeyProvider, multi: true },
     ],
diff --git a/terminus-settings/src/recoveryProvider.ts b/terminus-settings/src/recoveryProvider.ts
deleted file mode 100644
index 90fdbb5a..00000000
--- a/terminus-settings/src/recoveryProvider.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Injectable } from '@angular/core'
-import { TabRecoveryProvider, RecoveredTab } from 'terminus-core'
-
-import { SettingsTabComponent } from './components/settingsTab.component'
-
-/** @hidden */
-@Injectable()
-export class RecoveryProvider extends TabRecoveryProvider {
-    async recover (recoveryToken: any): Promise<RecoveredTab|null> {
-        if (recoveryToken && recoveryToken.type === 'app:settings') {
-            return { type: SettingsTabComponent }
-        }
-        return null
-    }
-}