From b3a95d55b1cf58fdc699fb5e51b1479bffe1f362 Mon Sep 17 00:00:00 2001
From: Javier Gamarra <javier.gamarra@liferay.com>
Date: Thu, 16 Jun 2016 15:19:08 +0200
Subject: [PATCH 01/34] use the value directly instead of an indirection that
 causes a bug in some phones/apps

---
 .../main/res/layout/ddlfield_document_chose_option_default.xml  | 2 +-
 .../src/main/res/layout/user_portrait_chose_origin_default.xml  | 2 +-
 android/library/src/main/res/values/styles.xml                  | 2 +-
 .../src/main/res/drawable-v21/westeros_dark_button_ripple.xml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/android/library/src/main/res/layout/ddlfield_document_chose_option_default.xml b/android/library/src/main/res/layout/ddlfield_document_chose_option_default.xml
index 823f2ce612..383ed83545 100644
--- a/android/library/src/main/res/layout/ddlfield_document_chose_option_default.xml
+++ b/android/library/src/main/res/layout/ddlfield_document_chose_option_default.xml
@@ -17,7 +17,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_below="@id/liferay_dialog_title"
-		android:divider="?android:attr/textColorSecondary"
+		android:divider="@color/textColorSecondary"
 		android:orientation="vertical"
 		android:showDividers="middle">
 
diff --git a/android/library/src/main/res/layout/user_portrait_chose_origin_default.xml b/android/library/src/main/res/layout/user_portrait_chose_origin_default.xml
index a38e53548b..9303a0eb3d 100644
--- a/android/library/src/main/res/layout/user_portrait_chose_origin_default.xml
+++ b/android/library/src/main/res/layout/user_portrait_chose_origin_default.xml
@@ -17,7 +17,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_below="@id/liferay_dialog_title"
-		android:divider="?android:attr/textColorSecondary"
+		android:divider="@color/textColorSecondary"
 		android:orientation="vertical"
 		android:showDividers="middle">
 
diff --git a/android/library/src/main/res/values/styles.xml b/android/library/src/main/res/values/styles.xml
index 7f7a862633..a84f48c389 100644
--- a/android/library/src/main/res/values/styles.xml
+++ b/android/library/src/main/res/values/styles.xml
@@ -75,7 +75,7 @@
 
 	<style name="base_default_checkbox">
 		<item name="android:padding">@dimen/default_edit_text_padding</item>
-		<item name="android:textColor">?android:attr/textColorPrimary</item>
+		<item name="android:textColor">@color/textColorPrimary</item>
 		<item name="android:theme">?attr/theme</item>
 		<item name="android:textSize">14sp</item>
 	</style>
diff --git a/android/viewsets/westeros/src/main/res/drawable-v21/westeros_dark_button_ripple.xml b/android/viewsets/westeros/src/main/res/drawable-v21/westeros_dark_button_ripple.xml
index 9155d91680..b935d8eacd 100644
--- a/android/viewsets/westeros/src/main/res/drawable-v21/westeros_dark_button_ripple.xml
+++ b/android/viewsets/westeros/src/main/res/drawable-v21/westeros_dark_button_ripple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-		android:color="?android:attr/textColorPrimary">
+		android:color="@color/textColorPrimary">
 	<item>
 		<shape xmlns:android="http://schemas.android.com/apk/res/android">
 			<corners android:radius="3dp"/>

From add298742e5c88b1570a2fd481c7e04d140a94ea Mon Sep 17 00:00:00 2001
From: Javier Gamarra <javier.gamarra@liferay.com>
Date: Wed, 6 Jul 2016 13:11:50 +0200
Subject: [PATCH 02/34] fix form adapter

---
 .../ddl/pager/DDLFormPagerViewAdapter.java    | 39 ++++++++-----------
 .../src/main/res/layout/ddl_form_pager.xml    | 35 ++++++++++++++---
 2 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/android/library/src/main/java/com/liferay/mobile/screens/viewsets/defaultviews/ddl/pager/DDLFormPagerViewAdapter.java b/android/library/src/main/java/com/liferay/mobile/screens/viewsets/defaultviews/ddl/pager/DDLFormPagerViewAdapter.java
index dd9c9caf02..8177a184ea 100644
--- a/android/library/src/main/java/com/liferay/mobile/screens/viewsets/defaultviews/ddl/pager/DDLFormPagerViewAdapter.java
+++ b/android/library/src/main/java/com/liferay/mobile/screens/viewsets/defaultviews/ddl/pager/DDLFormPagerViewAdapter.java
@@ -1,11 +1,11 @@
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- *
+ * <p>
  * This library is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the Free
  * Software Foundation; either version 2.1 of the License, or (at your option)
  * any later version.
- *
+ * <p>
  * This library is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
@@ -19,7 +19,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 
 import com.liferay.mobile.screens.ddl.form.view.DDLFieldViewModel;
 import com.liferay.mobile.screens.ddl.model.Field;
@@ -32,8 +31,7 @@
  */
 public class DDLFormPagerViewAdapter extends PagerAdapter {
 
-	public DDLFormPagerViewAdapter(
-		List<Field> fields, Map<Field.EditorType, Integer> layoutIds) {
+	public DDLFormPagerViewAdapter(List<Field> fields, Map<Field.EditorType, Integer> layoutIds) {
 
 		_fields = fields;
 		_layoutIds = layoutIds;
@@ -41,34 +39,31 @@ public DDLFormPagerViewAdapter(
 
 	@Override
 	public int getCount() {
-		return 2;
+		return _fields.size();
 	}
 
 	@Override
 	public Object instantiateItem(ViewGroup container, int position) {
 		Context context = container.getContext();
-		LinearLayout layout = new LinearLayout(context);
-		layout.setOrientation(LinearLayout.VERTICAL);
 
-		int nFields = 2;
+		Field field = _fields.get(position);
+		Field.EditorType type = field.getEditorType();
+		int layoutId = _layoutIds.get(type);
 
-		for (int i = 0; i < nFields; i++) {
-			Field field = _fields.get(i);
-			Field.EditorType type = field.getEditorType();
-			int layoutId = _layoutIds.get(type);
+		LayoutInflater inflater = LayoutInflater.from(context);
+		View view = inflater.inflate(layoutId, container, false);
 
-			LayoutInflater inflater = LayoutInflater.from(context);
-			View view = inflater.inflate(layoutId, layout, false);
+		DDLFieldViewModel viewModel = (DDLFieldViewModel) view;
+		viewModel.setField(field);
 
-			DDLFieldViewModel viewModel = (DDLFieldViewModel) view;
-			viewModel.setField(field);
+		container.addView(view);
 
-			layout.addView(view);
-		}
-
-		container.addView(layout);
+		return view;
+	}
 
-		return layout;
+	@Override
+	public void destroyItem(ViewGroup container, int position, Object object) {
+		container.removeView((View) object);
 	}
 
 	@Override
diff --git a/android/library/src/main/res/layout/ddl_form_pager.xml b/android/library/src/main/res/layout/ddl_form_pager.xml
index 6c6ed2b29c..d52d2dc0db 100644
--- a/android/library/src/main/res/layout/ddl_form_pager.xml
+++ b/android/library/src/main/res/layout/ddl_form_pager.xml
@@ -1,10 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.liferay.mobile.screens.viewsets.defaultviews.ddl.pager.DDLFormPagerView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
 
-	<android.support.v4.view.ViewPager
-		android:id="@+id/liferay_pager"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/liferay_pager"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10dp" />
+
+        <ProgressBar
+            android:id="@+id/ddlform_loading_screen_progress_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="invisible" />
+
+        <Button
+            android:id="@+id/liferay_form_submit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/submit"
+            android:visibility="gone" />
+
+    </LinearLayout>
 </com.liferay.mobile.screens.viewsets.defaultviews.ddl.pager.DDLFormPagerView>
\ No newline at end of file

From 5e795e21671f3eb7bbf2ad8fa9554a4a808197ba Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Thu, 7 Jul 2016 10:15:17 +0200
Subject: [PATCH 03/34] LSR-875 Add stream mode in table list

---
 .../BaseListPageLoadInteractor.swift          | 89 ++++++++++++-------
 .../BaseListScreenlet/BaseListScreenlet.swift |  9 +-
 .../Base/BaseListScreenlet/BaseListView.swift | 16 +++-
 .../TableView/BaseListTableView.swift         | 56 ++++++++++--
 4 files changed, 128 insertions(+), 42 deletions(-)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
index 69e9f32a6a..9e697c5c5a 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
@@ -18,16 +18,17 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 
 	public let page: Int
 	public let computeRowCount: Bool
+    public var streamMode: Bool = false
 
 	public var resultAllPagesContent: [AnyObject?]?
 	public var resultPageContent: [AnyObject]?
 	public var resultRowCount: Int?
 
 
-	public init(screenlet: BaseListScreenlet, page: Int, computeRowCount: Bool) {
+    public init(screenlet: BaseListScreenlet, page: Int, computeRowCount: Bool) {
 		self.page = page
 		self.computeRowCount = computeRowCount
-
+        
 		super.init(screenlet: screenlet)
 	}
 
@@ -37,39 +38,65 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 
 	override public func completedConnector(op: ServerConnector) {
 		if let pageOp = op as? PaginationLiferayConnector {
-			processLoadPageResult(pageOp.resultPageContent ?? [], rowCount: pageOp.resultRowCount)
+            if !streamMode {
+                processLoadPageResult(pageOp.resultPageContent ?? [], rowCount: pageOp.resultRowCount)
+            } else {
+                processLoadPageResultForStream(pageOp.resultPageContent ?? [], rowCount: pageOp.resultRowCount)
+            }
 		}
 	}
 
-	public func processLoadPageResult(serverRows: [[String:AnyObject]], rowCount: Int?) {
-		let screenlet = self.screenlet as! BaseListScreenlet
-		let baseListView = screenlet.screenletView as! BaseListView
-
-		let actualRowCount = rowCount ?? baseListView.rowCount
-
-		let convertedRows = serverRows.map() { self.convertResult($0) }
-
-		var allRows = Array<AnyObject?>(count: actualRowCount, repeatedValue: nil)
-
-		for (index, row) in baseListView.rows.enumerate() {
-			allRows[index] = row
-		}
-
-		var offset = screenlet.firstRowForPage(page)
-
-		// last page could be incomplete
-		if offset >= actualRowCount {
-			offset = actualRowCount - 1
-		}
-
-		for (index, row) in convertedRows.enumerate() {
-			allRows[offset + index] = row
-		}
-
-		self.resultRowCount = actualRowCount
-		self.resultPageContent = convertedRows
-		self.resultAllPagesContent = allRows
+	public func processLoadPageResultForStream(serverRows: [[String:AnyObject]], rowCount: Int?) {
+        let screenlet = self.screenlet as! BaseListScreenlet
+        let baseListView = screenlet.screenletView as! BaseListView
+        
+        let actualRowCount = rowCount ?? baseListView.rowCount
+        
+        let convertedRows = serverRows.map() { self.convertResult($0) }
+        
+        var allRows = [AnyObject?]()
+        
+        allRows.appendContentsOf(baseListView.rows)
+        
+        for row in convertedRows {
+            allRows.append(row)
+        }
+        
+        self.resultRowCount = actualRowCount
+        self.resultPageContent = convertedRows
+        self.resultAllPagesContent = allRows
 	}
+    
+    public func processLoadPageResult(serverRows: [[String:AnyObject]], rowCount: Int?) {
+        let screenlet = self.screenlet as! BaseListScreenlet
+        let baseListView = screenlet.screenletView as! BaseListView
+        
+        let actualRowCount = rowCount ?? baseListView.rowCount
+        
+        let convertedRows = serverRows.map() { self.convertResult($0) }
+        
+        var allRows = Array<AnyObject?>(count: actualRowCount, repeatedValue: nil)
+        
+        for (index, row) in baseListView.rows.enumerate() {
+            allRows[index] = row
+        }
+        
+        var offset = screenlet.firstRowForPage(page)
+        
+        // last page could be incomplete
+        if offset >= actualRowCount {
+            offset = actualRowCount - 1
+        }
+        
+        for (index, row) in convertedRows.enumerate() {
+            allRows[offset + index] = row
+        }
+        
+        self.resultRowCount = actualRowCount
+        self.resultPageContent = convertedRows
+        self.resultAllPagesContent = allRows
+
+    }
 
 	public func convertResult(serverResult: [String:AnyObject]) -> AnyObject {
 		fatalError("convert(serverResult) must be overriden")
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
index f120fd1138..3d580aff31 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
@@ -29,8 +29,10 @@ import UIKit
 		}
 	}
 
-	@IBInspectable public var firstPageSize: Int = 50
-	@IBInspectable public var pageSize: Int = 25
+	@IBInspectable public var firstPageSize: Int = 12
+	@IBInspectable public var pageSize: Int = 10
+    
+    @IBInspectable public var streamMode: Bool = true
 
 	public var baseListView: BaseListView {
 		return screenletView as! BaseListView
@@ -47,6 +49,7 @@ import UIKit
 
 		(screenletView as? BaseListTableView)?.refreshClosure =
 				refreshControl ? self.loadList : nil
+        (screenletView as? BaseListTableView)?.streamMode = streamMode
 	}
 
 	override public func onShow() {
@@ -63,6 +66,8 @@ import UIKit
 		let interactor = createPageLoadInteractor(
 			page: page,
 			computeRowCount: (page == 0))
+        
+        interactor.streamMode = streamMode
 
 		paginationInteractors[page] = interactor
 
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
index 4e2291a076..fc77e8eb2f 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
@@ -15,6 +15,8 @@ import UIKit
 
 
 public class BaseListView: BaseScreenletView {
+    
+    public var streamMode: Bool = false
 
 	public var rowCount: Int {
 		return _rowCount
@@ -29,12 +31,22 @@ public class BaseListView: BaseScreenletView {
 
 	private var _rows = [AnyObject?]()
 	private var _rowCount = 0
-
-	public func setRows(newRows: [AnyObject?], rowCount: Int) {
+    
+    public var loadingRows = false
+    public var moreRows = true
+
+    public func setRows(newRows: [AnyObject?], rowCount: Int) {
+        loadingRows = false
+        
+        if _rows.count != 0 && _rows.count == newRows.count {
+            moreRows = false
+        }
 		_rowCount = rowCount
 
 		let oldRows = _rows
 		_rows = newRows
+        
+        
 		onChangedRows(oldRows)
 	}
 
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
index af2a5fe584..3397492e1f 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
@@ -53,6 +53,16 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 
 	override public func onChangedRows(oldRows: [AnyObject?]) {
 		super.onChangedRows(oldRows)
+        
+        if streamMode {
+            tableView!.reloadData()
+            if moreRows {
+                showProgressFooter()
+            } else {
+                hideProgressFooter()
+            }
+            return
+        }
 
 		if self.rows.isEmpty {
 			clearAllRows(oldRows)
@@ -80,16 +90,14 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 	//MARK: UITableViewDataSource
 
 	public func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-		return rowCount
+		return rows.count
 	}
 
 	public func tableView(tableView: UITableView,
 			cellForRowAtIndexPath
 			indexPath: NSIndexPath)
 			-> UITableViewCell {
-
 		let object: AnyObject? = rows[indexPath.row]
-
 		let cell = doDequeueReusableCell(row: indexPath.row, object: object)
 
 		if let object = object {
@@ -97,8 +105,9 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 		}
 		else {
 			doFillInProgressCell(row: indexPath.row, cell: cell)
-
-			fetchPageForRow?(indexPath.row)
+            if !streamMode {
+                fetchPageForRow?(indexPath.row)
+            }
 		}
 
 		return cell
@@ -111,6 +120,15 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 			onSelectedRowClosure?(row)
 		}
 	}
+    
+    public func tableView(tableView: UITableView, willDisplayCell cell: UITableViewCell, forRowAtIndexPath indexPath: NSIndexPath) {
+        if streamMode && !loadingRows && moreRows {
+            if indexPath.row == rows.count - 1 {
+                loadingRows = true
+                fetchPageForRow?(indexPath.row + 1)
+            }
+        }
+    }
 
 	public func doDequeueReusableCell(row row: Int, object: AnyObject?) -> UITableViewCell {
 		let cellId = doGetCellId(row: row, object: object)
@@ -138,6 +156,18 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 	public func doCreateCell(cellId: String) -> UITableViewCell {
 		return UITableViewCell(style: .Default, reuseIdentifier: cellId)
 	}
+    
+    public func createLoadingMoreView() -> UIView? {
+        let progressView = UIView(frame: CGRect(x: 0, y: 0, width: frame.width, height: 30))
+        
+        let indicatorView = UIActivityIndicatorView(activityIndicatorStyle: .Gray)
+        indicatorView.center = CGPoint(x: frame.width/2, y: indicatorView.center.y)
+        indicatorView.startAnimating()
+        
+        progressView.addSubview(indicatorView)
+        
+        return progressView
+    }
 
 
 	//MARK: Internal methods
@@ -161,17 +191,20 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 
 	internal func refreshControlBeginRefresh(sender:AnyObject?) {
 		dispatch_delayed(0.3) {
+            self.moreRows = true
 			self.refreshClosure?()
 		}
 	}
 
 	internal func insertFreshRows() {
+    
 		let indexPaths = (0..<self.rows.count).map {
 			NSIndexPath(forRow: $0, inSection: 0)
 		}
-
+        tableView!.beginUpdates()
 		tableView!.insertRowsAtIndexPaths(indexPaths, withRowAnimation:.Top)
-	}
+        tableView!.endUpdates()
+    }
 
 	internal func clearAllRows(currentRows: [AnyObject?]) {
 		tableView!.beginUpdates()
@@ -192,5 +225,14 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 			tableView!.reloadData()
 		}
 	}
+    
+    
+    internal func showProgressFooter() {
+        tableView?.tableFooterView = createLoadingMoreView()
+    }
+    
+    internal func hideProgressFooter() {
+        tableView?.tableFooterView = nil
+    }
 
 }

From 7dceb7941d0ad1b64ab576981073d7d38b456a9b Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Thu, 7 Jul 2016 10:39:55 +0200
Subject: [PATCH 04/34] LSR-875 Clear rows

---
 .../Base/BaseListScreenlet/BaseListScreenlet.swift |  2 +-
 .../Core/Base/BaseListScreenlet/BaseListView.swift | 14 +++++++++++++-
 .../TableView/BaseListTableView.swift              |  4 ++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
index 3d580aff31..d4d70436ac 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
@@ -96,7 +96,7 @@ import UIKit
 
 		if name == BaseListScreenlet.LoadInitialPageAction {
 			// clear list while it's loading
-			self.baseListView.setRows([], rowCount: 0)
+			self.baseListView.clearRows()
 		}
 
 		return super.onAction(name: name, interactor: interactor, sender: sender)
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
index fc77e8eb2f..ff2c0ac06e 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
@@ -38,7 +38,7 @@ public class BaseListView: BaseScreenletView {
     public func setRows(newRows: [AnyObject?], rowCount: Int) {
         loadingRows = false
         
-        if _rows.count != 0 && _rows.count == newRows.count {
+        if _rows.count == newRows.count {
             moreRows = false
         }
 		_rowCount = rowCount
@@ -49,8 +49,20 @@ public class BaseListView: BaseScreenletView {
         
 		onChangedRows(oldRows)
 	}
+    
+    public func clearRows() {
+        let oldRows = _rows
+        _rows = [AnyObject]()
+        _rowCount = 0
+        
+        onClearRows(oldRows)
+    }
 
 	public func onChangedRows(oldRows:[AnyObject?]) {
 	}
+    
+    public func onClearRows(oldRows:[AnyObject?]) {
+        
+    }
 
 }
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
index 3397492e1f..414c076292 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
@@ -77,6 +77,10 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 			tableView!.reloadData()
 		}
 	}
+    
+    public override func onClearRows(oldRows: [AnyObject?]) {
+        clearAllRows(oldRows)
+    }
 
 	override public func onFinishInteraction(result: AnyObject?, error: NSError?) {
 		if let currentRefreshControl = refreshControlView {

From 3c15ffa127421a37f304bebc4634019a471ee217 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Thu, 7 Jul 2016 13:26:33 +0200
Subject: [PATCH 05/34] LSR-875 onAddedRows method for stream mode

---
 .../Base/BaseListScreenlet/BaseListView.swift | 17 +++++++----
 .../TableView/BaseListTableView.swift         | 28 +++++++++++--------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
index ff2c0ac06e..7152d0e059 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
@@ -35,19 +35,22 @@ public class BaseListView: BaseScreenletView {
     public var loadingRows = false
     public var moreRows = true
 
-    public func setRows(newRows: [AnyObject?], rowCount: Int) {
+    public func setRows(allRows: [AnyObject?], newRows: [AnyObject], rowCount: Int) {
         loadingRows = false
         
-        if _rows.count == newRows.count {
+        if newRows.count == 0 {
             moreRows = false
         }
 		_rowCount = rowCount
 
 		let oldRows = _rows
-		_rows = newRows
+		_rows = allRows
         
-        
-		onChangedRows(oldRows)
+        if streamMode {
+            onAddedRows(newRows, lastCount: oldRows.count)
+        } else {
+            onChangedRows(oldRows)
+        }
 	}
     
     public func clearRows() {
@@ -61,6 +64,10 @@ public class BaseListView: BaseScreenletView {
 	public func onChangedRows(oldRows:[AnyObject?]) {
 	}
     
+    public func onAddedRows(newRows: [AnyObject], lastCount: Int) {
+        
+    }
+    
     public func onClearRows(oldRows:[AnyObject?]) {
         
     }
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
index 414c076292..b5ba576235 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
@@ -53,17 +53,7 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 
 	override public func onChangedRows(oldRows: [AnyObject?]) {
 		super.onChangedRows(oldRows)
-        
-        if streamMode {
-            tableView!.reloadData()
-            if moreRows {
-                showProgressFooter()
-            } else {
-                hideProgressFooter()
-            }
-            return
-        }
-
+    
 		if self.rows.isEmpty {
 			clearAllRows(oldRows)
 		}
@@ -78,6 +68,22 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 		}
 	}
     
+    override public func onAddedRows(newRows: [AnyObject], lastCount: Int) {
+        
+        let indexPaths = (lastCount..<lastCount + newRows.count).map {
+            NSIndexPath(forRow: $0, inSection: 0)
+        }
+        
+        tableView!.insertRowsAtIndexPaths(indexPaths, withRowAnimation: .Top)
+        
+        if moreRows {
+            showProgressFooter()
+        }
+        else {
+            hideProgressFooter()
+        }
+    }
+    
     public override func onClearRows(oldRows: [AnyObject?]) {
         clearAllRows(oldRows)
     }

From 4b8d18fa26b559c6b8abac02d21a78ccda418b10 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Thu, 7 Jul 2016 13:27:08 +0200
Subject: [PATCH 06/34] LSR-875 Interactor choose stream or fluent mode in the
 first page load

---
 .../BaseListPageLoadInteractor.swift          | 60 +++++--------------
 .../BaseListScreenlet/BaseListScreenlet.swift | 14 +++--
 2 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
index 9e697c5c5a..ad2be9c783 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
@@ -18,17 +18,17 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 
 	public let page: Int
 	public let computeRowCount: Bool
-    public var streamMode: Bool = false
-
+    
 	public var resultAllPagesContent: [AnyObject?]?
 	public var resultPageContent: [AnyObject]?
 	public var resultRowCount: Int?
+    public var streamMode = false
+    
 
 
     public init(screenlet: BaseListScreenlet, page: Int, computeRowCount: Bool) {
 		self.page = page
 		self.computeRowCount = computeRowCount
-        
 		super.init(screenlet: screenlet)
 	}
 
@@ -38,65 +38,37 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 
 	override public func completedConnector(op: ServerConnector) {
 		if let pageOp = op as? PaginationLiferayConnector {
-            if !streamMode {
-                processLoadPageResult(pageOp.resultPageContent ?? [], rowCount: pageOp.resultRowCount)
-            } else {
-                processLoadPageResultForStream(pageOp.resultPageContent ?? [], rowCount: pageOp.resultRowCount)
-            }
+            processLoadPageResult(pageOp.resultPageContent ?? [], rowCount: pageOp.resultRowCount)
 		}
 	}
 
-	public func processLoadPageResultForStream(serverRows: [[String:AnyObject]], rowCount: Int?) {
-        let screenlet = self.screenlet as! BaseListScreenlet
-        let baseListView = screenlet.screenletView as! BaseListView
-        
-        let actualRowCount = rowCount ?? baseListView.rowCount
-        
-        let convertedRows = serverRows.map() { self.convertResult($0) }
-        
-        var allRows = [AnyObject?]()
-        
-        allRows.appendContentsOf(baseListView.rows)
-        
-        for row in convertedRows {
-            allRows.append(row)
+	public func processLoadPageResult(serverRows: [[String:AnyObject]], rowCount: Int?) {
+        if rowCount == nil && page == 0 {
+            streamMode = true
         }
-        
-        self.resultRowCount = actualRowCount
-        self.resultPageContent = convertedRows
-        self.resultAllPagesContent = allRows
-	}
     
-    public func processLoadPageResult(serverRows: [[String:AnyObject]], rowCount: Int?) {
         let screenlet = self.screenlet as! BaseListScreenlet
         let baseListView = screenlet.screenletView as! BaseListView
         
         let actualRowCount = rowCount ?? baseListView.rowCount
         
-        let convertedRows = serverRows.map() { self.convertResult($0) }
-        
-        var allRows = Array<AnyObject?>(count: actualRowCount, repeatedValue: nil)
+        let convertedRows = serverRows.map() { self.convertResult($0)}
         
-        for (index, row) in baseListView.rows.enumerate() {
-            allRows[index] = row
-        }
-        
-        var offset = screenlet.firstRowForPage(page)
+        var allRows = [AnyObject?]()
         
-        // last page could be incomplete
-        if offset >= actualRowCount {
-            offset = actualRowCount - 1
-        }
+        allRows.appendContentsOf(baseListView.rows.filter { $0 != nil } )
+        convertedRows.forEach { allRows.append($0) }
         
-        for (index, row) in convertedRows.enumerate() {
-            allRows[offset + index] = row
+        if !streamMode {
+            for _ in 0..<actualRowCount - allRows.count {
+                allRows.append(nil)
+            }
         }
         
         self.resultRowCount = actualRowCount
         self.resultPageContent = convertedRows
         self.resultAllPagesContent = allRows
-
-    }
+	}
 
 	public func convertResult(serverResult: [String:AnyObject]) -> AnyObject {
 		fatalError("convert(serverResult) must be overriden")
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
index d4d70436ac..fc0185162e 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
@@ -31,12 +31,11 @@ import UIKit
 
 	@IBInspectable public var firstPageSize: Int = 12
 	@IBInspectable public var pageSize: Int = 10
-    
-    @IBInspectable public var streamMode: Bool = true
 
 	public var baseListView: BaseListView {
 		return screenletView as! BaseListView
 	}
+    private var streamMode = false
 
 	private var paginationInteractors: [Int:BaseListPageLoadInteractor] = [:]
 
@@ -49,7 +48,6 @@ import UIKit
 
 		(screenletView as? BaseListTableView)?.refreshClosure =
 				refreshControl ? self.loadList : nil
-        (screenletView as? BaseListTableView)?.streamMode = streamMode
 	}
 
 	override public func onShow() {
@@ -66,13 +64,17 @@ import UIKit
 		let interactor = createPageLoadInteractor(
 			page: page,
 			computeRowCount: (page == 0))
-        
-        interactor.streamMode = streamMode
 
 		paginationInteractors[page] = interactor
+        
+        interactor.streamMode = streamMode
 
 		interactor.onSuccess = {
-			self.baseListView.setRows(interactor.resultAllPagesContent!,
+            if page == 0 {
+                self.streamMode = interactor.streamMode
+                self.baseListView.streamMode = self.streamMode
+            }
+			self.baseListView.setRows(interactor.resultAllPagesContent!, newRows: interactor.resultPageContent!,
 				rowCount: interactor.resultRowCount ?? self.baseListView.rowCount)
 
 			self.onLoadPageResult(

From ebe6ae0b4aeef3c81139bd44fbbaf91dbd8b5b36 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Fri, 8 Jul 2016 14:46:39 +0200
Subject: [PATCH 07/34] LSR-875 Detect new rows added while list displaying

---
 .../BaseListPageLoadInteractor.swift          | 133 +++++-----
 .../BaseListScreenlet/BaseListScreenlet.swift | 115 ++++-----
 .../Base/BaseListScreenlet/BaseListView.swift |  82 +++----
 .../TableView/BaseListTableView.swift         | 229 +++++++++---------
 4 files changed, 291 insertions(+), 268 deletions(-)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
index ad2be9c783..ae393d37a8 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
@@ -15,110 +15,125 @@ import UIKit
 
 
 public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
-
+	
 	public let page: Int
 	public let computeRowCount: Bool
-    
+	
 	public var resultAllPagesContent: [AnyObject?]?
 	public var resultPageContent: [AnyObject]?
 	public var resultRowCount: Int?
-    public var streamMode = false
-    
-
-
-    public init(screenlet: BaseListScreenlet, page: Int, computeRowCount: Bool) {
+	public var streamMode = false
+	
+	
+	
+	public init(screenlet: BaseListScreenlet, page: Int, computeRowCount: Bool) {
 		self.page = page
 		self.computeRowCount = computeRowCount
 		super.init(screenlet: screenlet)
 	}
-
+	
 	override public func createConnector() -> PaginationLiferayConnector {
 		fatalError("createConnector must be overriden")
 	}
-
+	
 	override public func completedConnector(op: ServerConnector) {
 		if let pageOp = op as? PaginationLiferayConnector {
-            processLoadPageResult(pageOp.resultPageContent ?? [], rowCount: pageOp.resultRowCount)
+			processLoadPageResult(pageOp.resultPageContent ?? [], rowCount: pageOp.resultRowCount)
 		}
 	}
-
+	
 	public func processLoadPageResult(serverRows: [[String:AnyObject]], rowCount: Int?) {
-        if rowCount == nil && page == 0 {
-            streamMode = true
-        }
-    
-        let screenlet = self.screenlet as! BaseListScreenlet
-        let baseListView = screenlet.screenletView as! BaseListView
-        
-        let actualRowCount = rowCount ?? baseListView.rowCount
-        
-        let convertedRows = serverRows.map() { self.convertResult($0)}
-        
-        var allRows = [AnyObject?]()
-        
-        allRows.appendContentsOf(baseListView.rows.filter { $0 != nil } )
-        convertedRows.forEach { allRows.append($0) }
-        
-        if !streamMode {
-            for _ in 0..<actualRowCount - allRows.count {
-                allRows.append(nil)
-            }
-        }
-        
-        self.resultRowCount = actualRowCount
-        self.resultPageContent = convertedRows
-        self.resultAllPagesContent = allRows
+		if rowCount == nil && page == 0 {
+			streamMode = true
+		}
+		
+		let screenlet = self.screenlet as! BaseListScreenlet
+		let baseListView = screenlet.screenletView as! BaseListView
+		
+		let actualRowCount = rowCount ?? baseListView.rows.count
+		
+		let convertedRows = serverRows.map() { self.convertResult($0) }
+		
+		
+		var allRows = [AnyObject?]()
+
+		if streamMode {
+			allRows = baseListView.rows
+		}
+		else {
+			allRows = Array<AnyObject?>(count: actualRowCount, repeatedValue: nil)
+			
+			//Insert existing elements in the list
+			for (index, row) in baseListView.rows.enumerate() {
+				allRows[index] = row
+			}
+		}
+		var offset = screenlet.firstRowForPage(page)
+		
+		//Insert new elements
+		for (index, row) in convertedRows.enumerate() {
+			if index + offset < actualRowCount {
+				allRows[index + offset] = row
+			}
+			else {
+				allRows.append(row)
+			}
+		}
+		
+		self.resultRowCount = actualRowCount
+		self.resultPageContent = convertedRows
+		self.resultAllPagesContent = allRows
 	}
-
+	
 	public func convertResult(serverResult: [String:AnyObject]) -> AnyObject {
 		fatalError("convert(serverResult) must be overriden")
 	}
-
-
+	
+	
 	//MARK: Cache
-
+	
 	override public func readFromCache(op: ServerConnector, result: AnyObject? -> ()) {
 		guard let cacheManager = SessionContext.currentContext?.cacheManager else {
 			result(nil)
 			return
 		}
-
+		
 		if let loadOp = op as? PaginationLiferayConnector {
 			let key = cacheKey(loadOp)
 			cacheManager.getSome(
-					collection: ScreenletName(screenlet!.dynamicType),
-					keys: ["\(key)-\(page)", "\(key)-\(page)-count"]) {
-
-				loadOp.resultPageContent = $0.first as? [[String:AnyObject]]
-				if $0.count > 1 {
-					loadOp.resultRowCount = $0.last as? Int
-				}
-
-				result(loadOp.resultPageContent)
+				collection: ScreenletName(screenlet!.dynamicType),
+				keys: ["\(key)-\(page)", "\(key)-\(page)-count"]) {
+					
+					loadOp.resultPageContent = $0.first as? [[String:AnyObject]]
+					if $0.count > 1 {
+						loadOp.resultRowCount = $0.last as? Int
+					}
+					
+					result(loadOp.resultPageContent)
 			}
 		}
 		else {
 			result(nil)
 		}
 	}
-
+	
 	override public func writeToCache(op: ServerConnector) {
 		guard let cacheManager = SessionContext.currentContext?.cacheManager else {
 			return
 		}
-
+		
 		if let loadOp = op as? PaginationLiferayConnector,
-				pageContent = loadOp.resultPageContent
-				where !pageContent.isEmpty {
-
+			pageContent = loadOp.resultPageContent
+			where !pageContent.isEmpty {
+			
 			let key = cacheKey(loadOp)
-
+			
 			cacheManager.setClean(
 				collection: ScreenletName(screenlet!.dynamicType),
 				key: "\(key)-\(page)",
 				value: pageContent,
 				attributes: [:])
-
+			
 			if let rowCount = loadOp.resultRowCount {
 				cacheManager.setClean(
 					collection: ScreenletName(screenlet!.dynamicType),
@@ -128,9 +143,9 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 			}
 		}
 	}
-
+	
 	public func cacheKey(op: PaginationLiferayConnector) -> String {
 		fatalError("cacheKey must be overriden")
 	}
-
+	
 }
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
index fc0185162e..f9dcc437ff 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
@@ -15,41 +15,41 @@ import UIKit
 
 
 @IBDesignable public class BaseListScreenlet: BaseScreenlet {
-
+	
 	public class var LoadInitialPageAction: String { return "load-initial-page" }
 	public class var LoadPageAction: String { return "load-page" }
-
-
+	
+	
 	@IBInspectable public var autoLoad: Bool = true
-
+	
 	@IBInspectable public var refreshControl: Bool = true {
 		didSet {
 			(screenletView as? BaseListTableView)?.refreshClosure =
-					refreshControl ? self.loadList : nil
+				refreshControl ? self.loadList : nil
 		}
 	}
-
-	@IBInspectable public var firstPageSize: Int = 12
-	@IBInspectable public var pageSize: Int = 10
-
+	
+	@IBInspectable public var firstPageSize: Int = 50
+	@IBInspectable public var pageSize: Int = 25
+	
 	public var baseListView: BaseListView {
 		return screenletView as! BaseListView
 	}
-    private var streamMode = false
-
+	public var streamMode = false
+	
 	private var paginationInteractors: [Int:BaseListPageLoadInteractor] = [:]
-
-
+	
+	
 	//MARK: BaseScreenlet
-
+	
 	override public func onCreated() {
 		baseListView.onSelectedRowClosure = onSelectedRow
 		baseListView.fetchPageForRow = loadPageForRow
-
+		
 		(screenletView as? BaseListTableView)?.refreshClosure =
-				refreshControl ? self.loadList : nil
+			refreshControl ? self.loadList : nil
 	}
-
+	
 	override public func onShow() {
 		if !isRunningOnInterfaceBuilder {
 			if autoLoad {
@@ -57,104 +57,107 @@ import UIKit
 			}
 		}
 	}
-
+	
 	override public func createInteractor(name name: String, sender: AnyObject?) -> Interactor? {
 		let page = (sender as? Int) ?? 0
-
+		
+		print("create interactor for page \(page)")
 		let interactor = createPageLoadInteractor(
 			page: page,
 			computeRowCount: (page == 0))
-
+		
 		paginationInteractors[page] = interactor
-        
-        interactor.streamMode = streamMode
-
+		
+		interactor.streamMode = streamMode
+		
 		interactor.onSuccess = {
-            if page == 0 {
-                self.streamMode = interactor.streamMode
-                self.baseListView.streamMode = self.streamMode
-            }
-			self.baseListView.setRows(interactor.resultAllPagesContent!, newRows: interactor.resultPageContent!,
-				rowCount: interactor.resultRowCount ?? self.baseListView.rowCount)
+			self.streamMode = interactor.streamMode
+			self.baseListView.streamMode = self.streamMode
 
+			self.baseListView.setRows(interactor.resultAllPagesContent!, newRows: interactor.resultPageContent!,
+			                          rowCount: interactor.resultRowCount ?? self.baseListView.rowCount)
+			
 			self.onLoadPageResult(
 				page: interactor.page,
 				rows: interactor.resultPageContent ?? [],
 				rowCount: self.baseListView.rowCount)
-
+			
 			self.paginationInteractors.removeValueForKey(interactor.page)
 		}
-
+		
 		interactor.onFailure = {
 			self.onLoadPageError(page: interactor.page, error: $0)
-
+			
 			self.paginationInteractors.removeValueForKey(interactor.page)
 		}
-
+		
 		return interactor
 	}
-
+	
 	override public func onAction(name name: String, interactor: Interactor, sender: AnyObject?) -> Bool {
-
+		
 		if name == BaseListScreenlet.LoadInitialPageAction {
 			// clear list while it's loading
 			self.baseListView.clearRows()
 		}
-
+		
 		return super.onAction(name: name, interactor: interactor, sender: sender)
 	}
-
-
+	
+	
 	//MARK: Public methods
-
+	
 	public func loadList() -> Bool {
+		//by default we start in fluent mode
+		streamMode = false
 		return performAction(name: BaseListScreenlet.LoadInitialPageAction, sender: nil)
 	}
-
+	
 	public func loadPageForRow(row: Int) {
 		let page = pageFromRow(row)
-
+		
 		// make sure we don't create two interactors for the same page
 		synchronized(paginationInteractors) {
 			if self.paginationInteractors.indexForKey(page) == nil {
+				
 				self.performAction(name: BaseListScreenlet.LoadPageAction, sender: page)
 			}
 		}
 	}
-
+	
 	public func pageFromRow(row: Int) -> Int {
 		if row < firstPageSize {
 			return 0
 		}
-
+		
 		return ((row - firstPageSize) / pageSize) + 1
 	}
-
+	
 	public func firstRowForPage(page: Int) -> Int {
 		if page == 0 {
 			return 0
 		}
-
+		
 		return firstPageSize + (page - 1) * pageSize
 	}
-
-
+	
+	
 	public func createPageLoadInteractor(
-			page page: Int,
-			computeRowCount: Bool)
-			-> BaseListPageLoadInteractor {
-
-		fatalError("createPageLoadInteractor must be overriden")
+		page page: Int,
+		     computeRowCount: Bool)
+		-> BaseListPageLoadInteractor {
+			
+			fatalError("createPageLoadInteractor must be overriden")
 	}
-
+	
 	public func onLoadPageError(page page: Int, error: NSError) {
 		print("ERROR: Load page error \(page) -> \(error)\n")
 	}
-
+	
 	public func onLoadPageResult(page page: Int, rows: [AnyObject], rowCount: Int) {
 	}
-
+	
 	public func onSelectedRow(row:AnyObject) {
 	}
-
+	
 }
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
index 7152d0e059..96c778db70 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
@@ -15,61 +15,61 @@ import UIKit
 
 
 public class BaseListView: BaseScreenletView {
-    
-    public var streamMode: Bool = false
-
+	
+	public var streamMode: Bool = false
+	
 	public var rowCount: Int {
 		return _rowCount
 	}
-
+	
 	public var rows: [AnyObject?] {
 		return _rows
 	}
-
+	
 	public var onSelectedRowClosure: (AnyObject -> Void)?
 	public var fetchPageForRow: (Int -> Void)?
-
+	
 	private var _rows = [AnyObject?]()
 	private var _rowCount = 0
-    
-    public var loadingRows = false
-    public var moreRows = true
-
-    public func setRows(allRows: [AnyObject?], newRows: [AnyObject], rowCount: Int) {
-        loadingRows = false
-        
-        if newRows.count == 0 {
-            moreRows = false
-        }
+	
+	public var loadingRows = false
+	public var moreRows = true
+	
+	public func setRows(allRows: [AnyObject?], newRows: [AnyObject], rowCount: Int) {
+		loadingRows = false
+		
+		if newRows.count == 0 || newRows.count < (screenlet as? BaseListScreenlet)?.pageSize {
+			moreRows = false
+		}
 		_rowCount = rowCount
-
+		
 		let oldRows = _rows
 		_rows = allRows
-        
-        if streamMode {
-            onAddedRows(newRows, lastCount: oldRows.count)
-        } else {
-            onChangedRows(oldRows)
-        }
+		
+		if streamMode {
+			onAddedRows(lastCount: oldRows.count)
+		} else {
+			onChangedRows(oldRows)
+		}
 	}
-    
-    public func clearRows() {
-        let oldRows = _rows
-        _rows = [AnyObject]()
-        _rowCount = 0
-        
-        onClearRows(oldRows)
-    }
-
+	
+	public func clearRows() {
+		let oldRows = _rows
+		_rows = [AnyObject?]()
+		_rowCount = 0
+		
+		onClearRows(oldRows)
+	}
+	
 	public func onChangedRows(oldRows:[AnyObject?]) {
 	}
-    
-    public func onAddedRows(newRows: [AnyObject], lastCount: Int) {
-        
-    }
-    
-    public func onClearRows(oldRows:[AnyObject?]) {
-        
-    }
-
+	
+	public func onAddedRows(lastCount lastCount: Int) {
+		
+	}
+	
+	public func onClearRows(oldRows:[AnyObject?]) {
+		
+	}
+	
 }
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
index b5ba576235..e1c1270395 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
@@ -19,17 +19,17 @@ import UIKit
 
 
 public class BaseListTableView: BaseListView, UITableViewDataSource, UITableViewDelegate {
-
+	
 	@IBOutlet public var tableView: UITableView?
-
+	
 	internal var refreshControlView: ODRefreshControl?
-
+	
 	internal var refreshClosure: (Void -> Bool)? {
 		didSet {
 			updateRefreshControl()
 		}
 	}
-
+	
 	override public var progressMessages: [String:ProgressMessages] {
 		return [
 			BaseListScreenlet.LoadInitialPageAction : [
@@ -38,22 +38,22 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 			]
 		]
 	}
-
-
+	
+	
 	// MARK: BaseListView
-
+	
 	public override func onCreated() {
 		super.onCreated()
-
+		
 		tableView?.delegate = self
 		tableView?.dataSource = self
-
+		
 		doRegisterCellNibs()
 	}
-
+	
 	override public func onChangedRows(oldRows: [AnyObject?]) {
 		super.onChangedRows(oldRows)
-    
+		
 		if self.rows.isEmpty {
 			clearAllRows(oldRows)
 		}
@@ -61,33 +61,35 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 			insertFreshRows()
 		}
 		else if let visibleRows = tableView!.indexPathsForVisibleRows {
+			//We have added rows since row count computation
+			if rows.count != oldRows.count {
+				moreRows = true
+				streamMode = true
+				(screenlet as? BaseListScreenlet)?.streamMode = true
+				onAddedRows(lastCount: oldRows.count)
+			}
 			updateVisibleRows(visibleRows)
 		}
 		else {
 			tableView!.reloadData()
 		}
 	}
-    
-    override public func onAddedRows(newRows: [AnyObject], lastCount: Int) {
-        
-        let indexPaths = (lastCount..<lastCount + newRows.count).map {
-            NSIndexPath(forRow: $0, inSection: 0)
-        }
-        
-        tableView!.insertRowsAtIndexPaths(indexPaths, withRowAnimation: .Top)
-        
-        if moreRows {
-            showProgressFooter()
-        }
-        else {
-            hideProgressFooter()
-        }
-    }
-    
-    public override func onClearRows(oldRows: [AnyObject?]) {
-        clearAllRows(oldRows)
-    }
-
+	
+	override public func onAddedRows(lastCount lastCount: Int) {
+		insertRows(from: lastCount, to: rows.count)
+		
+		if moreRows {
+			showProgressFooter()
+		}
+		else {
+			hideProgressFooter()
+		}
+	}
+	
+	public override func onClearRows(oldRows: [AnyObject?]) {
+		clearAllRows(oldRows)
+	}
+	
 	override public func onFinishInteraction(result: AnyObject?, error: NSError?) {
 		if let currentRefreshControl = refreshControlView {
 			dispatch_delayed(0.3) {
@@ -95,101 +97,101 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 			}
 		}
 	}
-
-
+	
+	
 	//MARK: UITableViewDataSource
-
+	
 	public func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
 		return rows.count
 	}
-
+	
 	public func tableView(tableView: UITableView,
-			cellForRowAtIndexPath
-			indexPath: NSIndexPath)
-			-> UITableViewCell {
-		let object: AnyObject? = rows[indexPath.row]
-		let cell = doDequeueReusableCell(row: indexPath.row, object: object)
-
-		if let object = object {
-			doFillLoadedCell(row: indexPath.row, cell: cell, object: object)
-		}
-		else {
-			doFillInProgressCell(row: indexPath.row, cell: cell)
-            if !streamMode {
-                fetchPageForRow?(indexPath.row)
-            }
-		}
-
-		return cell
+	                      cellForRowAtIndexPath
+		indexPath: NSIndexPath)
+		-> UITableViewCell {
+			let object: AnyObject? = rows[indexPath.row]
+			let cell = doDequeueReusableCell(row: indexPath.row, object: object)
+			
+			if let object = object {
+				doFillLoadedCell(row: indexPath.row, cell: cell, object: object)
+			}
+			else {
+				doFillInProgressCell(row: indexPath.row, cell: cell)
+				if !streamMode {
+					fetchPageForRow?(indexPath.row)
+				}
+			}
+			
+			return cell
 	}
-
+	
 	public func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
 		tableView.deselectRowAtIndexPath(indexPath, animated: false)
-
+		
 		if let row:AnyObject = rows[indexPath.row] {
 			onSelectedRowClosure?(row)
 		}
 	}
-    
-    public func tableView(tableView: UITableView, willDisplayCell cell: UITableViewCell, forRowAtIndexPath indexPath: NSIndexPath) {
-        if streamMode && !loadingRows && moreRows {
-            if indexPath.row == rows.count - 1 {
-                loadingRows = true
-                fetchPageForRow?(indexPath.row + 1)
-            }
-        }
-    }
-
+	
+	public func tableView(tableView: UITableView, willDisplayCell cell: UITableViewCell, forRowAtIndexPath indexPath: NSIndexPath) {
+		if streamMode && !loadingRows && moreRows {
+			if indexPath.row == rows.count - 1 {
+				loadingRows = true
+				fetchPageForRow?(indexPath.row + 1)
+			}
+		}
+	}
+	
 	public func doDequeueReusableCell(row row: Int, object: AnyObject?) -> UITableViewCell {
 		let cellId = doGetCellId(row: row, object: object)
-
+		
 		guard let result = tableView!.dequeueReusableCellWithIdentifier(cellId) else {
 			return doCreateCell(cellId)
 		}
-
+		
 		return result
 	}
-
+	
 	public func doFillLoadedCell(row row: Int, cell: UITableViewCell, object:AnyObject) {
 	}
-
+	
 	public func doFillInProgressCell(row row: Int, cell: UITableViewCell) {
 	}
-
+	
 	public func doRegisterCellNibs() {
 	}
-
+	
 	public func doGetCellId(row row: Int, object: AnyObject?) -> String {
 		return "defaultCellId"
 	}
-
+	
 	public func doCreateCell(cellId: String) -> UITableViewCell {
 		return UITableViewCell(style: .Default, reuseIdentifier: cellId)
 	}
-    
-    public func createLoadingMoreView() -> UIView? {
-        let progressView = UIView(frame: CGRect(x: 0, y: 0, width: frame.width, height: 30))
-        
-        let indicatorView = UIActivityIndicatorView(activityIndicatorStyle: .Gray)
-        indicatorView.center = CGPoint(x: frame.width/2, y: indicatorView.center.y)
-        indicatorView.startAnimating()
-        
-        progressView.addSubview(indicatorView)
-        
-        return progressView
-    }
-
-
+	
+	public func createLoadingMoreView() -> UIView? {
+		let progressView = UIView(frame: CGRect(x: 0, y: 0, width: frame.width, height: 30))
+		
+		let indicatorView = UIActivityIndicatorView(activityIndicatorStyle: .Gray)
+		indicatorView.center = CGPoint(x: frame.width/2, y: indicatorView.center.y)
+		indicatorView.startAnimating()
+		
+		progressView.addSubview(indicatorView)
+		
+		return progressView
+	}
+	
+	
 	//MARK: Internal methods
-
+	
 	internal func updateRefreshControl() {
 		if refreshClosure != nil {
 			if refreshControlView == nil {
 				refreshControlView = ODRefreshControl(
-						inScrollView: self.tableView)
+					inScrollView: self.tableView)
 				refreshControlView!.addTarget(self,
-						action: #selector(BaseListTableView.refreshControlBeginRefresh(_:)),
-						forControlEvents: .ValueChanged)
+				                              action: #selector(BaseListTableView.refreshControlBeginRefresh(_:)),
+				                              forControlEvents: .ValueChanged)
 			}
 		}
 		else if let currentControl = refreshControlView {
@@ -198,35 +200,39 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 			refreshControlView = nil
 		}
 	}
-
+	
 	internal func refreshControlBeginRefresh(sender:AnyObject?) {
 		dispatch_delayed(0.3) {
-            self.moreRows = true
+			self.moreRows = true
+			self.hideProgressFooter()
 			self.refreshClosure?()
 		}
 	}
-
+	
 	internal func insertFreshRows() {
-    
-		let indexPaths = (0..<self.rows.count).map {
+		insertRows(from: 0, to: rows.count)
+	}
+	
+	internal func insertRows(from from: Int, to: Int) {
+		let indexPaths = (from..<to).map {
 			NSIndexPath(forRow: $0, inSection: 0)
 		}
-        tableView!.beginUpdates()
+		tableView!.beginUpdates()
 		tableView!.insertRowsAtIndexPaths(indexPaths, withRowAnimation:.Top)
-        tableView!.endUpdates()
-    }
-
+		tableView!.endUpdates()
+	}
+	
 	internal func clearAllRows(currentRows: [AnyObject?]) {
 		tableView!.beginUpdates()
-
+		
 		for (index,_) in currentRows.enumerate() {
 			let indexPath = NSIndexPath(forRow:index, inSection:0)
 			tableView!.deleteRowsAtIndexPaths([indexPath], withRowAnimation: .Fade)
 		}
-
+		
 		tableView!.endUpdates()
 	}
-
+	
 	internal func updateVisibleRows(visibleRows: [NSIndexPath]) {
 		if visibleRows.count > 0 {
 			tableView!.reloadRowsAtIndexPaths(visibleRows, withRowAnimation:.None)
@@ -235,14 +241,13 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 			tableView!.reloadData()
 		}
 	}
-    
-    
-    internal func showProgressFooter() {
-        tableView?.tableFooterView = createLoadingMoreView()
-    }
-    
-    internal func hideProgressFooter() {
-        tableView?.tableFooterView = nil
-    }
-
+	
+	internal func showProgressFooter() {
+		tableView?.tableFooterView = createLoadingMoreView()
+	}
+	
+	internal func hideProgressFooter() {
+		tableView?.tableFooterView = nil
+	}
+	
 }

From 492e28894cd443acbca2cea7548dafa3daf72cb2 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Mon, 11 Jul 2016 09:35:46 +0200
Subject: [PATCH 08/34] LSR-875 Detect rows deleted while displaying and code
 refactoring

---
 .../BaseListPageLoadInteractor.swift          | 10 ++++
 .../BaseListScreenlet/BaseListScreenlet.swift |  9 ++--
 .../TableView/BaseListTableView.swift         | 52 +++++++++++--------
 3 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
index ae393d37a8..d75a531991 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
@@ -68,18 +68,28 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 				allRows[index] = row
 			}
 		}
+		
 		var offset = screenlet.firstRowForPage(page)
+		var lastIndex = 0
 		
 		//Insert new elements
 		for (index, row) in convertedRows.enumerate() {
 			if index + offset < actualRowCount {
 				allRows[index + offset] = row
+				lastIndex = index + offset
 			}
 			else {
 				allRows.append(row)
 			}
 		}
 		
+		//Deleted elements since row computation
+		if lastIndex+1 < actualRowCount && !streamMode && convertedRows.count < screenlet.pageSize && page != 0 {
+			for _ in lastIndex+1..<actualRowCount {
+				allRows.popLast()
+			}
+		}
+		
 		self.resultRowCount = actualRowCount
 		self.resultPageContent = convertedRows
 		self.resultAllPagesContent = allRows
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
index f9dcc437ff..651b2ad394 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
@@ -61,7 +61,6 @@ import UIKit
 	override public func createInteractor(name name: String, sender: AnyObject?) -> Interactor? {
 		let page = (sender as? Int) ?? 0
 		
-		print("create interactor for page \(page)")
 		let interactor = createPageLoadInteractor(
 			page: page,
 			computeRowCount: (page == 0))
@@ -71,8 +70,12 @@ import UIKit
 		interactor.streamMode = streamMode
 		
 		interactor.onSuccess = {
-			self.streamMode = interactor.streamMode
-			self.baseListView.streamMode = self.streamMode
+			//StreamMode is only decided by the interactor in the first page load
+			//otherwise this state could be changed for other interactors
+			if (page == 0) {
+				self.streamMode = interactor.streamMode
+				self.baseListView.streamMode = self.streamMode
+			}
 
 			self.baseListView.setRows(interactor.resultAllPagesContent!, newRows: interactor.resultPageContent!,
 			                          rowCount: interactor.resultRowCount ?? self.baseListView.rowCount)
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
index e1c1270395..98d6e133b8 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
@@ -53,21 +53,21 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 	
 	override public func onChangedRows(oldRows: [AnyObject?]) {
 		super.onChangedRows(oldRows)
-		
-		if self.rows.isEmpty {
-			clearAllRows(oldRows)
-		}
-		else if oldRows.isEmpty {
+
+		if oldRows.isEmpty {
 			insertFreshRows()
+			return
 		}
-		else if let visibleRows = tableView!.indexPathsForVisibleRows {
-			//We have added rows since row count computation
-			if rows.count != oldRows.count {
-				moreRows = true
-				streamMode = true
-				(screenlet as? BaseListScreenlet)?.streamMode = true
-				onAddedRows(lastCount: oldRows.count)
-			}
+		
+		//We have added or deleted rows since row count computation
+		if rows.count > oldRows.count {
+			turnStreamModeOn()
+			onAddedRows(lastCount: oldRows.count)
+		} else if rows.count < oldRows.count {
+			deleteRows(from: rows.count, to: oldRows.count)
+		}
+
+		if let visibleRows = tableView!.indexPathsForVisibleRows {
 			updateVisibleRows(visibleRows)
 		}
 		else {
@@ -76,14 +76,14 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 	}
 	
 	override public func onAddedRows(lastCount lastCount: Int) {
-		insertRows(from: lastCount, to: rows.count)
-		
 		if moreRows {
 			showProgressFooter()
 		}
 		else {
 			hideProgressFooter()
 		}
+		
+		insertRows(from: lastCount, to: rows.count)
 	}
 	
 	public override func onClearRows(oldRows: [AnyObject?]) {
@@ -133,7 +133,8 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 		}
 	}
 	
-	public func tableView(tableView: UITableView, willDisplayCell cell: UITableViewCell, forRowAtIndexPath indexPath: NSIndexPath) {
+	public func tableView(tableView: UITableView, willDisplayCell cell: UITableViewCell,
+	                      forRowAtIndexPath indexPath: NSIndexPath) {
 		if streamMode && !loadingRows && moreRows {
 			if indexPath.row == rows.count - 1 {
 				loadingRows = true
@@ -223,13 +224,15 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 	}
 	
 	internal func clearAllRows(currentRows: [AnyObject?]) {
-		tableView!.beginUpdates()
-		
-		for (index,_) in currentRows.enumerate() {
-			let indexPath = NSIndexPath(forRow:index, inSection:0)
-			tableView!.deleteRowsAtIndexPaths([indexPath], withRowAnimation: .Fade)
+		deleteRows(from: 0, to: currentRows.count)
+	}
+	
+	internal func deleteRows(from from: Int, to: Int) {
+		let indexPaths = (from..<to).map {
+			NSIndexPath(forRow: $0, inSection: 0)
 		}
-		
+		tableView!.beginUpdates()
+		tableView!.deleteRowsAtIndexPaths(indexPaths, withRowAnimation: .Fade)
 		tableView!.endUpdates()
 	}
 	
@@ -250,4 +253,9 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 		tableView?.tableFooterView = nil
 	}
 	
+	internal func turnStreamModeOn() {
+		moreRows = true
+		streamMode = true
+		(screenlet as? BaseListScreenlet)?.streamMode = true
+	}
 }

From 62ba6adfd8ad86c54906bcf43afb261fb7022684 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Mon, 11 Jul 2016 09:43:24 +0200
Subject: [PATCH 09/34] LSR-875 Test commit

---
 .../Base/BaseConnectors/ServerConnector.swift | 64 +++++++++----------
 .../BaseListScreenlet/BaseListScreenlet.swift |  3 +
 .../PaginationLiferayConnector.swift          |  6 ++
 .../TableView/BaseListTableView.swift         |  1 +
 .../HomeLoginViewController.swift             |  2 +-
 .../en.lproj/Main.storyboard                  |  8 ++-
 .../liferay-server-context.plist              |  8 +--
 7 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/ios/Framework/Core/Base/BaseConnectors/ServerConnector.swift b/ios/Framework/Core/Base/BaseConnectors/ServerConnector.swift
index c86dbf1490..328dfea6d5 100644
--- a/ios/Framework/Core/Base/BaseConnectors/ServerConnector.swift
+++ b/ios/Framework/Core/Base/BaseConnectors/ServerConnector.swift
@@ -15,29 +15,29 @@ import UIKit
 
 
 @objc public class ServerConnector: NSOperation {
-
+	
 	private struct ConnectorsQueue {
-
+		
 		static private var queue: NSOperationQueue?
-
+		
 		static func addConnector(connector: ServerConnector) {
 			if queue == nil {
 				queue = NSOperationQueue()
-				queue!.maxConcurrentOperationCount = 1
+				queue!.maxConcurrentOperationCount = 4
 			}
-
+			
 			queue!.addOperation(connector)
 		}
-
+		
 	}
-
+	
 	public var lastError: NSError?
-
+	
 	internal var onComplete: (ServerConnector -> Void)?
-
-
+	
+	
 	//MARK: NSOperation
-
+	
 	public override func main() {
 		if self.cancelled {
 			lastError = NSError.errorWithCause(.Cancelled)
@@ -56,72 +56,72 @@ import UIKit
 				lastError = NSError.errorWithCause(.AbortedDueToPreconditions)
 			}
 		}
-
+		
 		callOnComplete()
 	}
-
-
+	
+	
 	//MARK: Public methods
-
+	
 	public func validateAndEnqueue(onComplete: (ServerConnector -> Void)? = nil) -> ValidationError? {
 		let error = validateData()
-
+		
 		if error == nil {
 			enqueue(onComplete)
 		}
-
+		
 		return error
 	}
-
+	
 	public func enqueue(onComplete: (ServerConnector -> Void)? = nil) {
 		if onComplete != nil {
 			self.onComplete = onComplete
 		}
-
+		
 		ConnectorsQueue.addConnector(self)
 	}
-
-
+	
+	
 	//MARK: Template methods
-
+	
 	public func validateData() -> ValidationError? {
 		// Do not add any code here. Children classes may not call super
 		return nil
 	}
-
+	
 	public func preRun() -> Bool {
 		// Do not add any code here. Children classes may not call super
 		return true
 	}
-
+	
 	public func doRun(session session: LRSession) {
 		// Do not add any code here. Children classes may not call super
 	}
-
+	
 	public func postRun() {
 		// Do not add any code here. Children classes may not call super
 	}
-
+	
 	public func createSession() -> LRSession? {
 		guard SessionContext.isLoggedIn else {
 			lastError = NSError.errorWithCause(.AbortedDueToPreconditions,
-					message: "Login required to use this connector")
-
+			                                   message: "Login required to use this connector")
+			
 			return nil
 		}
-
+		
 		return SessionContext.currentContext?.createRequestSession()
 	}
-
+	
 	public func callOnComplete() {
 		if self.onComplete != nil {
 			dispatch_main {
 				self.onComplete!(self)
-
+				
 				// this breaks the retain cycle between the op and 'onComplete'
 				self.onComplete = nil
 			}
 		}
 	}
-
+	
 }
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
index 651b2ad394..d6cc83581f 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
@@ -61,6 +61,7 @@ import UIKit
 	override public func createInteractor(name name: String, sender: AnyObject?) -> Interactor? {
 		let page = (sender as? Int) ?? 0
 		
+		print("create interactor for page \(page) stremMode \(streamMode)")
 		let interactor = createPageLoadInteractor(
 			page: page,
 			computeRowCount: (page == 0))
@@ -73,6 +74,7 @@ import UIKit
 			//StreamMode is only decided by the interactor in the first page load
 			//otherwise this state could be changed for other interactors
 			if (page == 0) {
+				print("interactor result for page \(interactor.page) streamMode: \(interactor.streamMode)")
 				self.streamMode = interactor.streamMode
 				self.baseListView.streamMode = self.streamMode
 			}
@@ -119,6 +121,7 @@ import UIKit
 	public func loadPageForRow(row: Int) {
 		let page = pageFromRow(row)
 		
+		print("load page for row \(row)")
 		// make sure we don't create two interactors for the same page
 		synchronized(paginationInteractors) {
 			if self.paginationInteractors.indexForKey(page) == nil {
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/PaginationLiferayConnector.swift b/ios/Framework/Core/Base/BaseListScreenlet/PaginationLiferayConnector.swift
index 1111e05bc3..75034fbfec 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/PaginationLiferayConnector.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/PaginationLiferayConnector.swift
@@ -54,7 +54,13 @@ public class PaginationLiferayConnector: ServerConnector {
 		}
 
 		do {
+			print("Ask for \(startRow) to \(endRow)")
 			let responses = try batchSession.invoke()
+			
+			sleep(arc4random_uniform(4))
+			
+			print("Received \(startRow) to \(endRow)")
+			
 
 			if let entriesResponse = responses[0] as? [[String:AnyObject]] {
 				let serverPageContent = entriesResponse
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
index 98d6e133b8..2a1b895f1a 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
@@ -138,6 +138,7 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 		if streamMode && !loadingRows && moreRows {
 			if indexPath.row == rows.count - 1 {
 				loadingRows = true
+				print("fetch page for row \(indexPath.row + 1)")
 				fetchPageForRow?(indexPath.row + 1)
 			}
 		}
diff --git a/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/ViewControllers/HomeLoginViewController.swift b/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/ViewControllers/HomeLoginViewController.swift
index a25bf1bd9b..17e00fe86d 100644
--- a/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/ViewControllers/HomeLoginViewController.swift
+++ b/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/ViewControllers/HomeLoginViewController.swift
@@ -56,7 +56,7 @@ class HomeLoginViewController: UIViewController, LoginScreenletDelegate {
 
 		if !SessionContext.loadStoredCredentials() {
 			self.loginScreenlet?.viewModel.userName = "test@liferay.com"
-			self.loginScreenlet?.viewModel.password = "test"
+			self.loginScreenlet?.viewModel.password = "test1234"
 		}
 
 		showLogged(animated: false);
diff --git a/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/en.lproj/Main.storyboard b/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/en.lproj/Main.storyboard
index b2f082268b..02332d3105 100644
--- a/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/en.lproj/Main.storyboard
+++ b/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/en.lproj/Main.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="49e-Tb-3d3">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="49e-Tb-3d3">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
@@ -298,7 +298,11 @@
                                 <rect key="frame" x="0.0" y="214" width="320" height="305"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="boolean" keyPath="autoLoad" value="NO"/>
+                                    <userDefinedRuntimeAttribute type="boolean" keyPath="autoLoad" value="YES"/>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="recordSetId">
+                                        <integer key="value" value="38606"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="labelFields" value="Title"/>
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="pjY-t2-Pg3">
diff --git a/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/liferay-server-context.plist b/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/liferay-server-context.plist
index 5f81205bb6..a2155aa616 100644
--- a/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/liferay-server-context.plist
+++ b/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/liferay-server-context.plist
@@ -3,12 +3,12 @@
 <plist version="1.0">
 <dict>
 	<key>server</key>
-	<string>https://demo.liferay.com/screens</string>
+	<string>http://192.168.40.244:8080</string>
 	<key>version</key>
-	<integer>62</integer>
+	<integer>70</integer>
 	<key>companyId</key>
-	<real>20155</real>
+	<real>20116</real>
 	<key>groupId</key>
-	<real>20525</real>
+	<real>20147</real>
 </dict>
 </plist>

From a086cb0c0c7803bfee15bf744fc622e7597e754c Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Mon, 11 Jul 2016 14:41:01 +0200
Subject: [PATCH 10/34] LSR-874 Revert "Test commit"

This reverts commit 62ba6adfd8ad86c54906bcf43afb261fb7022684.
---
 .../Base/BaseConnectors/ServerConnector.swift | 64 +++++++++----------
 .../BaseListScreenlet/BaseListScreenlet.swift |  3 -
 .../PaginationLiferayConnector.swift          |  6 --
 .../TableView/BaseListTableView.swift         |  1 -
 .../HomeLoginViewController.swift             |  2 +-
 .../en.lproj/Main.storyboard                  |  8 +--
 .../liferay-server-context.plist              |  8 +--
 7 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/ios/Framework/Core/Base/BaseConnectors/ServerConnector.swift b/ios/Framework/Core/Base/BaseConnectors/ServerConnector.swift
index 328dfea6d5..c86dbf1490 100644
--- a/ios/Framework/Core/Base/BaseConnectors/ServerConnector.swift
+++ b/ios/Framework/Core/Base/BaseConnectors/ServerConnector.swift
@@ -15,29 +15,29 @@ import UIKit
 
 
 @objc public class ServerConnector: NSOperation {
-	
+
 	private struct ConnectorsQueue {
-		
+
 		static private var queue: NSOperationQueue?
-		
+
 		static func addConnector(connector: ServerConnector) {
 			if queue == nil {
 				queue = NSOperationQueue()
-				queue!.maxConcurrentOperationCount = 4
+				queue!.maxConcurrentOperationCount = 1
 			}
-			
+
 			queue!.addOperation(connector)
 		}
-		
+
 	}
-	
+
 	public var lastError: NSError?
-	
+
 	internal var onComplete: (ServerConnector -> Void)?
-	
-	
+
+
 	//MARK: NSOperation
-	
+
 	public override func main() {
 		if self.cancelled {
 			lastError = NSError.errorWithCause(.Cancelled)
@@ -56,72 +56,72 @@ import UIKit
 				lastError = NSError.errorWithCause(.AbortedDueToPreconditions)
 			}
 		}
-		
+
 		callOnComplete()
 	}
-	
-	
+
+
 	//MARK: Public methods
-	
+
 	public func validateAndEnqueue(onComplete: (ServerConnector -> Void)? = nil) -> ValidationError? {
 		let error = validateData()
-		
+
 		if error == nil {
 			enqueue(onComplete)
 		}
-		
+
 		return error
 	}
-	
+
 	public func enqueue(onComplete: (ServerConnector -> Void)? = nil) {
 		if onComplete != nil {
 			self.onComplete = onComplete
 		}
-		
+
 		ConnectorsQueue.addConnector(self)
 	}
-	
-	
+
+
 	//MARK: Template methods
-	
+
 	public func validateData() -> ValidationError? {
 		// Do not add any code here. Children classes may not call super
 		return nil
 	}
-	
+
 	public func preRun() -> Bool {
 		// Do not add any code here. Children classes may not call super
 		return true
 	}
-	
+
 	public func doRun(session session: LRSession) {
 		// Do not add any code here. Children classes may not call super
 	}
-	
+
 	public func postRun() {
 		// Do not add any code here. Children classes may not call super
 	}
-	
+
 	public func createSession() -> LRSession? {
 		guard SessionContext.isLoggedIn else {
 			lastError = NSError.errorWithCause(.AbortedDueToPreconditions,
-			                                   message: "Login required to use this connector")
-			
+					message: "Login required to use this connector")
+
 			return nil
 		}
-		
+
 		return SessionContext.currentContext?.createRequestSession()
 	}
-	
+
 	public func callOnComplete() {
 		if self.onComplete != nil {
 			dispatch_main {
 				self.onComplete!(self)
-				
+
 				// this breaks the retain cycle between the op and 'onComplete'
 				self.onComplete = nil
 			}
 		}
 	}
-	
+
 }
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
index d6cc83581f..651b2ad394 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
@@ -61,7 +61,6 @@ import UIKit
 	override public func createInteractor(name name: String, sender: AnyObject?) -> Interactor? {
 		let page = (sender as? Int) ?? 0
 		
-		print("create interactor for page \(page) stremMode \(streamMode)")
 		let interactor = createPageLoadInteractor(
 			page: page,
 			computeRowCount: (page == 0))
@@ -74,7 +73,6 @@ import UIKit
 			//StreamMode is only decided by the interactor in the first page load
 			//otherwise this state could be changed for other interactors
 			if (page == 0) {
-				print("interactor result for page \(interactor.page) streamMode: \(interactor.streamMode)")
 				self.streamMode = interactor.streamMode
 				self.baseListView.streamMode = self.streamMode
 			}
@@ -121,7 +119,6 @@ import UIKit
 	public func loadPageForRow(row: Int) {
 		let page = pageFromRow(row)
 		
-		print("load page for row \(row)")
 		// make sure we don't create two interactors for the same page
 		synchronized(paginationInteractors) {
 			if self.paginationInteractors.indexForKey(page) == nil {
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/PaginationLiferayConnector.swift b/ios/Framework/Core/Base/BaseListScreenlet/PaginationLiferayConnector.swift
index 75034fbfec..1111e05bc3 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/PaginationLiferayConnector.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/PaginationLiferayConnector.swift
@@ -54,13 +54,7 @@ public class PaginationLiferayConnector: ServerConnector {
 		}
 
 		do {
-			print("Ask for \(startRow) to \(endRow)")
 			let responses = try batchSession.invoke()
-			
-			sleep(arc4random_uniform(4))
-			
-			print("Received \(startRow) to \(endRow)")
-			
 
 			if let entriesResponse = responses[0] as? [[String:AnyObject]] {
 				let serverPageContent = entriesResponse
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
index 2a1b895f1a..98d6e133b8 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
@@ -138,7 +138,6 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 		if streamMode && !loadingRows && moreRows {
 			if indexPath.row == rows.count - 1 {
 				loadingRows = true
-				print("fetch page for row \(indexPath.row + 1)")
 				fetchPageForRow?(indexPath.row + 1)
 			}
 		}
diff --git a/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/ViewControllers/HomeLoginViewController.swift b/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/ViewControllers/HomeLoginViewController.swift
index 17e00fe86d..a25bf1bd9b 100644
--- a/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/ViewControllers/HomeLoginViewController.swift
+++ b/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/ViewControllers/HomeLoginViewController.swift
@@ -56,7 +56,7 @@ class HomeLoginViewController: UIViewController, LoginScreenletDelegate {
 
 		if !SessionContext.loadStoredCredentials() {
 			self.loginScreenlet?.viewModel.userName = "test@liferay.com"
-			self.loginScreenlet?.viewModel.password = "test1234"
+			self.loginScreenlet?.viewModel.password = "test"
 		}
 
 		showLogged(animated: false);
diff --git a/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/en.lproj/Main.storyboard b/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/en.lproj/Main.storyboard
index 02332d3105..b2f082268b 100644
--- a/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/en.lproj/Main.storyboard
+++ b/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/en.lproj/Main.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="49e-Tb-3d3">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="49e-Tb-3d3">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
@@ -298,11 +298,7 @@
                                 <rect key="frame" x="0.0" y="214" width="320" height="305"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="boolean" keyPath="autoLoad" value="YES"/>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="recordSetId">
-                                        <integer key="value" value="38606"/>
-                                    </userDefinedRuntimeAttribute>
-                                    <userDefinedRuntimeAttribute type="string" keyPath="labelFields" value="Title"/>
+                                    <userDefinedRuntimeAttribute type="boolean" keyPath="autoLoad" value="NO"/>
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="pjY-t2-Pg3">
diff --git a/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/liferay-server-context.plist b/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/liferay-server-context.plist
index a2155aa616..5f81205bb6 100644
--- a/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/liferay-server-context.plist
+++ b/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/liferay-server-context.plist
@@ -3,12 +3,12 @@
 <plist version="1.0">
 <dict>
 	<key>server</key>
-	<string>http://192.168.40.244:8080</string>
+	<string>https://demo.liferay.com/screens</string>
 	<key>version</key>
-	<integer>70</integer>
+	<integer>62</integer>
 	<key>companyId</key>
-	<real>20116</real>
+	<real>20155</real>
 	<key>groupId</key>
-	<real>20147</real>
+	<real>20525</real>
 </dict>
 </plist>

From 33969fd642877dd5ba683ffb06eacf3544fabf98 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Mon, 11 Jul 2016 17:23:29 +0200
Subject: [PATCH 11/34] LSR-874 Adapt current architecture to support sections

---
 .../BaseListPageLoadInteractor.swift          | 101 ++++++++++++------
 .../BaseListScreenlet/BaseListScreenlet.swift |   5 +-
 .../Base/BaseListScreenlet/BaseListView.swift |  33 ++++--
 .../TableView/BaseListTableView.swift         |  47 ++++----
 4 files changed, 126 insertions(+), 60 deletions(-)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
index d75a531991..088015aad4 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
@@ -19,9 +19,10 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 	public let page: Int
 	public let computeRowCount: Bool
 	
-	public var resultAllPagesContent: [AnyObject?]?
-	public var resultPageContent: [AnyObject]?
+	public var resultAllPagesContent: [String : [AnyObject?]]?
+	public var resultPageContent: [String : [AnyObject]]?
 	public var resultRowCount: Int?
+	public var sections: [String]?
 	public var streamMode = false
 	
 	
@@ -42,63 +43,97 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 		}
 	}
 	
-	public func processLoadPageResult(serverRows: [[String:AnyObject]], rowCount: Int?) {
-		if rowCount == nil && page == 0 {
-			streamMode = true
-		}
-		
+	public func processLoadPageResult(serverRows: [[String : AnyObject]], rowCount: Int?) {
 		let screenlet = self.screenlet as! BaseListScreenlet
 		let baseListView = screenlet.screenletView as! BaseListView
 		
-		let actualRowCount = rowCount ?? baseListView.rows.count
+		let actualRowCount = rowCount ?? baseListView.rows[BaseListView.DefaultSection]!.count
 		
 		let convertedRows = serverRows.map() { self.convertResult($0) }
 		
+		var allRows = baseListView.rows
+		var convertedRowsWithSection = [String : [AnyObject]]()
+		var sections = baseListView.sections
+		
+		//Fill sections 
+		
+		for obj in convertedRows {
+			let sectionName = sectionForRowObject(obj) ?? BaseListView.DefaultSection
+			
+			if convertedRowsWithSection.indexForKey(sectionName) == nil {
+				convertedRowsWithSection[sectionName] = [AnyObject]()
+				
+				if !sections.contains(sectionName) {
+					sections.append(sectionName)
+				}
+			}
+			
+			convertedRowsWithSection[sectionName]!.append(obj)
+		}
+		
+		if (sections.count > 1 || rowCount == nil) && page == 0 {
+			streamMode = true
+		}
 		
-		var allRows = [AnyObject?]()
-
 		if streamMode {
 			allRows = baseListView.rows
+		
+			for section in convertedRowsWithSection.keys {
+				if allRows.indexForKey(section) == nil {
+					allRows[section] = [AnyObject?]()
+				}
+				
+				let rowsInSection = convertedRowsWithSection[section]!
+				
+				for row in rowsInSection {
+					allRows[section]!.append(row)
+				}
+			}
 		}
 		else {
-			allRows = Array<AnyObject?>(count: actualRowCount, repeatedValue: nil)
+			//If we reach this point we will have only one section with key ""
+			allRows[BaseListView.DefaultSection] = Array<AnyObject?>(count: actualRowCount, repeatedValue: nil)
 			
 			//Insert existing elements in the list
-			for (index, row) in baseListView.rows.enumerate() {
-				allRows[index] = row
-			}
-		}
-		
-		var offset = screenlet.firstRowForPage(page)
-		var lastIndex = 0
-		
-		//Insert new elements
-		for (index, row) in convertedRows.enumerate() {
-			if index + offset < actualRowCount {
-				allRows[index + offset] = row
-				lastIndex = index + offset
+			for (index, row) in baseListView.rows[BaseListView.DefaultSection]!.enumerate() {
+				allRows[BaseListView.DefaultSection]![index] = row
 			}
-			else {
-				allRows.append(row)
+			
+			var offset = screenlet.firstRowForPage(page)
+			var lastIndex = 0
+			
+			//Insert new elements
+			for (index, row) in convertedRows.enumerate() {
+				if index + offset < actualRowCount {
+					allRows[BaseListView.DefaultSection]![index + offset] = row
+					lastIndex = index + offset
+				}
+				else {
+					allRows[BaseListView.DefaultSection]!.append(row)
+				}
 			}
-		}
-		
-		//Deleted elements since row computation
-		if lastIndex+1 < actualRowCount && !streamMode && convertedRows.count < screenlet.pageSize && page != 0 {
-			for _ in lastIndex+1..<actualRowCount {
-				allRows.popLast()
+			
+			//Deleted elements since row computation
+			if lastIndex+1 < actualRowCount && !streamMode && convertedRows.count < screenlet.pageSize && page != 0 {
+				for _ in lastIndex+1..<actualRowCount {
+					allRows[BaseListView.DefaultSection]!.popLast()
+				}
 			}
 		}
 		
 		self.resultRowCount = actualRowCount
-		self.resultPageContent = convertedRows
+		self.resultPageContent = convertedRowsWithSection
 		self.resultAllPagesContent = allRows
+		self.sections = sections
 	}
 	
 	public func convertResult(serverResult: [String:AnyObject]) -> AnyObject {
 		fatalError("convert(serverResult) must be overriden")
 	}
 	
+	public func sectionForRowObject(object: AnyObject) -> String? {
+		return nil
+	}
 	
 	//MARK: Cache
 	
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
index 651b2ad394..eeb5bbbafa 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
@@ -78,11 +78,12 @@ import UIKit
 			}
 
 			self.baseListView.setRows(interactor.resultAllPagesContent!, newRows: interactor.resultPageContent!,
-			                          rowCount: interactor.resultRowCount ?? self.baseListView.rowCount)
+			                          rowCount: interactor.resultRowCount ?? self.baseListView.rowCount,
+			                          sections: interactor.sections ?? [BaseListView.DefaultSection])
 			
 			self.onLoadPageResult(
 				page: interactor.page,
-				rows: interactor.resultPageContent ?? [],
+				rows: interactor.resultPageContent?.map {$1}.flatMap {$0} ?? [],
 				rowCount: self.baseListView.rowCount)
 			
 			self.paginationInteractors.removeValueForKey(interactor.page)
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
index 96c778db70..bdb3e73f9e 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
@@ -14,31 +14,41 @@
 import UIKit
 
 
+
 public class BaseListView: BaseScreenletView {
 	
+	public static let DefaultSection = ""
+	
 	public var streamMode: Bool = false
 	
 	public var rowCount: Int {
 		return _rowCount
 	}
 	
-	public var rows: [AnyObject?] {
+	public var rows: [String : [AnyObject?]] {
 		return _rows
 	}
 	
+	public var sections: [String] {
+		return _sections
+	}
+	
 	public var onSelectedRowClosure: (AnyObject -> Void)?
 	public var fetchPageForRow: (Int -> Void)?
 	
-	private var _rows = [AnyObject?]()
+	private var _rows = [String : [AnyObject?]]()
+	private var _sections = [String]()
 	private var _rowCount = 0
 	
 	public var loadingRows = false
 	public var moreRows = true
 	
-	public func setRows(allRows: [AnyObject?], newRows: [AnyObject], rowCount: Int) {
+	public func setRows(allRows: [String:[AnyObject?]], newRows: [String:[AnyObject]], rowCount: Int,
+	                    sections: [String]) {
+		
 		loadingRows = false
 		
-		if newRows.count == 0 || newRows.count < (screenlet as? BaseListScreenlet)?.pageSize {
+		if newRows.count == 0 {
 			moreRows = false
 		}
 		_rowCount = rowCount
@@ -46,6 +56,8 @@ public class BaseListView: BaseScreenletView {
 		let oldRows = _rows
 		_rows = allRows
 		
+		_sections = sections
+		
 		if streamMode {
 			onAddedRows(lastCount: oldRows.count)
 		} else {
@@ -55,21 +67,28 @@ public class BaseListView: BaseScreenletView {
 	
 	public func clearRows() {
 		let oldRows = _rows
-		_rows = [AnyObject?]()
+		_rows = [String : [AnyObject?]]()
+		_rows[BaseListView.DefaultSection] = [AnyObject?]()
 		_rowCount = 0
+		_sections = [String]()
 		
 		onClearRows(oldRows)
 	}
 	
-	public func onChangedRows(oldRows:[AnyObject?]) {
+	public func onChangedRows(oldRows:[String : [AnyObject?]]) {
 	}
 	
 	public func onAddedRows(lastCount lastCount: Int) {
 		
 	}
 	
-	public func onClearRows(oldRows:[AnyObject?]) {
+	public func onClearRows(oldRows:[String : [AnyObject?]]) {
 		
 	}
 	
+	internal func rowsForSectionIndex(index: Int) -> [AnyObject?] {
+		let key = sections[index]
+		
+		return rows[key]!
+	}
 }
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
index 98d6e133b8..befdc271f9 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
@@ -51,20 +51,21 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 		doRegisterCellNibs()
 	}
 	
-	override public func onChangedRows(oldRows: [AnyObject?]) {
+	override public func onChangedRows(oldRows: [String : [AnyObject?]]) {
 		super.onChangedRows(oldRows)
 
-		if oldRows.isEmpty {
+		if oldRows[BaseListView.DefaultSection]!.isEmpty {
 			insertFreshRows()
 			return
 		}
 		
 		//We have added or deleted rows since row count computation
-		if rows.count > oldRows.count {
+		if rows[BaseListView.DefaultSection]!.count > oldRows[BaseListView.DefaultSection]!.count {
 			turnStreamModeOn()
 			onAddedRows(lastCount: oldRows.count)
-		} else if rows.count < oldRows.count {
-			deleteRows(from: rows.count, to: oldRows.count)
+		} else if rows[BaseListView.DefaultSection]!.count < oldRows[BaseListView.DefaultSection]!.count {
+			deleteRows(from: rows[BaseListView.DefaultSection]!.count,
+						to: oldRows[BaseListView.DefaultSection]!.count, section: 0)
 		}
 
 		if let visibleRows = tableView!.indexPathsForVisibleRows {
@@ -83,10 +84,10 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 			hideProgressFooter()
 		}
 		
-		insertRows(from: lastCount, to: rows.count)
+		tableView?.reloadData()
 	}
 	
-	public override func onClearRows(oldRows: [AnyObject?]) {
+	public override func onClearRows(oldRows: [String : [AnyObject?]]) {
 		clearAllRows(oldRows)
 	}
 	
@@ -102,14 +103,20 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 	//MARK: UITableViewDataSource
 	
 	public func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-		return rows.count
+		return rowsForSectionIndex(section).count
+	}
+	
+	public func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+		return sections.count
 	}
 	
 	public func tableView(tableView: UITableView,
 	                      cellForRowAtIndexPath
 		indexPath: NSIndexPath)
 		-> UITableViewCell {
-			let object: AnyObject? = rows[indexPath.row]
+			let rowsForSection = rowsForSectionIndex(indexPath.section)
+			
+			let object: AnyObject? = rowsForSection[indexPath.row]
 			let cell = doDequeueReusableCell(row: indexPath.row, object: object)
 			
 			if let object = object {
@@ -128,7 +135,9 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 	public func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
 		tableView.deselectRowAtIndexPath(indexPath, animated: false)
 		
-		if let row:AnyObject = rows[indexPath.row] {
+		let rowsForSection = rowsForSectionIndex(indexPath.section)
+		
+		if let row:AnyObject = rowsForSection[indexPath.row] {
 			onSelectedRowClosure?(row)
 		}
 	}
@@ -136,7 +145,9 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 	public func tableView(tableView: UITableView, willDisplayCell cell: UITableViewCell,
 	                      forRowAtIndexPath indexPath: NSIndexPath) {
 		if streamMode && !loadingRows && moreRows {
-			if indexPath.row == rows.count - 1 {
+			if indexPath.section == sections.count - 1
+					&& indexPath.row == rowsForSectionIndex(indexPath.section).count - 1 {
+				
 				loadingRows = true
 				fetchPageForRow?(indexPath.row + 1)
 			}
@@ -211,25 +222,25 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 	}
 	
 	internal func insertFreshRows() {
-		insertRows(from: 0, to: rows.count)
+		tableView?.reloadData()
 	}
 	
-	internal func insertRows(from from: Int, to: Int) {
+	internal func insertRows(from from: Int, to: Int, section: Int) {
 		let indexPaths = (from..<to).map {
-			NSIndexPath(forRow: $0, inSection: 0)
+			NSIndexPath(forRow: $0, inSection: section)
 		}
 		tableView!.beginUpdates()
 		tableView!.insertRowsAtIndexPaths(indexPaths, withRowAnimation:.Top)
 		tableView!.endUpdates()
 	}
 	
-	internal func clearAllRows(currentRows: [AnyObject?]) {
-		deleteRows(from: 0, to: currentRows.count)
+	internal func clearAllRows(currentRows: [String : [AnyObject?]]) {
+		tableView?.reloadData()
 	}
 	
-	internal func deleteRows(from from: Int, to: Int) {
+	internal func deleteRows(from from: Int, to: Int, section: Int) {
 		let indexPaths = (from..<to).map {
-			NSIndexPath(forRow: $0, inSection: 0)
+			NSIndexPath(forRow: $0, inSection: section)
 		}
 		tableView!.beginUpdates()
 		tableView!.deleteRowsAtIndexPaths(indexPaths, withRowAnimation: .Fade)

From fd23333aff9d1fe5e297bfc34262d1eb6d77f0c4 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Mon, 11 Jul 2016 19:47:44 +0200
Subject: [PATCH 12/34] LSR-874 Support for sections in BaseListScreenlet using
 streamMode

---
 .../BaseListPageLoadInteractor.swift          | 14 +++++++--
 .../BaseListScreenlet/BaseListScreenlet.swift |  3 +-
 .../Base/BaseListScreenlet/BaseListView.swift | 29 ++++++++++++++++---
 .../TableView/BaseListTableView.swift         |  9 +++++-
 4 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
index 088015aad4..d9dae21f06 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
@@ -55,6 +55,11 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 		var convertedRowsWithSection = [String : [AnyObject]]()
 		var sections = baseListView.sections
 		
+		let isFirstPage = (page == 0)
+		let isPageFull = isFirstPage
+				? (convertedRows.count == screenlet.firstPageSize)
+				: convertedRows.count == screenlet.pageSize
+		
 		//Fill sections 
 		
 		for obj in convertedRows {
@@ -71,7 +76,7 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 			convertedRowsWithSection[sectionName]!.append(obj)
 		}
 		
-		if (sections.count > 1 || rowCount == nil) && page == 0 {
+		if (sections.count > 1 || rowCount == nil) && isFirstPage {
 			streamMode = true
 		}
 		
@@ -113,8 +118,11 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 				}
 			}
 			
-			//Deleted elements since row computation
-			if lastIndex+1 < actualRowCount && !streamMode && convertedRows.count < screenlet.pageSize && page != 0 {
+			let lessItemsThanExpected = (lastIndex + 1 < actualRowCount)
+			let incompleteMiddlePage = (!isPageFull && !isFirstPage)
+			
+			//Deleted elements since row count computation
+			if lessItemsThanExpected && !streamMode && incompleteMiddlePage {
 				for _ in lastIndex+1..<actualRowCount {
 					allRows[BaseListView.DefaultSection]!.popLast()
 				}
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
index eeb5bbbafa..e9035bf8f2 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
@@ -35,6 +35,7 @@ import UIKit
 	public var baseListView: BaseListView {
 		return screenletView as! BaseListView
 	}
+	
 	public var streamMode = false
 	
 	private var paginationInteractors: [Int:BaseListPageLoadInteractor] = [:]
@@ -80,7 +81,7 @@ import UIKit
 			self.baseListView.setRows(interactor.resultAllPagesContent!, newRows: interactor.resultPageContent!,
 			                          rowCount: interactor.resultRowCount ?? self.baseListView.rowCount,
 			                          sections: interactor.sections ?? [BaseListView.DefaultSection])
-			
+
 			self.onLoadPageResult(
 				page: interactor.page,
 				rows: interactor.resultPageContent?.map {$1}.flatMap {$0} ?? [],
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
index bdb3e73f9e..f722ce8b16 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
@@ -40,17 +40,19 @@ public class BaseListView: BaseScreenletView {
 	private var _sections = [String]()
 	private var _rowCount = 0
 	
+	//True when a request for more rows is being processed
 	public var loadingRows = false
+	
+	//True when there are more rows in the server
 	public var moreRows = true
 	
-	public func setRows(allRows: [String:[AnyObject?]], newRows: [String:[AnyObject]], rowCount: Int,
+	public func setRows(allRows: [String : [AnyObject?]], newRows: [String : [AnyObject]], rowCount: Int,
 	                    sections: [String]) {
 		
 		loadingRows = false
 		
-		if newRows.count == 0 {
-			moreRows = false
-		}
+		moreRows = areThereMoreRows(newRows)
+
 		_rowCount = rowCount
 		
 		let oldRows = _rows
@@ -91,4 +93,23 @@ public class BaseListView: BaseScreenletView {
 		
 		return rows[key]!
 	}
+	
+	internal func areThereMoreRows(newRows: [String : [AnyObject]]) -> Bool {
+		if newRows.count == 0 {
+			return false
+		}
+		
+		let newRowsCount = newRows.values.reduce(0) { $0 + $1.count }
+		let isFirstPage = rows.values.reduce(0) { $0 + $1.count } == 0
+		
+		//If we are receiving less elements than the page size there are no more rows in the server
+		if isFirstPage && newRowsCount < (screenlet as? BaseListScreenlet)?.firstPageSize {
+			return false
+		}
+		else if !isFirstPage && newRowsCount < (screenlet as? BaseListScreenlet)?.pageSize {
+			return false
+		}
+		
+		return true
+	}
 }
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
index befdc271f9..5f7714480d 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
@@ -110,6 +110,10 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 		return sections.count
 	}
 	
+	public func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+		return sections[section]
+	}
+	
 	public func tableView(tableView: UITableView,
 	                      cellForRowAtIndexPath
 		indexPath: NSIndexPath)
@@ -141,6 +145,7 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 			onSelectedRowClosure?(row)
 		}
 	}
+
 	
 	public func tableView(tableView: UITableView, willDisplayCell cell: UITableViewCell,
 	                      forRowAtIndexPath indexPath: NSIndexPath) {
@@ -149,7 +154,8 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 					&& indexPath.row == rowsForSectionIndex(indexPath.section).count - 1 {
 				
 				loadingRows = true
-				fetchPageForRow?(indexPath.row + 1)
+				let lastRow = rows.values.reduce(0) {$0 + $1.count}
+				fetchPageForRow?(lastRow + 1)
 			}
 		}
 	}
@@ -261,6 +267,7 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 	}
 	
 	internal func hideProgressFooter() {
+		
 		tableView?.tableFooterView = nil
 	}
 	

From e46897cc6db4016a10492083b2ab659e92d5a5ba Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Mon, 11 Jul 2016 19:54:21 +0200
Subject: [PATCH 13/34] LSR-874 Don't expose streamMode var

---
 .../Base/BaseListScreenlet/BaseListPageLoadInteractor.swift     | 2 +-
 .../Core/Base/BaseListScreenlet/BaseListScreenlet.swift         | 2 +-
 ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
index d9dae21f06..b3edf7b8e9 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
@@ -23,7 +23,7 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 	public var resultPageContent: [String : [AnyObject]]?
 	public var resultRowCount: Int?
 	public var sections: [String]?
-	public var streamMode = false
+	internal var streamMode = false
 	
 	
 	
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
index e9035bf8f2..f0a9f7395a 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
@@ -36,7 +36,7 @@ import UIKit
 		return screenletView as! BaseListView
 	}
 	
-	public var streamMode = false
+	internal var streamMode = false
 	
 	private var paginationInteractors: [Int:BaseListPageLoadInteractor] = [:]
 	
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
index f722ce8b16..b293efa387 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
@@ -19,7 +19,7 @@ public class BaseListView: BaseScreenletView {
 	
 	public static let DefaultSection = ""
 	
-	public var streamMode: Bool = false
+	internal var streamMode: Bool = false
 	
 	public var rowCount: Int {
 		return _rowCount

From 44d6a8183d88e61526b35b2ce2f84796facaa9e7 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Tue, 12 Jul 2016 08:33:42 +0200
Subject: [PATCH 14/34] LSR-874 Refactor ifs statements making conditions more
 clear

---
 .../BaseListPageLoadInteractor.swift          | 12 +++++-----
 .../Base/BaseListScreenlet/BaseListView.swift |  4 ++--
 .../TableView/BaseListTableView.swift         | 24 ++++++++++++-------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
index b3edf7b8e9..e64c1c25f5 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
@@ -60,8 +60,7 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 				? (convertedRows.count == screenlet.firstPageSize)
 				: convertedRows.count == screenlet.pageSize
 		
-		//Fill sections 
-		
+		//Fill sections
 		for obj in convertedRows {
 			let sectionName = sectionForRowObject(obj) ?? BaseListView.DefaultSection
 			
@@ -80,6 +79,7 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 			streamMode = true
 		}
 		
+		//Fill rows
 		if streamMode {
 			allRows = baseListView.rows
 		
@@ -105,25 +105,25 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 			}
 			
 			var offset = screenlet.firstRowForPage(page)
-			var lastIndex = 0
+			var lastIndexInserted = 0
 			
 			//Insert new elements
 			for (index, row) in convertedRows.enumerate() {
 				if index + offset < actualRowCount {
 					allRows[BaseListView.DefaultSection]![index + offset] = row
-					lastIndex = index + offset
+					lastIndexInserted = index + offset
 				}
 				else {
 					allRows[BaseListView.DefaultSection]!.append(row)
 				}
 			}
 			
-			let lessItemsThanExpected = (lastIndex + 1 < actualRowCount)
+			let lessItemsThanExpected = (lastIndexInserted + 1 < actualRowCount)
 			let incompleteMiddlePage = (!isPageFull && !isFirstPage)
 			
 			//Deleted elements since row count computation
 			if lessItemsThanExpected && !streamMode && incompleteMiddlePage {
-				for _ in lastIndex+1..<actualRowCount {
+				for _ in lastIndexInserted+1..<actualRowCount {
 					allRows[BaseListView.DefaultSection]!.popLast()
 				}
 			}
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
index b293efa387..8d0aa1d138 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
@@ -61,7 +61,7 @@ public class BaseListView: BaseScreenletView {
 		_sections = sections
 		
 		if streamMode {
-			onAddedRows(lastCount: oldRows.count)
+			onAddedRows(oldRows)
 		} else {
 			onChangedRows(oldRows)
 		}
@@ -80,7 +80,7 @@ public class BaseListView: BaseScreenletView {
 	public func onChangedRows(oldRows:[String : [AnyObject?]]) {
 	}
 	
-	public func onAddedRows(lastCount lastCount: Int) {
+	public func onAddedRows(oldRows: [String : [AnyObject?]]) {
 		
 	}
 	
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
index 5f7714480d..e5cddfe9ec 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
@@ -59,11 +59,17 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 			return
 		}
 		
-		//We have added or deleted rows since row count computation
-		if rows[BaseListView.DefaultSection]!.count > oldRows[BaseListView.DefaultSection]!.count {
+		let moreRowsThanExpected = (rows[BaseListView.DefaultSection]!.count >
+					oldRows[BaseListView.DefaultSection]!.count)
+		
+		let lessRowsThanExpected = (rows[BaseListView.DefaultSection]!.count <
+					oldRows[BaseListView.DefaultSection]!.count)
+		
+		if  moreRowsThanExpected {
 			turnStreamModeOn()
-			onAddedRows(lastCount: oldRows.count)
-		} else if rows[BaseListView.DefaultSection]!.count < oldRows[BaseListView.DefaultSection]!.count {
+			onAddedRows(oldRows)
+		}
+		else if lessRowsThanExpected {
 			deleteRows(from: rows[BaseListView.DefaultSection]!.count,
 						to: oldRows[BaseListView.DefaultSection]!.count, section: 0)
 		}
@@ -76,7 +82,7 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 		}
 	}
 	
-	override public func onAddedRows(lastCount lastCount: Int) {
+	override public func onAddedRows(oldRows: [String : [AnyObject?]]) {
 		if moreRows {
 			showProgressFooter()
 		}
@@ -150,9 +156,11 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 	public func tableView(tableView: UITableView, willDisplayCell cell: UITableViewCell,
 	                      forRowAtIndexPath indexPath: NSIndexPath) {
 		if streamMode && !loadingRows && moreRows {
-			if indexPath.section == sections.count - 1
-					&& indexPath.row == rowsForSectionIndex(indexPath.section).count - 1 {
-				
+			
+			let isLastSection = (indexPath.section == sections.count - 1)
+			let isLastRowForSection = (indexPath.row == rowsForSectionIndex(indexPath.section).count - 1)
+			
+			if isLastSection && isLastRowForSection {
 				loadingRows = true
 				let lastRow = rows.values.reduce(0) {$0 + $1.count}
 				fetchPageForRow?(lastRow + 1)

From 2570d1e5c5071b67de632f1ad9b33bd2d0cab1b4 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Tue, 12 Jul 2016 10:24:49 +0200
Subject: [PATCH 15/34] LSR-874 Rename to hasMoreRows method

---
 ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
index 8d0aa1d138..81eac1a2db 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
@@ -51,7 +51,7 @@ public class BaseListView: BaseScreenletView {
 		
 		loadingRows = false
 		
-		moreRows = areThereMoreRows(newRows)
+		moreRows = hasMoreRows(newRows)
 
 		_rowCount = rowCount
 		
@@ -94,7 +94,7 @@ public class BaseListView: BaseScreenletView {
 		return rows[key]!
 	}
 	
-	internal func areThereMoreRows(newRows: [String : [AnyObject]]) -> Bool {
+	internal func hasMoreRows(newRows: [String : [AnyObject]]) -> Bool {
 		if newRows.count == 0 {
 			return false
 		}

From f85e465ba1a5750299492002bd4b482cc295fe56 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Tue, 12 Jul 2016 10:51:25 +0200
Subject: [PATCH 16/34] LSR-874 Only BaseScreenletList save state for
 streamMode

---
 .../BaseListScreenlet/BaseListPageLoadInteractor.swift |  9 ++++++---
 .../Base/BaseListScreenlet/BaseListScreenlet.swift     | 10 +---------
 .../Core/Base/BaseListScreenlet/BaseListView.swift     |  4 ++--
 .../TableView/BaseListTableView.swift                  |  7 ++++++-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
index e64c1c25f5..78ffc8a652 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
@@ -23,7 +23,6 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 	public var resultPageContent: [String : [AnyObject]]?
 	public var resultRowCount: Int?
 	public var sections: [String]?
-	internal var streamMode = false
 	
 	
 	
@@ -75,12 +74,14 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 			convertedRowsWithSection[sectionName]!.append(obj)
 		}
 		
+		//StreamMode is only decided by the interactor in the first page load
+		//otherwise this state could be changed for other interactors
 		if (sections.count > 1 || rowCount == nil) && isFirstPage {
-			streamMode = true
+			screenlet.streamMode = true
 		}
 		
 		//Fill rows
-		if streamMode {
+		if screenlet.streamMode {
 			allRows = baseListView.rows
 		
 			for section in convertedRowsWithSection.keys {
@@ -121,6 +122,8 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 			let lessItemsThanExpected = (lastIndexInserted + 1 < actualRowCount)
 			let incompleteMiddlePage = (!isPageFull && !isFirstPage)
 			
+			let streamMode = (screenlet as! BaseListScreenlet).streamMode
+			
 			//Deleted elements since row count computation
 			if lessItemsThanExpected && !streamMode && incompleteMiddlePage {
 				for _ in lastIndexInserted+1..<actualRowCount {
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
index f0a9f7395a..c401005789 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListScreenlet.swift
@@ -68,16 +68,8 @@ import UIKit
 		
 		paginationInteractors[page] = interactor
 		
-		interactor.streamMode = streamMode
-		
 		interactor.onSuccess = {
-			//StreamMode is only decided by the interactor in the first page load
-			//otherwise this state could be changed for other interactors
-			if (page == 0) {
-				self.streamMode = interactor.streamMode
-				self.baseListView.streamMode = self.streamMode
-			}
-
+			
 			self.baseListView.setRows(interactor.resultAllPagesContent!, newRows: interactor.resultPageContent!,
 			                          rowCount: interactor.resultRowCount ?? self.baseListView.rowCount,
 			                          sections: interactor.sections ?? [BaseListView.DefaultSection])
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
index 81eac1a2db..75e196ad9a 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
@@ -19,8 +19,6 @@ public class BaseListView: BaseScreenletView {
 	
 	public static let DefaultSection = ""
 	
-	internal var streamMode: Bool = false
-	
 	public var rowCount: Int {
 		return _rowCount
 	}
@@ -49,6 +47,8 @@ public class BaseListView: BaseScreenletView {
 	public func setRows(allRows: [String : [AnyObject?]], newRows: [String : [AnyObject]], rowCount: Int,
 	                    sections: [String]) {
 		
+		let streamMode = (screenlet as! BaseListScreenlet).streamMode
+		
 		loadingRows = false
 		
 		moreRows = hasMoreRows(newRows)
diff --git a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
index e5cddfe9ec..a6aee9898f 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
@@ -134,6 +134,9 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 			}
 			else {
 				doFillInProgressCell(row: indexPath.row, cell: cell)
+				
+				let streamMode = (screenlet as! BaseListScreenlet).streamMode
+				
 				if !streamMode {
 					fetchPageForRow?(indexPath.row)
 				}
@@ -155,6 +158,9 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 	
 	public func tableView(tableView: UITableView, willDisplayCell cell: UITableViewCell,
 	                      forRowAtIndexPath indexPath: NSIndexPath) {
+		
+		let streamMode = (screenlet as! BaseListScreenlet).streamMode
+		
 		if streamMode && !loadingRows && moreRows {
 			
 			let isLastSection = (indexPath.section == sections.count - 1)
@@ -281,7 +287,6 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 	
 	internal func turnStreamModeOn() {
 		moreRows = true
-		streamMode = true
 		(screenlet as? BaseListScreenlet)?.streamMode = true
 	}
 }

From 452e03c687f240684567c7f98f9ca88e7fd9d651 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Tue, 12 Jul 2016 11:59:24 +0200
Subject: [PATCH 17/34] LSR-874 Code explanation

---
 .../Base/BaseListScreenlet/TableView/BaseListTableView.swift     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
index a6aee9898f..d5444ea813 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/TableView/BaseListTableView.swift
@@ -70,6 +70,7 @@ public class BaseListTableView: BaseListView, UITableViewDataSource, UITableView
 			onAddedRows(oldRows)
 		}
 		else if lessRowsThanExpected {
+			//Only executed in fluent mode so there is only one section
 			deleteRows(from: rows[BaseListView.DefaultSection]!.count,
 						to: oldRows[BaseListView.DefaultSection]!.count, section: 0)
 		}

From fd4630d6dc95d83ca0785441875f20fc96efc7f0 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Tue, 12 Jul 2016 12:31:49 +0200
Subject: [PATCH 18/34] LSR-874 Add stoppable reduce method

---
 ios/Framework/Core/Extensions/Global.swift | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/ios/Framework/Core/Extensions/Global.swift b/ios/Framework/Core/Extensions/Global.swift
index d346f7efa2..20f352b83b 100644
--- a/ios/Framework/Core/Extensions/Global.swift
+++ b/ios/Framework/Core/Extensions/Global.swift
@@ -14,6 +14,27 @@
 import UIKit
 
 
+extension SequenceType {
+	public func stoppableReduce<T>(initial: T, @noescape combine: (T, Self.Generator.Element,
+			inout Bool) -> T) -> T {
+		
+		var hasToStop = false
+		var generator = self.generate()
+		var currentValue = initial
+		
+		while (!hasToStop) {
+			guard let nextElement = generator.next()
+			else {
+				break
+			}
+			currentValue = combine(currentValue, nextElement, &hasToStop)
+		}
+		
+		return currentValue
+	}
+}
+
+
 public func nullIfEmpty(string: String?) -> String? {
 	if string == nil {
 		return nil

From 2e9e2bac6fad2e9d344f28f0709bc494789c66b8 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Tue, 12 Jul 2016 12:33:21 +0200
Subject: [PATCH 19/34] LSR-874 Figure out if a page is the first page now
 don't iterate over every row

---
 .../Core/Base/BaseListScreenlet/BaseListView.swift | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
index 75e196ad9a..b45e480a82 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
@@ -100,7 +100,7 @@ public class BaseListView: BaseScreenletView {
 		}
 		
 		let newRowsCount = newRows.values.reduce(0) { $0 + $1.count }
-		let isFirstPage = rows.values.reduce(0) { $0 + $1.count } == 0
+		let isFirstPage = self.isFirstPage()
 		
 		//If we are receiving less elements than the page size there are no more rows in the server
 		if isFirstPage && newRowsCount < (screenlet as? BaseListScreenlet)?.firstPageSize {
@@ -112,4 +112,16 @@ public class BaseListView: BaseScreenletView {
 		
 		return true
 	}
+	
+	internal func isFirstPage() -> Bool {
+		let hasAnyRows = rows.values.stoppableReduce(0) { (value, element, hasToStop) in
+			if value > 0 {
+				hasToStop = true
+			}
+			
+			return value + element.count
+			}
+		
+		return (hasAnyRows == 0)
+	}
 }

From fbd6dc817fea331e0f405b0bbede39a31330b9d2 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Tue, 12 Jul 2016 14:09:44 +0200
Subject: [PATCH 20/34] LSR-874 Fix WebContentListView_book error

---
 ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift    | 2 +-
 .../BookTheme/WebContentListView_book.swift                     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
index b45e480a82..158cf6bcbb 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListView.swift
@@ -88,7 +88,7 @@ public class BaseListView: BaseScreenletView {
 		
 	}
 	
-	internal func rowsForSectionIndex(index: Int) -> [AnyObject?] {
+	public func rowsForSectionIndex(index: Int) -> [AnyObject?] {
 		let key = sections[index]
 		
 		return rows[key]!
diff --git a/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/BookTheme/WebContentListView_book.swift b/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/BookTheme/WebContentListView_book.swift
index 17c2411349..e0de3b9089 100644
--- a/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/BookTheme/WebContentListView_book.swift
+++ b/ios/Samples/Showcase-swift/LiferayScreens-Showcase-Swift/BookTheme/WebContentListView_book.swift
@@ -67,6 +67,8 @@ public class WebContentListView_book: WebContentListView_default {
 
 	public func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
 
+		let rows = rowsForSectionIndex(indexPath.section)
+		
 		if let entry = rows[indexPath.row] as? WebContent {
 			return (entry.structuredRecord == nil) ? 50 : 75
 		}

From 9f6e55aacc00d9fdf804f262bc950a87da7ad0df Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Tue, 12 Jul 2016 18:28:23 +0200
Subject: [PATCH 21/34] LSR-874 Only iterate over incoming rows assigning
 sections in the first page or when there are sections. Shows an error when
 user return empty section

---
 .../BaseListPageLoadInteractor.swift          | 44 +++++++++++++------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
index 78ffc8a652..e0c51d6087 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
@@ -57,26 +57,44 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 		let isFirstPage = (page == 0)
 		let isPageFull = isFirstPage
 				? (convertedRows.count == screenlet.firstPageSize)
-				: convertedRows.count == screenlet.pageSize
+				: (convertedRows.count == screenlet.pageSize)
 		
-		//Fill sections
-		for obj in convertedRows {
-			let sectionName = sectionForRowObject(obj) ?? BaseListView.DefaultSection
+		var hasSections = (sections.count > 1) || (sections.count == 1 && sections.first != BaseListView.DefaultSection)
+		
+		// Fill sections
+		if isFirstPage || hasSections  {
 			
-			if convertedRowsWithSection.indexForKey(sectionName) == nil {
-				convertedRowsWithSection[sectionName] = [AnyObject]()
+			// Group rows loop
+			for obj in convertedRows {
+				let sectionName = sectionForRowObject(obj) ?? BaseListView.DefaultSection
+				
+				if convertedRowsWithSection.indexForKey(sectionName) == nil {
+					convertedRowsWithSection[sectionName] = [AnyObject]()
+					
+					if !sections.contains(sectionName) {
+						sections.append(sectionName)
+						
+						if sectionName != BaseListView.DefaultSection {
+							hasSections = true
+						}
+					}
+				}
 				
-				if !sections.contains(sectionName) {
-					sections.append(sectionName)
+				if hasSections && sectionName == BaseListView.DefaultSection {
+					print("ERROR: you returned mixed empty and non-empty sections in sectionForRowObject()")
 				}
+				
+				convertedRowsWithSection[sectionName]!.append(obj)
 			}
-			
-			convertedRowsWithSection[sectionName]!.append(obj)
+		}
+		else {
+			// Without sections simply assign incoming rows to the default section
+			convertedRowsWithSection[BaseListView.DefaultSection] = convertedRows
 		}
 		
-		//StreamMode is only decided by the interactor in the first page load
-		//otherwise this state could be changed for other interactors
-		if (sections.count > 1 || rowCount == nil) && isFirstPage {
+		// StreamMode is only decided by the interactor in the first page load
+		// otherwise this state could be changed for other interactors
+		if isFirstPage && (hasSections || rowCount == nil) {
 			screenlet.streamMode = true
 		}
 		

From c49080626abdba5c045db8162c6ce72c168cdd10 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Wed, 13 Jul 2016 12:44:57 +0200
Subject: [PATCH 22/34] LSR-874 Fix test build error

---
 .../BaseListPageLoadInteractor.swift          |  4 +--
 ios/Framework/Core/Extensions/Global.swift    | 22 ------------
 .../Extensions/SequenceType+Screens.swift     | 35 +++++++++++++++++++
 .../LiferayScreens.xcodeproj/project.pbxproj  |  4 +++
 4 files changed, 41 insertions(+), 24 deletions(-)
 create mode 100644 ios/Framework/Core/Extensions/SequenceType+Screens.swift

diff --git a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
index e0c51d6087..a821ddeb2c 100644
--- a/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
+++ b/ios/Framework/Core/Base/BaseListScreenlet/BaseListPageLoadInteractor.swift
@@ -123,7 +123,7 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 				allRows[BaseListView.DefaultSection]![index] = row
 			}
 			
-			var offset = screenlet.firstRowForPage(page)
+			let offset = screenlet.firstRowForPage(page)
 			var lastIndexInserted = 0
 			
 			//Insert new elements
@@ -140,7 +140,7 @@ public class BaseListPageLoadInteractor: ServerReadConnectorInteractor {
 			let lessItemsThanExpected = (lastIndexInserted + 1 < actualRowCount)
 			let incompleteMiddlePage = (!isPageFull && !isFirstPage)
 			
-			let streamMode = (screenlet as! BaseListScreenlet).streamMode
+			let streamMode = screenlet.streamMode
 			
 			//Deleted elements since row count computation
 			if lessItemsThanExpected && !streamMode && incompleteMiddlePage {
diff --git a/ios/Framework/Core/Extensions/Global.swift b/ios/Framework/Core/Extensions/Global.swift
index 20f352b83b..b66f0a890c 100644
--- a/ios/Framework/Core/Extensions/Global.swift
+++ b/ios/Framework/Core/Extensions/Global.swift
@@ -13,28 +13,6 @@
 */
 import UIKit
 
-
-extension SequenceType {
-	public func stoppableReduce<T>(initial: T, @noescape combine: (T, Self.Generator.Element,
-			inout Bool) -> T) -> T {
-		
-		var hasToStop = false
-		var generator = self.generate()
-		var currentValue = initial
-		
-		while (!hasToStop) {
-			guard let nextElement = generator.next()
-			else {
-				break
-			}
-			currentValue = combine(currentValue, nextElement, &hasToStop)
-		}
-		
-		return currentValue
-	}
-}
-
-
 public func nullIfEmpty(string: String?) -> String? {
 	if string == nil {
 		return nil
diff --git a/ios/Framework/Core/Extensions/SequenceType+Screens.swift b/ios/Framework/Core/Extensions/SequenceType+Screens.swift
new file mode 100644
index 0000000000..14d043ea48
--- /dev/null
+++ b/ios/Framework/Core/Extensions/SequenceType+Screens.swift
@@ -0,0 +1,35 @@
+/**
+* Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+*
+* This library is free software; you can redistribute it and/or modify it under
+* the terms of the GNU Lesser General Public License as published by the Free
+* Software Foundation; either version 2.1 of the License, or (at your option)
+* any later version.
+*
+* This library is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+* details.
+*/
+import Foundation
+
+
+extension SequenceType {
+	public func stoppableReduce<T>(initial: T, @noescape combine: (T, Self.Generator.Element,
+		inout Bool) -> T) -> T {
+
+		var hasToStop = false
+		var generator = self.generate()
+		var currentValue = initial
+
+		while (!hasToStop) {
+			guard let nextElement = generator.next()
+				else {
+					break
+			}
+			currentValue = combine(currentValue, nextElement, &hasToStop)
+		}
+
+		return currentValue
+	}
+}
\ No newline at end of file
diff --git a/ios/Framework/LiferayScreens.xcodeproj/project.pbxproj b/ios/Framework/LiferayScreens.xcodeproj/project.pbxproj
index 11f6dc4b23..83cca3ac1f 100644
--- a/ios/Framework/LiferayScreens.xcodeproj/project.pbxproj
+++ b/ios/Framework/LiferayScreens.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0BE1E0F31D364E96000A2678 /* SequenceType+Screens.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BE1E0F21D364E96000A2678 /* SequenceType+Screens.swift */; };
 		431250828CDCA06E95D11B8A /* Pods_LiferayScreensTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0F2FC46C9BDDDADEE705508 /* Pods_LiferayScreensTests.framework */; };
 		88019FA21B8F22EE00674B00 /* webcontentdisplay-screenlet.strings in Resources */ = {isa = PBXBuildFile; fileRef = 88019FA01B8F22EE00674B00 /* webcontentdisplay-screenlet.strings */; };
 		88019FA31B8F22EE00674B00 /* webcontentdisplay-screenlet.strings in Resources */ = {isa = PBXBuildFile; fileRef = 88019FA01B8F22EE00674B00 /* webcontentdisplay-screenlet.strings */; };
@@ -413,6 +414,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		0BE1E0F21D364E96000A2678 /* SequenceType+Screens.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SequenceType+Screens.swift"; sourceTree = "<group>"; };
 		7C0B882BE724FFD745F72E9B /* Pods-LiferayScreensTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LiferayScreensTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LiferayScreensTests/Pods-LiferayScreensTests.debug.xcconfig"; sourceTree = "<group>"; };
 		88019FA11B8F22EE00674B00 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = "en.lproj/webcontentdisplay-screenlet.strings"; sourceTree = "<group>"; };
 		880459EC1CA15FA400449D55 /* DDMFieldTableCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DDMFieldTableCell.swift; sourceTree = "<group>"; };
@@ -1387,6 +1389,7 @@
 				8892C6A91ACBD89400192232 /* UIButton+Screens.swift */,
 				8892C6AA1ACBD89400192232 /* UIView+Screens.swift */,
 				88CC3B0A1CC52E9A00E0AEB7 /* SMXMLDocument+Screens.swift */,
+				0BE1E0F21D364E96000A2678 /* SequenceType+Screens.swift */,
 			);
 			name = Extensions;
 			path = Core/Extensions;
@@ -1911,6 +1914,7 @@
 				887F0D121B99A79A0007AECE /* LRSession+Screens.swift in Sources */,
 				881E49C61B95CE66007DBEC9 /* DownloadUserPortraitInteractor.swift in Sources */,
 				887DAAA91CC670330011FEBF /* Dictionary+Screens.swift in Sources */,
+				0BE1E0F31D364E96000A2678 /* SequenceType+Screens.swift in Sources */,
 				88B844401C73D6C0007A447D /* ServerReadConnectorInteractor.swift in Sources */,
 				8839B87B1B0CD539006C18F1 /* SaveUserInteractor.swift in Sources */,
 				88A482371BFF7CBE0033DEBA /* NSError+Screens.swift in Sources */,

From 7978314812a5699541b15ef196c2da11e24cfbbf Mon Sep 17 00:00:00 2001
From: Javier Gamarra <javier.gamarra@liferay.com>
Date: Thu, 21 Jul 2016 14:03:36 +0200
Subject: [PATCH 23/34] =?UTF-8?q?locale=20can=20be=20null=20and=20won?=
 =?UTF-8?q?=E2=80=99t=20be=20a=20bad=20use=20case?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assetlist/interactor/AssetFactory.java       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/android/library/src/main/java/com/liferay/mobile/screens/assetlist/interactor/AssetFactory.java b/android/library/src/main/java/com/liferay/mobile/screens/assetlist/interactor/AssetFactory.java
index 3df5962cc7..f2396e13c7 100644
--- a/android/library/src/main/java/com/liferay/mobile/screens/assetlist/interactor/AssetFactory.java
+++ b/android/library/src/main/java/com/liferay/mobile/screens/assetlist/interactor/AssetFactory.java
@@ -19,15 +19,17 @@ public static AssetEntry createInstance(Map<String, Object> map) {
 			map.putAll((Map) map.get("object"));
 
 			String stringLocale = (String) map.get("locale");
-			Locale locale = LiferayLocale.getLocaleWithoutDefault(stringLocale);
-
 			String className = (String) map.get("className");
 
-			if (className.contains("JournalArticle")) {
-				return new WebContent(map, locale);
-			}
-			else if (className.contains("DDLRecord")) {
-				return new Record(map, locale);
+			if (stringLocale != null) {
+				Locale locale = LiferayLocale.getLocaleWithoutDefault(stringLocale);
+
+				if (className.endsWith("JournalArticle")) {
+					return new WebContent(map, locale);
+				}
+				else if (className.endsWith("DDLRecord")) {
+					return new Record(map, locale);
+				}
 			}
 		}
 		return new AssetEntry(map);

From f9065ba8ad02a423e995aec7f2cf57a488632d48 Mon Sep 17 00:00:00 2001
From: Javier Gamarra <javier.gamarra@liferay.com>
Date: Thu, 21 Jul 2016 14:04:33 +0200
Subject: [PATCH 24/34] clear request state in filtered asset list

---
 .../interactor/FilteredAssetListCallback.java     | 15 +++++++++++++++
 .../mobile/screens/base/context/RequestState.java |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/android/library/src/main/java/com/liferay/mobile/screens/assetlist/interactor/FilteredAssetListCallback.java b/android/library/src/main/java/com/liferay/mobile/screens/assetlist/interactor/FilteredAssetListCallback.java
index ffb43cf698..e8937ca9dc 100644
--- a/android/library/src/main/java/com/liferay/mobile/screens/assetlist/interactor/FilteredAssetListCallback.java
+++ b/android/library/src/main/java/com/liferay/mobile/screens/assetlist/interactor/FilteredAssetListCallback.java
@@ -15,6 +15,7 @@
 package com.liferay.mobile.screens.assetlist.interactor;
 
 import com.liferay.mobile.screens.assetlist.AssetEntry;
+import com.liferay.mobile.screens.base.context.RequestState;
 import com.liferay.mobile.screens.base.interactor.BasicEvent;
 import com.liferay.mobile.screens.base.interactor.InteractorAsyncTaskCallback;
 import com.liferay.mobile.screens.base.list.interactor.BaseListEvent;
@@ -51,6 +52,20 @@ public BaseListResult transform(Object obj) throws Exception {
 		return result;
 	}
 
+	@Override
+	public void onSuccess(BaseListResult<AssetEntry> result) {
+		RequestState.getInstance().clear(getTargetScreenletId());
+
+		super.onSuccess(result);
+	}
+
+	@Override
+	public void onFailure(Exception e) {
+		RequestState.getInstance().clear(getTargetScreenletId());
+
+		super.onFailure(e);
+	}
+
 	@Override
 	protected BasicEvent createEvent(int targetScreenletId, BaseListResult<AssetEntry> result) {
 		return new BaseListEvent<>(targetScreenletId, 0, 0, null, result.getEntries(), result.getRowCount());
diff --git a/android/library/src/main/java/com/liferay/mobile/screens/base/context/RequestState.java b/android/library/src/main/java/com/liferay/mobile/screens/base/context/RequestState.java
index cd00cc20c4..a8241bc5fb 100644
--- a/android/library/src/main/java/com/liferay/mobile/screens/base/context/RequestState.java
+++ b/android/library/src/main/java/com/liferay/mobile/screens/base/context/RequestState.java
@@ -39,6 +39,10 @@ public synchronized static RequestState getInstance() {
 		return _instance;
 	}
 
+	public void clear(int targetScreenletId) {
+		_states.remove(targetScreenletId);
+	}
+
 	public synchronized void put(int targetScreenletId, Object state) {
 		HashSet<Object> set = _states.get(targetScreenletId);
 

From 77a4772da2ac19da6fdc5439bd0d1b98468929cd Mon Sep 17 00:00:00 2001
From: Javier Gamarra <javier.gamarra@liferay.com>
Date: Thu, 21 Jul 2016 14:05:42 +0200
Subject: [PATCH 25/34] change adapter list size if we add or remove elements

---
 .../base/list/BaseListScreenletView.java      | 73 +++++++++++--------
 1 file changed, 42 insertions(+), 31 deletions(-)

diff --git a/android/library/src/main/java/com/liferay/mobile/screens/base/list/BaseListScreenletView.java b/android/library/src/main/java/com/liferay/mobile/screens/base/list/BaseListScreenletView.java
index 96e13a0ce6..37b1dd93d2 100644
--- a/android/library/src/main/java/com/liferay/mobile/screens/base/list/BaseListScreenletView.java
+++ b/android/library/src/main/java/com/liferay/mobile/screens/base/list/BaseListScreenletView.java
@@ -17,7 +17,6 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -80,21 +79,56 @@ public void showFinishOperation(String actionName) {
 	}
 
 	@Override
-	public void showFinishOperation(int page, List<E> serverEntries, int rowCount) {
-		LiferayLogger.i("loaded page " + page + " of list with " + serverEntries);
+	public void showFinishOperation(int startRow, int endRow, List<E> serverEntries, int totalRowCount) {
+		LiferayLogger.i("loaded page " + startRow + " of list with " + serverEntries);
 
 		_progressBar.setVisibility(View.GONE);
 		_recyclerView.setVisibility(View.VISIBLE);
 
+		BaseListScreenlet screenlet = (BaseListScreenlet) getScreenlet();
+
 		A adapter = getAdapter();
 
-		List<E> entries = addNewServerEntries(serverEntries, page, rowCount);
+		// current entries in the adapter
+		List<E> entries = adapter.getEntries();
 
-		adapter.setRowCount(entries.size());
+		// we have to take into account that we start requesting the 2 page (and we don't want the first 2 ones)
+		int rowToFill = startRow - _firstRow;
+		int realRowCount = totalRowCount - _firstRow;
 
-		adapter.notifyDataSetChanged();
+		if (entries.isEmpty()) {
 
-		BaseListScreenlet screenlet = (BaseListScreenlet) getScreenlet();
+			_firstRow = rowToFill;
+			realRowCount = totalRowCount - _firstRow;
+			rowToFill = 0;
+
+			// we fill all entries in the first load
+			for (int i = 0; i < realRowCount; i++) {
+				entries.add(null);
+			}
+		}
+
+
+		if (realRowCount != entries.size()) {
+			if (realRowCount > entries.size()) {
+				for (int i = entries.size(); i < realRowCount; i++) {
+					entries.add(null);
+				}
+			}
+			else {
+				for (int i = realRowCount; i < entries.size(); i++) {
+					entries.remove(i);
+				}
+			}
+		}
+
+		for (int i = 0; i < serverEntries.size() && entries.size() > i + rowToFill; i++) {
+			entries.set(i + rowToFill, serverEntries.get(i));
+		}
+
+
+		adapter.setRowCount(realRowCount);
+		adapter.notifyDataSetChanged();
 		adapter.setLabelFields(screenlet.getLabelFields());
 	}
 
@@ -104,7 +138,7 @@ public void showFailedOperation(String actionName, Exception e) {
 	}
 
 	@Override
-	public void showFinishOperation(int page, Exception e) {
+	public void showFinishOperation(int startRow, int endRow, Exception e) {
 		_progressBar.setVisibility(View.GONE);
 		_recyclerView.setVisibility(View.VISIBLE);
 		LiferayLogger.e(getContext().getString(R.string.loading_list_error), e);
@@ -222,29 +256,6 @@ protected void setRecyclerView(RecyclerView value) {
 
 	protected abstract A createListAdapter(int itemLayoutId, int itemProgressLayoutId);
 
-	@NonNull
-	protected List<E> addNewServerEntries(List<E> serverEntries, int page, int rowCount) {
-		List<E> entries = getAdapter().getEntries();
-
-		BaseListScreenlet screenlet = (BaseListScreenlet) getScreenlet();
-		int row = screenlet.getFirstRowForPage(page) - _firstRow;
-
-		if (entries.isEmpty()) {
-			_firstRow = row;
-			row = 0;
-
-			//TODO better 'real' paginator
-			for (int i = 0; i < rowCount - _firstRow; i++) {
-				entries.add(null);
-			}
-		}
-
-		for (int i = 0; i < serverEntries.size() && entries.size() > i + row; i++) {
-			entries.set(i + row, serverEntries.get(i));
-		}
-		return entries;
-	}
-
 	protected int _firstRow = 0;
 	protected ProgressBar _progressBar;
 	protected RecyclerView _recyclerView;

From 0a527ed8e6a39184e64bd91ca0dbd0c5d7500fc4 Mon Sep 17 00:00:00 2001
From: Javier Gamarra <javier.gamarra@liferay.com>
Date: Thu, 21 Jul 2016 14:08:26 +0200
Subject: [PATCH 26/34] change to a more consistent API in list

---
 .../mobile/screens/base/list/BaseListListener.java   |  4 ++--
 .../mobile/screens/base/list/BaseListScreenlet.java  | 12 ++++--------
 .../screens/base/list/view/BaseListViewModel.java    |  4 ++--
 .../activities/NotificationsActivity.java            |  4 ++--
 .../mobile/pushnotifications/list/DDLListView.java   |  4 ++--
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/android/library/src/main/java/com/liferay/mobile/screens/base/list/BaseListListener.java b/android/library/src/main/java/com/liferay/mobile/screens/base/list/BaseListListener.java
index 1760d88446..8bebf77757 100644
--- a/android/library/src/main/java/com/liferay/mobile/screens/base/list/BaseListListener.java
+++ b/android/library/src/main/java/com/liferay/mobile/screens/base/list/BaseListListener.java
@@ -11,9 +11,9 @@
  */
 public interface BaseListListener<E> extends CacheListener {
 
-	void onListPageFailed(BaseListScreenlet source, int page, Exception e);
+	void onListPageFailed(BaseListScreenlet source, int startRow, int endRow, Exception e);
 
-	void onListPageReceived(BaseListScreenlet source, int page, List<E> entries, int rowCount);
+	void onListPageReceived(BaseListScreenlet source, int startRow, int endRow, List<E> entries, int rowCount);
 
 	void onListItemSelected(E element, View view);
 }
diff --git a/android/library/src/main/java/com/liferay/mobile/screens/base/list/BaseListScreenlet.java b/android/library/src/main/java/com/liferay/mobile/screens/base/list/BaseListScreenlet.java
index 3dfac00efb..24166d6093 100644
--- a/android/library/src/main/java/com/liferay/mobile/screens/base/list/BaseListScreenlet.java
+++ b/android/library/src/main/java/com/liferay/mobile/screens/base/list/BaseListScreenlet.java
@@ -56,23 +56,19 @@ public void loadPageForRow(int row) {
 
 	@Override
 	public void onListRowsFailure(int startRow, int endRow, Exception e) {
-		int page = getPageFromRow(startRow);
-
-		getViewModel().showFinishOperation(page, e);
+		getViewModel().showFinishOperation(startRow, endRow, e);
 
 		if (_listener != null) {
-			_listener.onListPageFailed(this, page, e);
+			_listener.onListPageFailed(this, startRow, endRow, e);
 		}
 	}
 
 	@Override
 	public void onListRowsReceived(int startRow, int endRow, List<E> entries, int rowCount) {
-		int page = getPageFromRow(startRow);
-
-		getViewModel().showFinishOperation(page, entries, rowCount);
+		getViewModel().showFinishOperation(startRow, endRow, entries, rowCount);
 
 		if (_listener != null) {
-			_listener.onListPageReceived(this, page, entries, rowCount);
+			_listener.onListPageReceived(this, startRow, endRow, entries, rowCount);
 		}
 	}
 
diff --git a/android/library/src/main/java/com/liferay/mobile/screens/base/list/view/BaseListViewModel.java b/android/library/src/main/java/com/liferay/mobile/screens/base/list/view/BaseListViewModel.java
index e24e21ea07..ff992ee30c 100644
--- a/android/library/src/main/java/com/liferay/mobile/screens/base/list/view/BaseListViewModel.java
+++ b/android/library/src/main/java/com/liferay/mobile/screens/base/list/view/BaseListViewModel.java
@@ -9,8 +9,8 @@
  */
 public interface BaseListViewModel<E> extends BaseViewModel {
 
-	void showFinishOperation(int page, List<E> entries, int rowCount);
+	void showFinishOperation(int startRow, int endRow, List<E> entries, int rowCount);
 
-	void showFinishOperation(int page, Exception e);
+	void showFinishOperation(int startRow, int endRow, Exception e);
 
 }
diff --git a/android/samples/pushnotifications/src/main/java/com/liferay/mobile/pushnotifications/activities/NotificationsActivity.java b/android/samples/pushnotifications/src/main/java/com/liferay/mobile/pushnotifications/activities/NotificationsActivity.java
index 4d6fc1626c..0cd9c61eca 100644
--- a/android/samples/pushnotifications/src/main/java/com/liferay/mobile/pushnotifications/activities/NotificationsActivity.java
+++ b/android/samples/pushnotifications/src/main/java/com/liferay/mobile/pushnotifications/activities/NotificationsActivity.java
@@ -38,12 +38,12 @@ protected void onCreate(Bundle savedInstanceState) {
 	}
 
 	@Override
-	public void onListPageFailed(BaseListScreenlet baseListScreenlet, int i, Exception e) {
+	public void onListPageFailed(BaseListScreenlet source, int startRow, int endRow, Exception e) {
 
 	}
 
 	@Override
-	public void onListPageReceived(BaseListScreenlet baseListScreenlet, int i, List<Record> list, int i1) {
+	public void onListPageReceived(BaseListScreenlet source, int startRow, int endRow, List<Record> entries, int rowCount) {
 
 	}
 
diff --git a/android/samples/pushnotifications/src/main/java/com/liferay/mobile/pushnotifications/list/DDLListView.java b/android/samples/pushnotifications/src/main/java/com/liferay/mobile/pushnotifications/list/DDLListView.java
index a3b3efe690..354766f7f7 100644
--- a/android/samples/pushnotifications/src/main/java/com/liferay/mobile/pushnotifications/list/DDLListView.java
+++ b/android/samples/pushnotifications/src/main/java/com/liferay/mobile/pushnotifications/list/DDLListView.java
@@ -56,8 +56,8 @@ public void onRefresh() {
 	}
 
 	@Override
-	public void showFinishOperation(int page, List<Record> entries, int rowCount) {
-		super.showFinishOperation(page, entries, rowCount);
+	public void showFinishOperation(int startRow, int endRow, List<Record> entries, int rowCount) {
+		super.showFinishOperation(startRow, endRow, entries, rowCount);
 
 		DDLListScreenlet screenlet = (DDLListScreenlet) getParent();
 

From 7eab565e32d0ea06c8a3afda5f91c76aef9ec185 Mon Sep 17 00:00:00 2001
From: Javier Gamarra <javier.gamarra@liferay.com>
Date: Thu, 21 Jul 2016 14:27:16 +0200
Subject: [PATCH 27/34] update push to fix DXP support

---
 android/build.gradle                                 |  2 +-
 .../mobile/screens/context/LiferayPortalVersion.java | 12 +++++++++++-
 .../mobile/screens/context/LiferayServerContext.java |  6 ++++++
 .../mobile/screens/push/PushScreensActivity.java     |  5 +++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 6e0e0d9dd4..e9ab1b3523 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -49,7 +49,7 @@ ext.libraries = [
         junit            : 'junit:junit:4.12',
         gms              : 'com.google.android.gms:play-services-gcm:7.0.0',
         sdk              : 'com.liferay.mobile:liferay-android-sdk:7.0.2',
-        push             : 'com.liferay.mobile:liferay-push:1.0.8',
+        push             : 'com.liferay.mobile:liferay-push:1.1.0',
         oauth            : 'com.liferay.mobile:liferay-android-oauth:1.3.0',
         eventbus         : 'de.greenrobot:eventbus:2.4.0',
         picasso          : 'com.squareup.picasso:picasso:2.5.2',
diff --git a/android/library/src/main/java/com/liferay/mobile/screens/context/LiferayPortalVersion.java b/android/library/src/main/java/com/liferay/mobile/screens/context/LiferayPortalVersion.java
index 8cab09636c..73e356262b 100644
--- a/android/library/src/main/java/com/liferay/mobile/screens/context/LiferayPortalVersion.java
+++ b/android/library/src/main/java/com/liferay/mobile/screens/context/LiferayPortalVersion.java
@@ -5,7 +5,17 @@
  */
 public enum LiferayPortalVersion {
 
-	VERSION_62, VERSION_70;
+	VERSION_62(62), VERSION_70(70);
+
+	private final int _version;
+
+	LiferayPortalVersion(int version) {
+		_version = version;
+	}
+
+	public int getVersion() {
+		return _version;
+	}
 
 	public static LiferayPortalVersion fromInt(int version) {
 		if (version == 70) {
diff --git a/android/library/src/main/java/com/liferay/mobile/screens/context/LiferayServerContext.java b/android/library/src/main/java/com/liferay/mobile/screens/context/LiferayServerContext.java
index 2ec80b0bc3..52ada8fce9 100644
--- a/android/library/src/main/java/com/liferay/mobile/screens/context/LiferayServerContext.java
+++ b/android/library/src/main/java/com/liferay/mobile/screens/context/LiferayServerContext.java
@@ -16,6 +16,7 @@
 
 import android.content.res.Resources;
 
+import com.liferay.mobile.android.util.PortalVersion;
 import com.liferay.mobile.screens.R;
 
 /**
@@ -78,6 +79,10 @@ public static boolean isLiferay62() {
 		return LiferayPortalVersion.VERSION_70.equals(_portalVersion);
 	}
 
+	public static LiferayPortalVersion getPortalVersion() {
+		return _portalVersion;
+	}
+
 	public static String getVersionFactory() {
 		return _versionFactory;
 	}
@@ -92,4 +97,5 @@ private static long getValueFromIntegerOrString(final Resources resources, final
 	private static String _classFactory;
 	private static LiferayPortalVersion _portalVersion;
 	private static String _versionFactory;
+
 }
\ No newline at end of file
diff --git a/android/library/src/main/java/com/liferay/mobile/screens/push/PushScreensActivity.java b/android/library/src/main/java/com/liferay/mobile/screens/push/PushScreensActivity.java
index a56abdbdc4..1033a3949b 100644
--- a/android/library/src/main/java/com/liferay/mobile/screens/push/PushScreensActivity.java
+++ b/android/library/src/main/java/com/liferay/mobile/screens/push/PushScreensActivity.java
@@ -10,6 +10,8 @@
 import com.liferay.mobile.android.service.Session;
 import com.liferay.mobile.push.Push;
 import com.liferay.mobile.screens.BuildConfig;
+import com.liferay.mobile.screens.context.LiferayPortalVersion;
+import com.liferay.mobile.screens.context.LiferayServerContext;
 import com.liferay.mobile.screens.context.SessionContext;
 import com.liferay.mobile.screens.util.LiferayLogger;
 
@@ -74,6 +76,8 @@ protected void registerWithPush() {
 			Session session = SessionContext.isLoggedIn() ?
 				SessionContext.createSessionFromCurrentSession() : getDefaultSession();
 			_push = Push.with(session);
+			LiferayPortalVersion portalVersion = LiferayServerContext.getPortalVersion();
+			_push.withPortalVersion(portalVersion.getVersion());
 
 			SharedPreferences preferences = getSharedPreferences();
 
@@ -117,6 +121,7 @@ private int getVersionCode() throws PackageManager.NameNotFoundException {
 	private SharedPreferences getSharedPreferences() {
 		return getSharedPreferences(PUSH_PREFERENCES, Context.MODE_PRIVATE);
 	}
+
 	private Push _push;
 
 }
\ No newline at end of file

From efdf879af454821d86ae9e2bb4e6d48979ea226b Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Fri, 22 Jul 2016 13:55:53 +0200
Subject: [PATCH 28/34] Fix wrong name error

---
 ...DDLFieldDocumentlibraryPresenterViewController_default.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/Framework/Themes/Default/DDL/FormScreenlet/DDLFieldDocumentlibraryPresenterViewController_default.swift b/ios/Framework/Themes/Default/DDL/FormScreenlet/DDLFieldDocumentlibraryPresenterViewController_default.swift
index e8c55ec554..a52d09274e 100644
--- a/ios/Framework/Themes/Default/DDL/FormScreenlet/DDLFieldDocumentlibraryPresenterViewController_default.swift
+++ b/ios/Framework/Themes/Default/DDL/FormScreenlet/DDLFieldDocumentlibraryPresenterViewController_default.swift
@@ -15,7 +15,7 @@ import UIKit
 import MobileCoreServices
 
 
-private let xibName = "DDMFieldDocumentlibraryPresenterViewController_default"
+private let xibName = "DDLFieldDocumentlibraryPresenterViewController_default"
 
 
 public class DDMFieldDocumentlibraryPresenterViewController_default:

From 4416a5dffd4cd2350fa11d0b64a5e3ae3ca0e6f7 Mon Sep 17 00:00:00 2001
From: Victor Galan <victor.galan@liferay.com>
Date: Fri, 22 Jul 2016 13:56:40 +0200
Subject: [PATCH 29/34] Fix error that dismisses view controller instantly

---
 .../DDLFieldDocumentlibraryPresenterViewController_default.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ios/Framework/Themes/Default/DDL/FormScreenlet/DDLFieldDocumentlibraryPresenterViewController_default.swift b/ios/Framework/Themes/Default/DDL/FormScreenlet/DDLFieldDocumentlibraryPresenterViewController_default.swift
index a52d09274e..2e08194789 100644
--- a/ios/Framework/Themes/Default/DDL/FormScreenlet/DDLFieldDocumentlibraryPresenterViewController_default.swift
+++ b/ios/Framework/Themes/Default/DDL/FormScreenlet/DDLFieldDocumentlibraryPresenterViewController_default.swift
@@ -92,7 +92,6 @@ public class DDMFieldDocumentlibraryPresenterViewController_default:
 	}
 
 	@IBAction private func selectVideosAction(sender: AnyObject) {
-		cancelButtonAction(sender)
 
 		imagePicker.sourceType = .SavedPhotosAlbum
 		imagePicker.mediaTypes = [kUTTypeMovie as NSString as String]

From 59babd427ddfe2fe13b541c79b14f260d2246fdb Mon Sep 17 00:00:00 2001
From: Javier Gamarra <javier.gamarra@liferay.com>
Date: Tue, 2 Aug 2016 13:52:20 +0200
Subject: [PATCH 30/34] adapt demo activities to pagination change

---
 .../activities/IssuesActivity.java            | 19 +++++++++++--------
 .../screens/testapp/AssetListActivity.java    |  7 ++++---
 .../screens/testapp/DDLListActivity.java      |  7 ++++---
 .../testapp/FilteredAssetActivity.java        |  7 +++----
 .../testapp/ListBookmarksActivity.java        | 11 ++++-------
 5 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/android/samples/bankofwesteros/src/main/java/com/liferay/mobile/screens/bankofwesteros/activities/IssuesActivity.java b/android/samples/bankofwesteros/src/main/java/com/liferay/mobile/screens/bankofwesteros/activities/IssuesActivity.java
index 8e16e6077e..c9aa05756e 100644
--- a/android/samples/bankofwesteros/src/main/java/com/liferay/mobile/screens/bankofwesteros/activities/IssuesActivity.java
+++ b/android/samples/bankofwesteros/src/main/java/com/liferay/mobile/screens/bankofwesteros/activities/IssuesActivity.java
@@ -110,6 +110,17 @@ public void onClick(View v) {
 		}
 	}
 
+	@Override
+	public void onListPageFailed(BaseListScreenlet source, int startRow, int endRow, Exception e) {
+
+	}
+
+	@Override
+	public void onListPageReceived(BaseListScreenlet source, int startRow, int endRow, List<Record> entries,
+		int rowCount) {
+
+	}
+
 	@Override
 	public void onListItemSelected(Record element, View view) {
 		selectDDLEntry(element);
@@ -175,14 +186,6 @@ public void onDDLFormDocumentUploaded(DocumentField documentField, JSONObject js
 	public void onDDLFormDocumentUploadFailed(DocumentField documentField, Exception e) {
 	}
 
-	@Override
-	public void onListPageFailed(BaseListScreenlet source, int page, Exception e) {
-	}
-
-	@Override
-	public void onListPageReceived(BaseListScreenlet source, int page, List<Record> entries,
-								   int rowCount) {
-	}
 
 	@Override
 	public void loadingFromCache(boolean success) {
diff --git a/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/AssetListActivity.java b/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/AssetListActivity.java
index 8aed52e7c6..f92b8639ea 100644
--- a/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/AssetListActivity.java
+++ b/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/AssetListActivity.java
@@ -49,13 +49,14 @@ protected void onResume() {
 	}
 
 	@Override
-	public void onListPageFailed(BaseListScreenlet source, int page, Exception e) {
+	public void onListPageFailed(BaseListScreenlet source, int startRow, int endRow, Exception e) {
 		error("Page request failed", e);
 	}
 
 	@Override
-	public void onListPageReceived(BaseListScreenlet source, int page, List<AssetEntry> entries, int rowCount) {
-		info("Page " + page + " received!");
+	public void onListPageReceived(BaseListScreenlet source, int startRow, int endRow, List<AssetEntry> entries,
+		int rowCount) {
+		info("Row " + startRow + " received!");
 	}
 
 	@Override
diff --git a/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/DDLListActivity.java b/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/DDLListActivity.java
index b3b6fcd6a9..1412532bb3 100644
--- a/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/DDLListActivity.java
+++ b/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/DDLListActivity.java
@@ -56,13 +56,14 @@ protected void onResume() {
 	}
 
 	@Override
-	public void onListPageFailed(BaseListScreenlet source, int page, Exception e) {
+	public void onListPageFailed(BaseListScreenlet source, int startRow, int endRow, Exception e) {
 		error("Page request failed", e);
 	}
 
 	@Override
-	public void onListPageReceived(BaseListScreenlet source, int page, List<Record> entries, int rowCount) {
-//		info("Page " + page + " received!");
+	public void onListPageReceived(BaseListScreenlet source, int startRow, int endRow, List<Record> entries,
+		int rowCount) {
+		info("Row " + startRow + " received!");
 	}
 
 	@Override
diff --git a/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/FilteredAssetActivity.java b/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/FilteredAssetActivity.java
index 630c21693b..57575c6200 100644
--- a/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/FilteredAssetActivity.java
+++ b/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/FilteredAssetActivity.java
@@ -2,12 +2,10 @@
 
 import android.os.Bundle;
 import android.view.View;
-
 import com.liferay.mobile.screens.assetlist.AssetEntry;
 import com.liferay.mobile.screens.assetlist.AssetListScreenlet;
 import com.liferay.mobile.screens.base.list.BaseListListener;
 import com.liferay.mobile.screens.base.list.BaseListScreenlet;
-
 import java.util.List;
 
 public class FilteredAssetActivity extends ThemeActivity implements BaseListListener<AssetEntry> {
@@ -22,12 +20,13 @@ protected void onCreate(Bundle savedInstanceState) {
 	}
 
 	@Override
-	public void onListPageFailed(BaseListScreenlet source, int page, Exception e) {
+	public void onListPageFailed(BaseListScreenlet source, int startRow, int endRow, Exception e) {
 
 	}
 
 	@Override
-	public void onListPageReceived(BaseListScreenlet source, int page, List<AssetEntry> entries, int rowCount) {
+	public void onListPageReceived(BaseListScreenlet source, int startRow, int endRow, List<AssetEntry> entries,
+		int rowCount) {
 
 	}
 
diff --git a/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/ListBookmarksActivity.java b/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/ListBookmarksActivity.java
index 7a2bfd94c2..af0806b7db 100644
--- a/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/ListBookmarksActivity.java
+++ b/android/samples/test-app/src/main/java/com/liferay/mobile/screens/testapp/ListBookmarksActivity.java
@@ -3,12 +3,10 @@
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
-
 import com.liferay.mobile.screens.base.list.BaseListScreenlet;
 import com.liferay.mobile.screens.listbookmark.Bookmark;
 import com.liferay.mobile.screens.listbookmark.BookmarkListListener;
 import com.liferay.mobile.screens.listbookmark.BookmarkListScreenlet;
-
 import java.util.List;
 
 public class ListBookmarksActivity extends AppCompatActivity implements BookmarkListListener {
@@ -18,19 +16,18 @@ protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_list_bookmarks);
 
-		BookmarkListScreenlet bookmarkListScreenlet =
-			(BookmarkListScreenlet) findViewById(R.id.bookmarklist_screenlet);
+		BookmarkListScreenlet bookmarkListScreenlet = (BookmarkListScreenlet) findViewById(R.id.bookmarklist_screenlet);
 		bookmarkListScreenlet.setListener(this);
 	}
 
-
 	@Override
-	public void onListPageFailed(BaseListScreenlet source, int page, Exception e) {
+	public void onListPageFailed(BaseListScreenlet source, int startRow, int endRow, Exception e) {
 
 	}
 
 	@Override
-	public void onListPageReceived(BaseListScreenlet source, int page, List<Bookmark> entries, int rowCount) {
+	public void onListPageReceived(BaseListScreenlet source, int startRow, int endRow, List<Bookmark> entries,
+		int rowCount) {
 
 	}
 

From 164dca2455cb7cd2e53aebb4eeae97fe06485945 Mon Sep 17 00:00:00 2001
From: Javier Gamarra <javier.gamarra@liferay.com>
Date: Tue, 2 Aug 2016 13:52:24 +0200
Subject: [PATCH 31/34] bump version number

---
 android/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index e9ab1b3523..6dfbb07979 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -17,8 +17,8 @@ ext {
     targetSdkVersion = compileSdkVersion
     buildToolsVersion = '23.0.3'
 
-    versionCode = 5
-    versionName = '1.4.0'
+    versionCode = 6
+    versionName = '1.4.1'
 
     publishedGroupId = 'com.liferay.mobile'
     libraryName = 'Liferay Screens for Android'

From b4ec347f89048489e2e30aab34caf274c19d639f Mon Sep 17 00:00:00 2001
From: Javier Gamarra <javier.gamarra@liferay.com>
Date: Tue, 2 Aug 2016 13:55:52 +0200
Subject: [PATCH 32/34] comment org

---
 android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/build.gradle b/android/build.gradle
index 6dfbb07979..68e668bc4b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -26,7 +26,7 @@ ext {
 
     bintrayRepo = 'liferay-mobile'
     bintrayOrg = ''
-    bintrayOrg = 'liferay'
+//    bintrayOrg = 'liferay'
 
     siteUrl = 'https://github.com/liferay/liferay-screens'
     gitUrl = 'https://github.com/liferay/liferay-screens.git'

From 624ccbdd2baffc1a58e55b6817f289b50fb50067 Mon Sep 17 00:00:00 2001
From: JM <jose.navarro@liferay.com>
Date: Tue, 2 Aug 2016 14:12:38 +0200
Subject: [PATCH 33/34] Use latest Mobile SDK version for iOS

---
 LiferayScreens.podspec | 2 +-
 ios/Framework/Podfile  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LiferayScreens.podspec b/LiferayScreens.podspec
index 704f6549db..5fe56cb3d6 100644
--- a/LiferayScreens.podspec
+++ b/LiferayScreens.podspec
@@ -51,7 +51,7 @@ Pod::Spec.new do |s|
 	}
 
 	# Core
-	s.dependency 'Liferay-iOS-SDK', '~> 7.0.3'
+	s.dependency 'Liferay-iOS-SDK', '~> 7.0.4'
 	s.dependency 'Liferay-OAuth', '~> 1.2.0'
 	s.dependency 'MBProgressHUD', '0.9.1'
 	s.dependency 'SMXMLDocument', '1.1'
diff --git a/ios/Framework/Podfile b/ios/Framework/Podfile
index f749f74649..e33d5595c4 100644
--- a/ios/Framework/Podfile
+++ b/ios/Framework/Podfile
@@ -5,7 +5,7 @@ use_frameworks!
 
 
 # Core
-pod 'Liferay-iOS-SDK', '~> 7.0.3'
+pod 'Liferay-iOS-SDK', '~> 7.0.4'
 pod 'Liferay-OAuth', '~> 1.2.0'
 pod 'MBProgressHUD', '0.9.1'
 pod 'SMXMLDocument', '1.1'

From 71c758de37df5486835192394a3ae1f5e27cfa2a Mon Sep 17 00:00:00 2001
From: JM <jose.navarro@liferay.com>
Date: Tue, 2 Aug 2016 14:12:43 +0200
Subject: [PATCH 34/34] Bump version

---
 LiferayScreens.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LiferayScreens.podspec b/LiferayScreens.podspec
index 5fe56cb3d6..f8ced8292c 100644
--- a/LiferayScreens.podspec
+++ b/LiferayScreens.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 	s.name         = 'LiferayScreens'
 	s.module_name  = 'LiferayScreens'
-	s.version      = '1.4.0'
+	s.version      = '1.4.1'
 	s.summary      = 'A family of visual components called screenlets that are connected to the Liferay Platform used as a backend'
 	s.homepage     = 'https://www.liferay.com/liferay-screens'
 	s.license = {