Please fork for AOL Reader

app/assistants/add-assistant.js

@@ -93,8 +93,8 @@ var AddAssistant = Class.create(BaseAssistant, {
   },
 
   subscriptionSearchFailure: function() {
-    this.controller.get("search").mojo.disabled = false
-    this.controller.get("search").mojo.deactivate()
+    this.controller.get("search-submit").mojo.disabled = false
+    this.controller.get("search-submit").mojo.deactivate()
     this.controller.modelChanged(this.searchButton)
     this.menuPanelOff()
     this.controller.get("error-message").update($L("Unable to add subscription"))

app/assistants/article-assistant.js

@@ -64,6 +64,7 @@ var ArticleAssistant = Class.create(BaseAssistant, {
 
   setFontSize: function() {
     var summary = this.controller.get("summary")
+    summary.removeClassName("tiny")
     summary.removeClassName("small")
     summary.removeClassName("medium")
     summary.removeClassName("large")

app/assistants/articles-assistant.js

@@ -1,6 +1,7 @@
 var ArticlesAssistant = Class.create(BaseAssistant, {
-  initialize: function($super, subscription) {
+  initialize: function($super, api, subscription) {
     $super()
+    this.api = api
     this.subscription = subscription
     this.subscription.reset()
   },
@@ -315,7 +316,14 @@ var ArticlesAssistant = Class.create(BaseAssistant, {
   },
 
   doSearch: function(query) {
-    this.controller.stageController.pushScene("articles", new Search(this.subscription.api, query, this.subscription.id))
+    if(this.api.supportsSearch())
+    {
+    	this.controller.stageController.pushScene("articles", this.api, new Search(this.subscription.api, query, this.subscription.id))
+    }
+    else
+    {
+    	Feeder.notify($L("Search Not Available"))
+    }
   },
 
   handleCommand: function($super, event) {

app/assistants/base-assistant.js

@@ -269,12 +269,18 @@ var BaseAssistant = Class.create({
   },
 
   listenForSearch: function() {
-    $(this.controller.document).observe("keypress", this.startSearch)
-    this.controller.get("search-text").mojo.setConsumesEnterKey(false)
+    if(this.api.supportsSearch())
+    {
+    	$(this.controller.document).observe("keypress", this.startSearch)
+    	this.controller.get("search-text").mojo.setConsumesEnterKey(false)
+    }
   },
 
   stopListeningForSearch: function() {
-    $(this.controller.document).stopObserving("keypress", this.startSearch)
+  	if(this.api.supportsSearch())
+    {
+    	$(this.controller.document).stopObserving("keypress", this.startSearch)
+    }
   },
 
   scrollToTop: function() {
@@ -317,8 +323,11 @@ var BaseAssistant = Class.create({
       items.push({label: $L("Hide read feeds"), command: "hide-read-feeds"});
     }
 
-    items.push({label: $L("Search"), command: "search"});
-
+    if(this.api.supportsSearch())
+    {
+    	items.push({label: $L("Search"), command: "search"});
+	}
+
     this.controller.popupSubmenu({
       placeNear: this.controller.get("header-text"),
       items: items,
@@ -351,8 +360,12 @@ var BaseAssistant = Class.create({
     }
 
     items.push({label: $L("Refresh"), command: "refresh"});
-    items.push({label: $L("Search"), command: "search"});
 
+    if(this.api.supportsSearch())
+    {
+    	items.push({label: $L("Search"), command: "search"});
+	}
+
     this.controller.popupSubmenu({
       placeNear: this.controller.get("header-text"),
       items: items,

app/assistants/credentials-assistant.js

@@ -6,22 +6,37 @@ var CredentialsAssistant = Class.create(BaseAssistant, {
     this.showMessage = showMessage
     this.button = {buttonLabel: $L("Login")}
     this.hideLogout = true
+
+    this.serviceChoices = [
+      {label: $L("AOL Reader"), value: "aol"},
+      {label: $L("BazQux"), value: "bq"},
+      {label: $L("Feedly"), value: "feedly"},
+      {label: $L("InoReader"), value: "ino"},
+      {label: $L("OwnCloud News"), value: "oc"},
+      {label: $L("The Old Reader"), value: "tor"},
+      {label: $L("Tiny Tiny RSS"), value: "ttrss"}
+    ]
   },
 
   setup: function($super) {
     $super()
     this.setupWidgets()
     this.setupListeners()
 
-    this.controller.update("email-label", $L("Email"))
+    this.controller.update("email-label", $L("Username"))
     this.controller.update("password-label", $L("Password"))
+    this.controller.update("service-label", $L("Service"))
+    this.controller.update("server-label", $L("Server URL"))
     this.controller.update("error-message", $L("Login failed. Try again."))
   },
 
   activate: function($super, changes) {
-    $super(changes)
+    $super(changes)    
     this.controller.get("password").mojo.setConsumesEnterKey(false)
+    this.controller.get("server").mojo.setConsumesEnterKey(false)
     this.controller.get("login-failure")[this.showMessage ? "show" : "hide"]()
+    var initializeFields = {value: this.credentials.service}
+    this.setService(initializeFields)
   },
 
   cleanup: function($super) {
@@ -30,31 +45,64 @@ var CredentialsAssistant = Class.create(BaseAssistant, {
   },
 
   setupWidgets: function() {
+    this.controller.setupWidget("service", {modelProperty: "service", choices: this.serviceChoices}, this.credentials)
     this.controller.setupWidget("email", {modelProperty: "email", changeOnKeyPress: true, autoFocus: true, textCase: Mojo.Widget.steModeLowerCase}, this.credentials)
     this.controller.setupWidget("password", {modelProperty: "password", changeOnKeyPress: true}, this.credentials)
+    this.controller.setupWidget("server", {modelProperty: "server", changeOnKeyPress: true, textCase: Mojo.Widget.steModeLowerCase}, this.credentials)
     this.controller.setupWidget("login", {type: Mojo.Widget.activityButton}, this.button)
   },
 
   setupListeners: function() {
     this.propertyChanged = this.propertyChanged.bind(this)
     this.login = this.login.bind(this)
 
-		this.controller.listen("password", Mojo.Event.propertyChange, this.propertyChanged)
+	this.controller.listen("password", Mojo.Event.propertyChange, this.propertyChanged)
+	this.controller.listen("server", Mojo.Event.propertyChange, this.propertyChanged)
+	this.controller.listen("service", Mojo.Event.propertyChange, this.setService = this.setService.bind(this))
     this.controller.listen("login", Mojo.Event.tap, this.login)
   },
 
   cleanupListeners: function() {
-		this.controller.stopListening("password", Mojo.Event.propertyChange, this.propertyChanged)
+	this.controller.stopListening("password", Mojo.Event.propertyChange, this.propertyChanged)
+	this.controller.stopListening("server", Mojo.Event.propertyChange, this.propertyChanged)
     this.controller.stopListening("login", Mojo.Event.tap, this.login)
+    this.controller.stopListening("service", Mojo.Event.propertyChange, this.setService)
   },
 
   propertyChanged: function(event) {
     if(Mojo.Char.enter === event.originalEvent.keyCode) {
-      this.login()
+    	if ((event.property === "password" && this.controller.get("server-group").style.display === "none") || event.property === "server")
+    	{	
+      		this.login()
+    	} 
+    	else if ((event.property === "password" && this.controller.get("server-group").style.display !== "none")) {
+    		this.controller.get("server").mojo.focus()	
+    	}
     }
   },
 
   login: function() {
     this.controller.stageController.swapScene("login", this.credentials)
-  }
+  },
+
+  setService: function(propertyChangeEvent) {
+  	if (propertyChangeEvent.value == "feedly" || propertyChangeEvent.value == "aol")
+  	{
+  		this.controller.get("email-group")["hide"]()
+  		this.controller.get("password-group")["hide"]()
+ 		this.controller.get("server-group")["hide"]()
+  	}
+  	else if (propertyChangeEvent.value == "ttrss" || propertyChangeEvent.value == "oc")
+  	{
+  		this.controller.get("email-group")["show"]()
+  		this.controller.get("password-group")["show"]()
+ 		this.controller.get("server-group")["show"]()
+  	}
+  	else
+  	{
+  		this.controller.get("email-group")["show"]()
+  		this.controller.get("password-group")["show"]()
+ 		this.controller.get("server-group")["hide"]()
+  	}
+  },
 })

app/assistants/folder-assistant.js

@@ -1,6 +1,7 @@
 var FolderAssistant = Class.create(BaseAssistant, {
-  initialize: function($super, folder) {
+  initialize: function($super, api, folder) {
     $super()
+    this.api = api
     this.folder = folder
     this.subscriptions = {items: []}
   },
@@ -74,7 +75,7 @@ var FolderAssistant = Class.create(BaseAssistant, {
   },
 
   folderTapped: function(event) {
-    this.controller.stageController.pushScene("articles", event.item)
+    this.controller.stageController.pushScene("articles", this.api, event.item)
   },
 
   folderRendered: function(listWidget, itemModel, itemNode) {
@@ -108,7 +109,14 @@ var FolderAssistant = Class.create(BaseAssistant, {
   },
 
   doSearch: function(query) {
-    this.controller.stageController.pushScene("articles", new Search(this.folder.api, query, this.folder.id))
+    if(this.api.supportsSearch())
+    {
+    	this.controller.stageController.pushScene("articles", this.api, new Search(this.folder.api, query, this.folder.id))
+    }
+    else
+    {
+    	Feeder.notify($L("Search Not Available"))
+    }
   },
 
   handleCommand: function($super, event) {

app/assistants/home-assistant.js

@@ -10,7 +10,6 @@ var HomeAssistant = Class.create(BaseAssistant, {
 
   setup: function($super) {
     $super()
-    Feeder.Metrix.checkBulletinBoard(this.controller, 20);
     this.setupLists()
     this.setupListeners()
     this.setupSearch()
@@ -122,8 +121,14 @@ var HomeAssistant = Class.create(BaseAssistant, {
 
     if("logout" == command) {
       var creds = new Credentials()
-      creds.password = false
-      creds.save()
+      creds.password = null
+      creds.server = null
+      creds.id = null
+	  creds.refreshToken = null
+	  creds.accessToken = null
+	  creds.tokenType = null
+	  creds.plan = null
+      creds.clear()
       this.controller.stageController.swapScene("credentials", creds)
     }
     else if(command && command.feedAdded) {
@@ -165,10 +170,10 @@ var HomeAssistant = Class.create(BaseAssistant, {
 
   sourceTapped: function(event) {
     if(event.item.isFolder && !Preferences.combineFolders()) {
-      this.controller.stageController.pushScene("folder", event.item)
+      this.controller.stageController.pushScene("folder", this.api, event.item)
     }
     else {
-      this.controller.stageController.pushScene("articles", event.item)
+      this.controller.stageController.pushScene("articles", this.api, event.item)
     }
   },
 
@@ -248,6 +253,13 @@ var HomeAssistant = Class.create(BaseAssistant, {
   },
 
   doSearch: function(query) {
-    this.controller.stageController.pushScene("articles", new Search(this.api, query))
+  	if(this.api.supportsSearch())
+    {
+    	this.controller.stageController.pushScene("articles", this.api, new Search(this.api, query))
+    }
+    else
+    {
+    	Feeder.notify($L("Search Not Available"))
+    }
   }
 })

app/assistants/login-assistant.js

@@ -5,14 +5,11 @@ var LoginAssistant = Class.create(BaseAssistant, {
     this.credentials = credentials || new Credentials()
     this.api = new Api()
     this.triedLogin = false
-    this.hideLogout = true
+    this.hideLogout = true   
   },
 
   setup: function($super) {
     $super()
-
-    Log.debug("sending metrix data")
-    Feeder.Metrix.postDeviceData()
   },
 
   activate: function($super, changes) {
@@ -23,15 +20,15 @@ var LoginAssistant = Class.create(BaseAssistant, {
       parameters: {},
 
       onSuccess: function(response) {
-        if(this.credentials.email && this.credentials.password) {
+        if(((this.credentials.service !== "ttrss" || this.credentials.service !== "oc") && this.credentials.email && this.credentials.password) || ((this.credentials.service === "ttrss" || this.credentials.service === "oc") && this.credentials.email && this.credentials.password && this.credentials.server) || this.credentials.service === "feedly" || this.credentials.service === "aol" ) {
           if(this.triedLogin) {
             Log.debug("ALREADY TRIED LOGGING IN, WHAT MAKES YOU THINK ITS GOING TO WORK NOW")
           }
           else {
             this.triedLogin = true
             Log.debug("logging in as " + this.credentials.email)
             this.spinnerOn($L("logging in..."))
-            this.api.login(this.credentials, this.loginSuccess.bind(this), this.loginFailure.bind(this))
+            this.api.login(this.credentials, this.loginSuccess.bind(this), this.loginFailure.bind(this), this.controller)
           }
         }
         else {