1 files changed, 25 insertions, 6 deletions

diff --git a/src/models/Service.js b/src/models/Service.js
index 4b5e8592d..ef1276619 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -4,8 +4,9 @@ import normalizeUrl from 'normalize-url';
 import path from 'path';
 
 import userAgent from '../helpers/userAgent-helpers';
+import { TODOS_RECIPE_ID, todosStore } from '../features/todos';
 
-const debug = require('debug')('Ferdi:Service');
+const debug = require('debug')('Franz:Service');
 
 export const RESTRICTION_TYPES = {
   SERVICE_LIMIT: 0,
@@ -17,7 +18,7 @@ export default class Service {
 
   recipe = '';
 
-  webview = null;
+  _webview = null;
 
   timer = null;
 
@@ -77,13 +78,15 @@ export default class Service {
 
   @observable restrictionType = null;
 
-  @observable disableHibernation = false;
+  @observable isHibernationEnabled = false;
+
+  @observable isHibernating = false;
 
   @observable lastUsed = Date.now(); // timestamp
 
-  @observable lastPoll = null;
+  @observable lastPoll = Date.now();
 
-  @observable lastPollAnswer = null;
+  @observable lastPollAnswer = Date.now();
 
   @observable lostRecipeConnection = false;
 
@@ -136,7 +139,7 @@ export default class Service {
 
     this.spellcheckerLanguage = data.spellcheckerLanguage !== undefined ? data.spellcheckerLanguage : this.spellcheckerLanguage;
 
-    this.disableHibernation = data.disableHibernation !== undefined ? data.disableHibernation : this.disableHibernation;
+    this.isHibernationEnabled = data.isHibernationEnabled !== undefined ? data.isHibernationEnabled : this.isHibernationEnabled;
 
     this.recipe = recipe;
 
@@ -177,6 +180,18 @@ export default class Service {
     };
   }
 
+  get webview() {
+    if (this.recipe.id === TODOS_RECIPE_ID) {
+      return todosStore.webview;
+    }
+
+    return this._webview;
+  }
+
+  set webview(webview) {
+    this._webview = webview;
+  }
+
   @computed get url() {
     if (this.recipe.hasCustomUrl && this.customUrl) {
       let url;
@@ -225,6 +240,10 @@ export default class Service {
     return ua;
   }
 
+  @computed get partition() {
+    return this.recipe.partition || `persist:service-${this.id}`;
+  }
+
 
   initializeWebViewEvents({ handleIPCMessage, openWindow, stores }) {
     const webContents = remote.webContents.fromId(this.webview.getWebContentsId());