[POC] remove client-side cache because we can simply keep the data in memory

js/app.js

@@ -31,7 +31,6 @@ define(function(require) {
 	var Marionette = require('marionette');
 	var OC = require('OC');
 	var AppView = require('views/appview');
-	var Cache = require('cache');
 	var Radio = require('radio');
 	var Router = require('router');
 	var AccountController = require('controller/accountcontroller');
@@ -53,8 +52,6 @@ define(function(require) {
 	Marionette.TemplateCache.prototype.compileTemplate = function(rawTemplate) {
 		return Handlebars.compile(rawTemplate);
 	};
-	Marionette.ItemView.prototype.modelEvents = {change: 'render'};
-	Marionette.CompositeView.prototype.modelEvents = {change: 'render'};
 
 	var Mail = Marionette.Application.extend({
 		registerProtocolHandler: function() {
@@ -84,8 +81,6 @@ define(function(require) {
 
 	Mail.on('start', function() {
 		this.view = new AppView();
-		Cache.init();
-
 		Radio.ui.trigger('content:loading');
 
 		this.registerProtocolHandler();

js/background.js

@@ -16,9 +16,9 @@ define(function(require) {
 	var _ = require('underscore');
 	var $ = require('jquery');
 	var OC = require('OC');
-	var Cache = require('cache');
 	var Radio = require('radio');
 	var State = require('state');
+	var Message = require('models/message');
 	var MessageCollection = require('models/messagecollection');
 
 	/*jshint maxparams: 6 */
@@ -127,19 +127,16 @@ define(function(require) {
 						localFolder.set('unseen', changes.unseen);
 						localFolder.set('total', changes.total);
 
+						var messages = _.map(changes.messages, function(messageData) {
+							return new Message(messageData);
+						});
+						changedFolder.get('messages').add(messages);
+
 						// reload if current selected folder has changed
 						if (State.currentAccount === changedAccount &&
 							State.currentFolder.get('id') === changes.id) {
 							Radio.ui.request('messagesview:collection').add(changes.messages);
-							var messages = new MessageCollection(changes.messages).slice(0);
-							Radio.message.trigger('fetch:bodies', changedAccount, changedFolder, messages);
-						}
-
-						// Save new messages to the cached message list
-						var cachedList = Cache.getMessageList(changedAccount, localFolder);
-						if (cachedList) {
-							cachedList = cachedList.concat(changes.messages);
-							Cache.addMessageList(changedAccount, localFolder, cachedList);
+							Radio.message.trigger('fetch:bodies', changedAccount, changedFolder, new MessageCollection(messages));
 						}
 
 						Radio.ui.trigger('title:update');

js/controller/foldercontroller.js

@@ -50,13 +50,6 @@ define(function(require) {
 	function loadFolderMessages(account, folder, noSelect, searchQuery) {
 		Radio.ui.trigger('composer:leave');
 
-		if (require('state').messagesLoading !== null) {
-			require('state').messagesLoading.abort();
-		}
-		if (require('state').messageLoading !== null) {
-			require('state').messageLoading.abort();
-		}
-
 		// Set folder active
 		Radio.folder.trigger('setactive', account, folder);
 
@@ -70,9 +63,8 @@ define(function(require) {
 			require('state').currentlyLoading = null;
 		} else {
 			var loadingMessages = Radio.message.request('entities', account, folder, {
-				cache: true,
 				filter: searchQuery,
-				replace: true
+				cache: true
 			});
 
 			$.when(loadingMessages).done(function(messages, cached) {
@@ -91,7 +83,7 @@ define(function(require) {
 
 				if (messages.length > 0) {
 					// Fetch first 10 messages in background
-					Radio.message.trigger('fetch:bodies', account, folder, messages.slice(0, 10));
+					// Radio.message.trigger('fetch:bodies', account, folder, messages.slice(0, 10));
 
 					Radio.message.trigger('load', account, folder, messages.first());
 
@@ -163,13 +155,7 @@ define(function(require) {
 	 */
 	function fetchBodies(account, folder, messages) {
 		if (messages.length > 0) {
-			var ids = _.map(messages, function(message) {
-				return message.get('id');
-			});
-			var fetchingMessageBodies = Radio.message.request('bodies', account, folder, ids);
-			$.when(fetchingMessageBodies).done(function(messages) {
-				require('cache').addMessages(account, folder, messages);
-			});
+			Radio.message.request('bodies', account, folder, messages);
 		}
 	}
 

js/controller/messagecontroller.js

@@ -52,15 +52,6 @@ define(function(require) {
 
 		Radio.ui.trigger('composer:leave');
 
-		// TODO: expression is useless?
-		if (!options.force && false) {
-			return;
-		}
-		// Abort previous loading requests
-		if (require('state').messageLoading !== null) {
-			require('state').messageLoading.abort();
-		}
-
 		// check if message is a draft
 		var draftsFolder = account.get('specialFolders').drafts;
 		var draft = draftsFolder === require('state').currentFolder.get('id');
@@ -87,16 +78,12 @@ define(function(require) {
 		var fetchingMessage = Radio.message.request('entity',
 			require('state').currentAccount,
 			require('state').currentFolder,
-			message.get('id'));
+			message);
 
 		$.when(fetchingMessage).done(function(message) {
 			if (draft) {
 				Radio.ui.trigger('composer:show', message);
 			} else {
-				// TODO: ideally this should be handled in messageservice.js
-				require('cache').addMessage(require('state').currentAccount,
-					require('state').currentFolder,
-					message);
 				Radio.ui.trigger('message:show', message);
 			}
 		});