From 0db54b76a98437be9f11867a23b11970565e950b Mon Sep 17 00:00:00 2001
From: ShadowKyogre <shadowkyogre.public@gmail.com>
Date: Fri, 4 Sep 2015 18:07:16 -0700
Subject: [PATCH 1/3] Add Javascript bookmarklets support. Also make searches
 like like "webkit android 4.4.2 broken" actually searchable and local files
 viewable.

---
 AndroidManifest.xml              | 7 +++++++
 src/org/tint/utils/UrlUtils.java | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ccd73bb..cbe7664 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -43,6 +43,7 @@
     <uses-permission android:name="org.tint.permissions.services.ADDONS" />
     
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 
@@ -69,6 +70,12 @@
 				<data android:scheme="http" />
 				<data android:scheme="https" />
 			</intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:mimeType="text/html" />
+            </intent-filter>
         </activity>
 
         <activity android:name=".ui.preferences.PreferencesActivity" android:label="@string/PreferencesActivityTitle"></activity>
diff --git a/src/org/tint/utils/UrlUtils.java b/src/org/tint/utils/UrlUtils.java
index 84d5a47..9e531e4 100644
--- a/src/org/tint/utils/UrlUtils.java
+++ b/src/org/tint/utils/UrlUtils.java
@@ -34,7 +34,11 @@ public class UrlUtils {
 	 */
 	public static boolean isUrl(String url) {
 		return 
-			url.contains(".") ||
+			(url.contains(".") && !url.contains(" ")) || /* actually check if it begins with the proper protocol */
+			url.startsWith("http://") ||
+			url.startsWith("https://") ||
+			url.startsWith("file://") ||
+			url.startsWith("javascript:") ||
 			url.equals(Constants.URL_ABOUT_BLANK) ||
 			url.equals(Constants.URL_ABOUT_START) ||
 			url.equals(Constants.URL_ABOUT_TUTORIAL);
@@ -76,6 +80,7 @@ public static String checkUrl(String url) {
     		if ((!url.startsWith("http://")) &&
     				(!url.startsWith("https://")) &&
     				(!url.startsWith("file://")) &&
+					(!url.startsWith("javascript:")) && //add bookmarklet support
     				(!url.startsWith(Constants.URL_ABOUT_BLANK)) &&
     				(!url.startsWith(Constants.URL_ABOUT_START)) &&
     				(!url.startsWith(Constants.URL_ABOUT_TUTORIAL))) {

From 8df8b3ea3a6113d3dbac5b6d0bc12c874ff0ae68 Mon Sep 17 00:00:00 2001
From: ShadowKyogre <shadowkyogre.public@gmail.com>
Date: Fri, 4 Sep 2015 18:21:49 -0700
Subject: [PATCH 2/3] Expose the nested folder support to the user. This does
 quite a few things to address this: - Implement a new folder picker that
 handles browsing available folders. Much of the code is borrowed from the
 already existing BookmarksFragment - Add rename and move operations for
 folders and bookmarks - Expose creating folders in the BookmarksActivity and
 the new folder picker (even if they're not top level!) - Clean up a lot of
 how TintBrowser was performing sql queries. It was concatenating the strings
 manually instead of trying to use the ? notation wherever possible. - Add
 getting the folder stack for a given folder ID. This allows the folder picker
 to easily jump to the current bookmark/folder's location when the user wants
 to move it. - Drawables, since there weren't any for adding folders nor
 smaller ones for the folder picker UI

---
 res/drawable-hdpi/ic_add_folder.png           | Bin 0 -> 6477 bytes
 res/drawable-hdpi/ic_folder_mini.png          | Bin 0 -> 4914 bytes
 res/drawable-mdpi/ic_add_folder.png           | Bin 0 -> 479 bytes
 res/drawable-mdpi/ic_folder_mini.png          | Bin 0 -> 448 bytes
 res/layout/bookmarks_fragment.xml             |   4 +-
 res/layout/edit_bookmark_activity.xml         |  18 +-
 res/layout/foldersonly_fragment.xml           | 106 ++++
 res/layout/foldersonly_row.xml                |  59 ++
 res/menu/bookmarks_activity_menu.xml          |   8 +-
 res/values/strings.xml                        |   6 +-
 src/org/tint/model/FoldersOnlyAdapter.java    |  39 ++
 src/org/tint/providers/BookmarksWrapper.java  | 310 ++++++-----
 .../tint/ui/activities/BookmarksActivity.java |  19 +-
 .../ui/activities/EditBookmarkActivity.java   | 148 ++---
 .../ui/activities/TintBrowserActivity.java    |   2 +-
 .../tint/ui/fragments/BookmarksFragment.java  | 192 ++++++-
 .../ui/fragments/FoldersOnlyFragment.java     | 514 ++++++++++++++++++
 17 files changed, 1154 insertions(+), 271 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_add_folder.png
 create mode 100644 res/drawable-hdpi/ic_folder_mini.png
 create mode 100644 res/drawable-mdpi/ic_add_folder.png
 create mode 100644 res/drawable-mdpi/ic_folder_mini.png
 create mode 100644 res/layout/foldersonly_fragment.xml
 create mode 100644 res/layout/foldersonly_row.xml
 create mode 100644 src/org/tint/model/FoldersOnlyAdapter.java
 create mode 100644 src/org/tint/ui/fragments/FoldersOnlyFragment.java

diff --git a/res/drawable-hdpi/ic_add_folder.png b/res/drawable-hdpi/ic_add_folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f8fa9f5cbac7c265a674a5a8dfeeda51ca9083e
GIT binary patch
literal 6477
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

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_folder_mini.png b/res/drawable-hdpi/ic_folder_mini.png
new file mode 100644
index 0000000000000000000000000000000000000000..5673da5c57c7445c7c8fc2bbed7ac6a51877e450
GIT binary patch
literal 4914
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
aoK%0&)lZ-AYf5DOW5CSV+NjRJJ?39NUJ<td

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_add_folder.png b/res/drawable-mdpi/ic_add_folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ff97beaf6a77510d4f227e4cc298fbe9df18698
GIT binary patch
literal 479
zcmV<50U-W~P)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg00002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru-w6U1BoPZ%ur>ey02y>eSad^g
zZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00B!$L_t(Y$L*B6N&`_4hQCSH%M<tn
zVk!|yu(ioEczJ`huoOYe3kYH(Xzc@7Sc)$oti8syv9k#%1jNnBSnO_+-LtD_6%@p2
z=3F@c{PWM8fq(mblh}24vZo6Nt^i)_YU}6-PT}shap49~%X5jX-f?A6D@(1rUrB>7
z0Cb!JlK6C$-U#$pmWGxF@pZK360@%bA_8EBk2AsN0CR)@%r9pF)ErK2VXPEDP$ZKO
z$nY%BK+O5{4Q8Sql2IzV<K@IE<3JfCQt8OYYX#JA`psmg)LT&wKzp;RNfarn)5M*C
zURxrXj(3z|WdJk>2nw&e7Jzr0dx-sP%xdx3?nJHd1)qxgKuWSMsKVQ}b1VC;avE3i
z(PyeUP{JUIoAz8mC;BZo4G^=}xU@8gHXMT8L$nFKhcA+CYg^q13g4YbKL_v!>>cA_
VW_;i9Ci(yX002ovPDHLkV1nTS#F792

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_folder_mini.png b/res/drawable-mdpi/ic_folder_mini.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bf35f1ba957b46320c2bec90e19d2e993786a85
GIT binary patch
literal 448
zcmV;x0YCnUP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg00002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru-w6W%0uPdqw$=au02y>eSad^g
zZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00AsXL_t(Y$L&-xN&`U@eSfoRPT&bd
zK@brnt+!CGU|}gX$pr*SBiMTY3vUrfdJWOS&L*G`5I3{WVs_X4Gh=pA36j_RnVp?C
z@4r8PfEE58V#D}Cf8D-{B}i>ZPQZ$ez|-T-LmWZkYO!ebVihF6r8e#^<-ueKfIlff
zidc@y6#-_Q{oM1wE@#IvXU-Tf5ddKF*NtH_!6qgEfUN^fKy$rz2IHjw2nbOL0g~Uj
z3dG#6k6>!`5apDf;p5gT<D8fmR<Vk9OlL;44l_pqr|qNS6aoD@DFx)fGtu<Ye#xag
zV{I!-4?ZtFg7n7O=t8O5d-rc5muSJa&^?faS*zLCdAJu?#ZVP$f9$?AH`5~I;cjGu
q6O|Uz4fH~G8ZTh_yn4w09lik~fMokU;L@J}0000<MNUMnLSTZq5V6Ss

literal 0
HcmV?d00001

diff --git a/res/layout/bookmarks_fragment.xml b/res/layout/bookmarks_fragment.xml
index 78aaa24..8bb3133 100644
--- a/res/layout/bookmarks_fragment.xml
+++ b/res/layout/bookmarks_fragment.xml
@@ -49,7 +49,9 @@
                 android:id="@+id/BookmarksBreadCrumb"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:gravity="center_vertical|left" />
+                android:gravity="center_vertical|start"
+                android:layout_weight="1" />
+
         </LinearLayout>
 
         <ImageView
diff --git a/res/layout/edit_bookmark_activity.xml b/res/layout/edit_bookmark_activity.xml
index 13f6f42..18874d9 100644
--- a/res/layout/edit_bookmark_activity.xml
+++ b/res/layout/edit_bookmark_activity.xml
@@ -87,21 +87,13 @@
                         android:text="@string/Folder"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
 
-                    <Spinner
-                        android:id="@+id/EditBookmarkActivity.FolderSpinner"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="20dip" />
+                    <Button android:id="@+id/PickFolder"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="I AM BEAUTIFUL"
+                            android:onClick="pickFolder" />
                 </TableRow>
 
-                <EditText
-                    android:id="@+id/EditBookmarkActivity.FolderValue"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dip"
-                    android:hint="@string/NewFolderHint"
-                    android:inputType="text" >
-                </EditText>
             </TableLayout>
         </ScrollView>
     </FrameLayout>
diff --git a/res/layout/foldersonly_fragment.xml b/res/layout/foldersonly_fragment.xml
new file mode 100644
index 0000000..084481c
--- /dev/null
+++ b/res/layout/foldersonly_fragment.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+   Tint Browser for Android
+  
+   Copyright (C) 2012 - to infinity and beyond J. Devauchelle and contributors.
+ 
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   version 3 as published by the Free Software Foundation.
+ 
+   This program 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 General Public License for more details.
+ -->
+ 
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="0dip"
+    android:orientation="vertical" >
+    
+    <LinearLayout
+        android:id="@+id/BookmarksBreadCrumbGroup"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/bookmarks_fragment_margin_top_bottom"
+            android:layout_marginBottom="10dip"
+            android:layout_marginLeft="@dimen/bookmarks_fragment_breadcrumb_margin_left_right"
+            android:layout_marginRight="@dimen/bookmarks_fragment_breadcrumb_margin_left_right"            
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/BookmarksBreadCrumbBackHierarchy"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:background="?android:attr/selectableItemBackground"
+                android:contentDescription="@string/ContentDescriptionBookmarksFoldersBack"
+                android:focusable="true"
+                android:src="@drawable/ic_back_hierarchy" />
+
+            <android.app.FragmentBreadCrumbs
+                android:id="@+id/BookmarksBreadCrumb"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical|start"
+                android:layout_weight="1" />
+
+            <ImageView
+                android:id="@+id/BookmarksBreadCrumbAddFolder"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:background="?android:attr/selectableItemBackground"
+                android:contentDescription="@string/NewFolder"
+                android:focusable="true"
+                android:src="@drawable/ic_add_folder" />
+
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/bookmarks_fragment_margin_left_right"
+            android:layout_marginRight="@dimen/bookmarks_fragment_margin_left_right"
+            android:contentDescription="@string/ContentDescriptionDivider"
+            android:paddingRight="5dip"
+            android:scaleType="fitXY"
+            android:src="?android:attr/dividerHorizontal" />
+        
+	</LinearLayout>    
+
+    <RelativeLayout
+        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+
+        <ListView
+            android:id="@+id/BookmarksGridView"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginBottom="@dimen/bookmarks_fragment_margin_top_bottom"
+            android:layout_marginLeft="@dimen/bookmarks_fragment_margin_left_right"
+            android:layout_marginRight="@dimen/bookmarks_fragment_margin_left_right"
+            android:layout_marginTop="10dip"
+            android:columnWidth="@dimen/bookmarks_fragment_column_width"
+            android:gravity="center"
+            android:horizontalSpacing="@dimen/bookmarks_fragment_horizontal_spacing"
+            android:numColumns="auto_fit"
+            android:stretchMode="columnWidth"
+            android:verticalSpacing="@dimen/bookmarks_fragment_vertical_spacing" />
+
+        <ProgressBar
+            android:id="@+id/BookmarksProgressBar"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/foldersonly_row.xml b/res/layout/foldersonly_row.xml
new file mode 100644
index 0000000..90ba8fa
--- /dev/null
+++ b/res/layout/foldersonly_row.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+   Tint Browser for Android
+  
+   Copyright (C) 2012 - to infinity and beyond J. Devauchelle and contributors.
+ 
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   version 3 as published by the Free Software Foundation.
+ 
+   This program 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 General Public License for more details.
+ -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:paddingTop="5dip"
+	android:paddingBottom="5dip"
+	android:layout_height="wrap_content"
+	android:layout_width="match_parent"
+	android:orientation="vertical">
+	
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="5dip"
+		android:layout_gravity="center_vertical"
+		android:orientation="horizontal" >
+	
+		<ImageView
+	        android:id="@+id/divider"
+	        android:layout_width="wrap_content"
+	        android:layout_height="fill_parent"
+	        android:paddingRight="5dip"
+	        android:scaleType="fitXY"
+	        android:src="@drawable/ic_folder_mini" />
+	
+		<LinearLayout
+		    android:layout_width="wrap_content"
+		    android:layout_height="fill_parent"
+		    android:layout_gravity="center_vertical"		    
+		    android:orientation="vertical" >
+
+		    <TextView
+		        android:id="@+id/BookmarkRow.Title"
+		        android:layout_width="fill_parent"
+		        android:layout_height="wrap_content"
+		        android:layout_gravity="center_vertical"
+		        android:ellipsize="marquee"
+		        android:singleLine="true"
+		        android:text="" />
+
+		</LinearLayout>
+	
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/bookmarks_activity_menu.xml b/res/menu/bookmarks_activity_menu.xml
index 3fd4507..099159a 100644
--- a/res/menu/bookmarks_activity_menu.xml
+++ b/res/menu/bookmarks_activity_menu.xml
@@ -22,7 +22,13 @@
 	    android:title="@string/AddBookmark"
 	    android:icon="@drawable/ic_add_bookmark"
 	    android:showAsAction="ifRoom|withText" />
-    
+
+    <item
+        android:id="@+id/BookmarksActivityMenuAddFolder"
+        android:title="@string/NewFolder"
+        android:icon="@drawable/ic_add_folder"
+        android:showAsAction="ifRoom|withText" />
+
     <item
 	    android:id="@+id/BookmarksActivityMenuSortBookmarks"
 	    android:title="@string/SortBookmarks" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 40a405e..4c1c41c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -576,5 +576,9 @@
     <string name="PreferenceJsLogOnLocatSummary">Redirect javascript logs to the logcat buffer.</string>
     
     <string name="ContextMenuViewImageInNewTab">View image in a new tab</string>
-    
+    <string name="RenameFolder">Rename folder</string>
+    <string name="MoveFolder">Move folder</string>
+    <string name="MoveBookmark">Move bookmark</string>
+    <string name="PickFolder">Pick folder</string>
+
 </resources>
\ No newline at end of file
diff --git a/src/org/tint/model/FoldersOnlyAdapter.java b/src/org/tint/model/FoldersOnlyAdapter.java
new file mode 100644
index 0000000..9ad098d
--- /dev/null
+++ b/src/org/tint/model/FoldersOnlyAdapter.java
@@ -0,0 +1,39 @@
+/*
+ * Tint Browser for Android
+ * 
+ * Copyright (C) 2012 - to infinity and beyond J. Devauchelle and contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 3 as published by the Free Software Foundation.
+ *
+ * This program 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 General Public License for more details.
+ */
+
+package org.tint.model;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.SimpleCursorAdapter;
+
+public class FoldersOnlyAdapter extends SimpleCursorAdapter {
+
+	public FoldersOnlyAdapter(Context context, int layout, Cursor c, String[] from, int[] to, int flags) {
+		super(context, layout, c, from, to, flags);
+	}
+	
+	@Override
+	public View getView(int position, View convertView, ViewGroup parent) {
+		View superView = super.getView(position, convertView, parent);
+
+		//until we have something
+		
+		return superView;
+	}
+
+}
diff --git a/src/org/tint/providers/BookmarksWrapper.java b/src/org/tint/providers/BookmarksWrapper.java
index 48ba425..a7ed536 100644
--- a/src/org/tint/providers/BookmarksWrapper.java
+++ b/src/org/tint/providers/BookmarksWrapper.java
@@ -18,11 +18,10 @@
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
-import java.util.List;
 
 import org.tint.model.BookmarkHistoryItem;
-import org.tint.model.FolderItem;
 import org.tint.utils.Constants;
 
 import android.content.ContentResolver;
@@ -69,30 +68,51 @@ public static CursorLoader getCursorLoaderForStartPage(Context context, int limi
 	}
 	
 	public static CursorLoader getCursorLoaderForBookmarks(Context context, long parentFolderId) {
+		return getCursorLoaderForBookmarks(context, parentFolderId, false);
+	}
+
+	public static CursorLoader getCursorLoaderForBookmarks(Context context, long parentFolderId, boolean onlyFolders) {
+		return getCursorLoaderForBookmarks(context, parentFolderId, onlyFolders, -1);
+	}
+
+	public static CursorLoader getCursorLoaderForBookmarks(Context context, long parentFolderId, boolean onlyFolders, long blacklist) {
 		int sortMode = PreferenceManager.getDefaultSharedPreferences(context).getInt(Constants.PREFERENCE_BOOKMARKS_SORT_MODE, 0);
-		
-		String whereClause = BookmarksProvider.Columns.PARENT_FOLDER_ID + " = " + parentFolderId + " AND (" + BookmarksProvider.Columns.BOOKMARK + " = 1 OR " + BookmarksProvider.Columns.IS_FOLDER + " = 1)";
-		
+
+		String whereClause;
 		String orderClause;
+
+		if (onlyFolders) {
+			whereClause = BookmarksProvider.Columns._ID + " != ? AND "
+					+ BookmarksProvider.Columns.PARENT_FOLDER_ID
+					+ " = ? AND " + BookmarksProvider.Columns.IS_FOLDER + " = 1";
+		}
+		else {
+			whereClause = BookmarksProvider.Columns._ID + " != ? AND "
+					+ BookmarksProvider.Columns.PARENT_FOLDER_ID + " = ? AND ("
+					+ BookmarksProvider.Columns.BOOKMARK + " = 1 OR " + BookmarksProvider.Columns.IS_FOLDER + " = 1)";
+		}
+
 		switch (sortMode) {
-		case 0:
-			orderClause = BookmarksProvider.Columns.IS_FOLDER + " DESC, " + BookmarksProvider.Columns.VISITS + " DESC, " + BookmarksProvider.Columns.TITLE + " COLLATE NOCASE";
-			break;
-		
-		case 1:
-			orderClause = BookmarksProvider.Columns.IS_FOLDER + " DESC, " + BookmarksProvider.Columns.TITLE + " COLLATE NOCASE, " + BookmarksProvider.Columns.VISITS + " DESC";
-			break;
-			
-		case 2:
-			orderClause = BookmarksProvider.Columns.IS_FOLDER + " DESC, " + BookmarksProvider.Columns.VISITED_DATE + " DESC, " + BookmarksProvider.Columns.TITLE + " COLLATE NOCASE";
-			break;
-
-		default:
-			orderClause = BookmarksProvider.Columns.IS_FOLDER + " DESC, " + BookmarksProvider.Columns.VISITS + " DESC, " + BookmarksProvider.Columns.TITLE + " COLLATE NOCASE";
-			break;
-		}		
-		
-		return new CursorLoader(context, BookmarksProvider.BOOKMARKS_URI, HISTORY_BOOKMARKS_PROJECTION, whereClause, null, orderClause);
+			case 0:
+				orderClause = BookmarksProvider.Columns.IS_FOLDER + " DESC, " + BookmarksProvider.Columns.VISITS + " DESC, " + BookmarksProvider.Columns.TITLE + " COLLATE NOCASE";
+				break;
+
+			case 1:
+				orderClause = BookmarksProvider.Columns.IS_FOLDER + " DESC, " + BookmarksProvider.Columns.TITLE + " COLLATE NOCASE, " + BookmarksProvider.Columns.VISITS + " DESC";
+				break;
+
+			case 2:
+				orderClause = BookmarksProvider.Columns.IS_FOLDER + " DESC, " + BookmarksProvider.Columns.VISITED_DATE + " DESC, " + BookmarksProvider.Columns.TITLE + " COLLATE NOCASE";
+				break;
+
+			default:
+				orderClause = BookmarksProvider.Columns.IS_FOLDER + " DESC, " + BookmarksProvider.Columns.VISITS + " DESC, " + BookmarksProvider.Columns.TITLE + " COLLATE NOCASE";
+				break;
+		}
+
+		String whereArgs[] = new String[]{String.valueOf(blacklist), String.valueOf(parentFolderId)};
+
+		return new CursorLoader(context, BookmarksProvider.BOOKMARKS_URI, HISTORY_BOOKMARKS_PROJECTION, whereClause, whereArgs, orderClause);
 	}
 	
 	public static CursorLoader getCursorLoaderForHistory(Context context) {
@@ -153,61 +173,71 @@ public static void clearHistoryAndOrBookmarks(ContentResolver contentResolver, b
 		
 		contentResolver.delete(BookmarksProvider.BOOKMARKS_URI, whereClause, null);		
 	}
-	
-	public static List<FolderItem> getFirstLevelFoldersList(ContentResolver contentResolver) {
-		List<FolderItem> result = new ArrayList<FolderItem>();
-		
-		String whereClause = BookmarksProvider.Columns.IS_FOLDER + " = 1 AND " + BookmarksProvider.Columns.PARENT_FOLDER_ID + " = -1";
-		String orderClause = BookmarksProvider.Columns.TITLE;
-		
-		Cursor c = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, HISTORY_BOOKMARKS_PROJECTION, whereClause, null, orderClause);
-		if ((c != null) &&
-				(c.moveToFirst())) {
-			
-			int idIndex = c.getColumnIndex(BookmarksProvider.Columns._ID);
-			int titleIndex = c.getColumnIndex(BookmarksProvider.Columns.TITLE);
-			
-			do {
-				result.add(new FolderItem(c.getLong(idIndex), c.getString(titleIndex)));
-			} while (c.moveToNext());
-			
-			c.close();
+
+	public static String getFolderStack(ContentResolver cr, long folderId) {
+		StringBuilder sb = new StringBuilder();
+		ArrayList<String> cache = new ArrayList<String>();
+
+		long fid = folderId;
+		BookmarkHistoryItem bhi;
+		String stack_fmt = "{%1$s,%2$s}";
+
+		while (fid != -1) {
+			bhi = getBookmarkById(cr, fid);
+			cache.add(String.format(stack_fmt, bhi.getId(), bhi.getTitle()));
+			fid = bhi.getFolderId();
 		}
-		
-		return result;
+		cache.add(String.format(stack_fmt, -1, null));
+
+		Collections.reverse(cache);
+
+		for (String citem: cache) {
+			sb.append(citem);
+			sb.append("//;//");
+		}
+
+		return sb.toString();
 	}
-	
-	public static long getFolderId(ContentResolver contentResolver, String folderName, boolean createIfNotPresent) {
-		String escapedFolderName = DatabaseUtils.sqlEscapeString(folderName);
-		
-		String whereClause = BookmarksProvider.Columns.TITLE + " = " + escapedFolderName + " AND " + BookmarksProvider.Columns.IS_FOLDER + " = 1";
-		
-		Cursor c = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, HISTORY_BOOKMARKS_PROJECTION, whereClause, null, null);
-		if ((c != null) &&
-				(c.moveToFirst())) {
-			return c.getLong(c.getColumnIndex(BookmarksProvider.Columns._ID));
+
+	public static void moveItem(ContentResolver cr, long itemId, long newParentId) {
+		if (itemId ==newParentId)
+			return;
+
+		String whereClause = BookmarksProvider.Columns._ID+"=?";
+		String[] whereArgs = new String[]{String.valueOf(itemId)};
+
+		ContentValues cv = new ContentValues();
+		cv.put(BookmarksProvider.Columns.PARENT_FOLDER_ID, newParentId);
+
+		cr.update(BookmarksProvider.BOOKMARKS_URI, cv, whereClause, whereArgs);
+	}
+
+	public static void renameFolder(ContentResolver cr, long folderId, String newTitle) {
+		String whereClause = BookmarksProvider.Columns._ID+"=?";
+		String[] whereArgs = new String[]{String.valueOf(folderId)};
+
+		ContentValues cv = new ContentValues();
+		cv.put(BookmarksProvider.Columns.TITLE, newTitle);
+
+		cr.update(BookmarksProvider.BOOKMARKS_URI, cv, whereClause, whereArgs);
+	}
+
+	public static long createFolder(ContentResolver cr, String folderName, long parentId) {
+		ContentValues cv = new ContentValues();
+		cv.put(BookmarksProvider.Columns.TITLE, folderName);
+		cv.putNull(BookmarksProvider.Columns.URL);
+		cv.put(BookmarksProvider.Columns.BOOKMARK, 0);
+		cv.put(BookmarksProvider.Columns.IS_FOLDER, 1);
+		cv.put(BookmarksProvider.Columns.PARENT_FOLDER_ID, parentId);
+
+		Uri result = cr.insert(BookmarksProvider.BOOKMARKS_URI, cv);
+
+		Cursor inserted = cr.query(result, HISTORY_BOOKMARKS_PROJECTION, null, null, null);
+		if ((inserted != null) &&
+				(inserted.moveToFirst())) {
+			return inserted.getLong(inserted.getColumnIndex(BookmarksProvider.Columns._ID));
 		} else {
-			if (createIfNotPresent) {
-				
-				ContentValues values = new ContentValues();
-				values.put(BookmarksProvider.Columns.TITLE, folderName);
-				values.putNull(BookmarksProvider.Columns.URL);
-				values.put(BookmarksProvider.Columns.BOOKMARK, 0);
-				values.put(BookmarksProvider.Columns.IS_FOLDER, 1);
-				
-				Uri result = contentResolver.insert(BookmarksProvider.BOOKMARKS_URI, values);
-				
-				Cursor inserted = contentResolver.query(result, HISTORY_BOOKMARKS_PROJECTION, null, null, null);
-				if ((inserted != null) &&
-						(inserted.moveToFirst())) {
-					return inserted.getLong(inserted.getColumnIndex(BookmarksProvider.Columns._ID));					
-				} else {
-					return -1;
-				}
-				
-			} else {
-				return -1;
-			}
+			return -1;
 		}
 	}
 	
@@ -227,18 +257,18 @@ public static void setAsBookmark(ContentResolver contentResolver, long id, long
 
 		if (id != -1) {
 			String[] colums = new String[] { BookmarksProvider.Columns._ID };
-			String whereClause = BookmarksProvider.Columns._ID + " = " + id;
+			String whereClause = BookmarksProvider.Columns._ID + " = ?";
+			String[] whereArgs = new String[]{String.valueOf(id)};
 
-			Cursor cursor = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, colums, whereClause, null, null);
+			Cursor cursor = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, colums, whereClause, whereArgs, null);
 			bookmarkExist = (cursor != null) && (cursor.moveToFirst());
 		} else {
 			String[] colums = new String[] { BookmarksProvider.Columns._ID };
 			
-			String escapedUrl = DatabaseUtils.sqlEscapeString(url);
-			
-			String whereClause = BookmarksProvider.Columns.URL + " = " + escapedUrl;
+			String whereClause = BookmarksProvider.Columns.URL + " = ?";
+			String[] whereArgs = new String[]{url};
 
-			Cursor cursor = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, colums, whereClause, null, null);
+			Cursor cursor = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, colums, whereClause, whereArgs, null);
 			bookmarkExist = (cursor != null) && (cursor.moveToFirst());
 			if (bookmarkExist) {
 				id = cursor.getLong(cursor.getColumnIndex(BookmarksProvider.Columns._ID));
@@ -265,16 +295,18 @@ public static void setAsBookmark(ContentResolver contentResolver, long id, long
 		}
 
 		if (bookmarkExist) {                                    
-			contentResolver.update(BookmarksProvider.BOOKMARKS_URI, values, BookmarksProvider.Columns._ID + " = " + id, null);
+			contentResolver.update(BookmarksProvider.BOOKMARKS_URI, values,
+					BookmarksProvider.Columns._ID + " = ?", new String[]{String.valueOf(id)});
 		} else {                        
 			contentResolver.insert(BookmarksProvider.BOOKMARKS_URI, values);
 		}
 	}
 	
 	public static void deleteBookmark(ContentResolver contentResolver, long id) {
-		String whereClause = BookmarksProvider.Columns._ID + " = " + id;
+		String whereClause = BookmarksProvider.Columns._ID + " = ?";
+		String[] whereArgs = new String[]{String.valueOf(id)};
         
-		Cursor c = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, HISTORY_BOOKMARKS_PROJECTION, whereClause, null, null);
+		Cursor c = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, HISTORY_BOOKMARKS_PROJECTION, whereClause, whereArgs, null);
 		if (c != null) {
 			if (c.moveToFirst()) {
 				if (c.getInt(c.getColumnIndex(BookmarksProvider.Columns.BOOKMARK)) == 1) {
@@ -286,11 +318,11 @@ public static void deleteBookmark(ContentResolver contentResolver, long id) {
                         values.put(BookmarksProvider.Columns.PARENT_FOLDER_ID, -1);
                         values.putNull(BookmarksProvider.Columns.CREATION_DATE);
                         
-                        contentResolver.update(BookmarksProvider.BOOKMARKS_URI, values, whereClause, null);
+                        contentResolver.update(BookmarksProvider.BOOKMARKS_URI, values, whereClause, whereArgs);
 
 					} else {
 						// never visited, it can be deleted.
-						contentResolver.delete(BookmarksProvider.BOOKMARKS_URI, whereClause, null);
+						contentResolver.delete(BookmarksProvider.BOOKMARKS_URI, whereClause, whereArgs);
 					}
 				}
 			}
@@ -323,8 +355,8 @@ public static void deleteFolder(ContentResolver contentResolver, long id) {
 		}
 		
 		// Delete content of the folder.
-		String whereClause = BookmarksProvider.Columns.PARENT_FOLDER_ID + " = " + id + " AND " + BookmarksProvider.Columns.BOOKMARK + " > 0";		
-		c = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, HISTORY_BOOKMARKS_PROJECTION, whereClause, null, null);
+		String whereClause = BookmarksProvider.Columns.PARENT_FOLDER_ID + " = ? AND " + BookmarksProvider.Columns.BOOKMARK + " > 0";
+		c = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, HISTORY_BOOKMARKS_PROJECTION, whereClause, new String[]{String.valueOf(id)}, null);
 		if (c != null) {
 			if (c.moveToFirst()) {
 				
@@ -353,15 +385,16 @@ public static void deleteFolder(ContentResolver contentResolver, long id) {
 		}
 		
 		// Finally delete the folder.
-		contentResolver.delete(BookmarksProvider.BOOKMARKS_URI, BookmarksProvider.Columns._ID + " = " + id, null);
+		contentResolver.delete(BookmarksProvider.BOOKMARKS_URI, BookmarksProvider.Columns._ID + " = ?", new String[]{String.valueOf(id)});
 		
 		provider.setNotifyChanges(true);
 	}
 	
 	public static void deleteHistoryRecord(ContentResolver contentResolver, long id) {
-		String whereClause = BookmarksProvider.Columns._ID + " = " + id;
+		String whereClause = BookmarksProvider.Columns._ID + " = ?";
+		String[] whereArgs = new String[]{String.valueOf(id)};
         
-		Cursor c = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, HISTORY_BOOKMARKS_PROJECTION, whereClause, null, null);
+		Cursor c = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, HISTORY_BOOKMARKS_PROJECTION, whereClause, new String[]{String.valueOf(id)}, null);
 		if (c != null) {
 			if (c.moveToFirst()) {
 				if (c.getInt(c.getColumnIndex(BookmarksProvider.Columns.BOOKMARK)) > 0) {
@@ -370,10 +403,10 @@ public static void deleteHistoryRecord(ContentResolver contentResolver, long id)
                     values.put(BookmarksProvider.Columns.VISITS, 0);
                     values.putNull(BookmarksProvider.Columns.VISITED_DATE);
                     
-                    contentResolver.update(BookmarksProvider.BOOKMARKS_URI, values, whereClause, null);
+                    contentResolver.update(BookmarksProvider.BOOKMARKS_URI, values, whereClause, whereArgs);
 				} else {
 					// Not a bookmark, it can be deleted.
-					contentResolver.delete(BookmarksProvider.BOOKMARKS_URI, whereClause, null);
+					contentResolver.delete(BookmarksProvider.BOOKMARKS_URI, whereClause, whereArgs);
 				}
 			}
 			
@@ -394,9 +427,9 @@ public static void updateHistory(ContentResolver contentResolver, String title,
 		String escapedUrl = url != null ? DatabaseUtils.sqlEscapeString(url) : "";
 		String escapedOriginalUrl = originalUrl != null ? DatabaseUtils.sqlEscapeString(originalUrl) : "";
 		
-		String whereClause = BookmarksProvider.Columns.URL + " = " + escapedUrl + " OR " + BookmarksProvider.Columns.URL + " = " + escapedOriginalUrl;
+		String whereClause = BookmarksProvider.Columns.URL + " = ? OR " + BookmarksProvider.Columns.URL + " = ?";
 
-		Cursor cursor = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, colums, whereClause, null, null);
+		Cursor cursor = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, colums, whereClause, new String[]{escapedUrl, escapedOriginalUrl}, null);
 
 		if (cursor != null) {
 			if (cursor.moveToFirst()) {
@@ -414,7 +447,7 @@ public static void updateHistory(ContentResolver contentResolver, String title,
 				values.put(BookmarksProvider.Columns.VISITED_DATE, new Date().getTime());
 				values.put(BookmarksProvider.Columns.VISITS, visits);
 
-				contentResolver.update(BookmarksProvider.BOOKMARKS_URI, values, BookmarksProvider.Columns._ID + " = " + id, null);
+				contentResolver.update(BookmarksProvider.BOOKMARKS_URI, values, BookmarksProvider.Columns._ID + " = ?", new String[]{String.valueOf(id)});
 
 			} else {
 				ContentValues values = new ContentValues();
@@ -431,8 +464,8 @@ public static void updateHistory(ContentResolver contentResolver, String title,
 		}
 	}
 	
-	private static final String TRUNCATE_HISTORY_DELETE_WHERE_PATTERN = "(" + BookmarksProvider.Columns.BOOKMARK + " = 0 OR " + BookmarksProvider.Columns.BOOKMARK + " IS NULL) AND " + BookmarksProvider.Columns.VISITED_DATE + " < %s";
-	private static final String TRUNCATE_HISTORY_UPDATE_WHERE_PATTERN = BookmarksProvider.Columns.BOOKMARK + " = 1  AND " + BookmarksProvider.Columns.VISITED_DATE + " < %s";
+	private static final String TRUNCATE_HISTORY_DELETE_WHERE_PATTERN = "(" + BookmarksProvider.Columns.BOOKMARK + " = 0 OR " + BookmarksProvider.Columns.BOOKMARK + " IS NULL) AND " + BookmarksProvider.Columns.VISITED_DATE + " < ?";
+	private static final String TRUNCATE_HISTORY_UPDATE_WHERE_PATTERN = BookmarksProvider.Columns.BOOKMARK + " = 1  AND " + BookmarksProvider.Columns.VISITED_DATE + " < ?";
 	
 	/**
 	 * Remove from history values prior to now minus the number of days defined in preferences.
@@ -455,24 +488,23 @@ public static void truncateHistory(ContentResolver contentResolver, String prefH
 		c.set(Calendar.MILLISECOND, 0);
 		c.add(Calendar.DAY_OF_YEAR, - historySize);
 
-		String whereClauseDelete = String.format(TRUNCATE_HISTORY_DELETE_WHERE_PATTERN, c.getTimeInMillis());
-		String whereClauseUpdate = String.format(TRUNCATE_HISTORY_UPDATE_WHERE_PATTERN, c.getTimeInMillis());
+		String[] timeArgs = {String.valueOf(c.getTimeInMillis())};
 		
 		ContentValues updateValues = new ContentValues();
 		updateValues.putNull(BookmarksProvider.Columns.VISITED_DATE);
 		updateValues.put(BookmarksProvider.Columns.VISITS, 0);
 		
 		try {
-			contentResolver.delete(BookmarksProvider.BOOKMARKS_URI, whereClauseDelete, null);
-			contentResolver.update(BookmarksProvider.BOOKMARKS_URI, updateValues, whereClauseUpdate, null);
+			contentResolver.delete(BookmarksProvider.BOOKMARKS_URI, TRUNCATE_HISTORY_DELETE_WHERE_PATTERN, timeArgs);
+			contentResolver.update(BookmarksProvider.BOOKMARKS_URI, updateValues, TRUNCATE_HISTORY_UPDATE_WHERE_PATTERN, timeArgs);
 		} catch (Exception e) {
 			e.printStackTrace();
 			Log.w("BookmarksWrapper", "Unable to truncate history: " + e.getMessage());
 		}
 	}
 	
-	private static final String UPDATE_FAVICON_WHERE_PATTERN_1 = BookmarksProvider.Columns.URL + " = %s OR " + BookmarksProvider.Columns.URL + " = %s";
-	private static final String UPDATE_FAVICON_WHERE_PATTERN_2 = BookmarksProvider.Columns.URL + " = %s";
+	private static final String UPDATE_FAVICON_WHERE_PATTERN_1 = BookmarksProvider.Columns.URL + " = ? OR " + BookmarksProvider.Columns.URL + " = ?";
+	private static final String UPDATE_FAVICON_WHERE_PATTERN_2 = BookmarksProvider.Columns.URL + " = ?";
 	
 	/**
 	 * Update the favicon in history/bookmarks database.
@@ -486,16 +518,15 @@ public static void updateFavicon(ContentResolver contentResolver, String url, St
 				(favicon != null) &&
 				(contentResolver != null)) {
 			String whereClause;
+			String whereArgs[];
 
 			if ((originalUrl != null) &&
 					!url.equals(originalUrl)) {
-				url = DatabaseUtils.sqlEscapeString(url);
-				originalUrl = DatabaseUtils.sqlEscapeString(originalUrl);
-				
-				whereClause = String.format(UPDATE_FAVICON_WHERE_PATTERN_1, url, originalUrl);
+				whereClause = UPDATE_FAVICON_WHERE_PATTERN_1;
+				whereArgs = new String[]{url, originalUrl};
 			} else {
-				url = DatabaseUtils.sqlEscapeString(url);
-				whereClause = String.format(UPDATE_FAVICON_WHERE_PATTERN_2, url);
+				whereClause = UPDATE_FAVICON_WHERE_PATTERN_2;
+				whereArgs = new String[]{url};
 			}
 
 			ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -505,7 +536,7 @@ public static void updateFavicon(ContentResolver contentResolver, String url, St
 			values.put(BookmarksProvider.Columns.FAVICON, os.toByteArray());				
 
 			try {
-				contentResolver.update(BookmarksProvider.BOOKMARKS_URI, values, whereClause, null);
+				contentResolver.update(BookmarksProvider.BOOKMARKS_URI, values, whereClause, whereArgs);
 			} catch (Exception e) {
 				e.printStackTrace();
 				Log.w("BookmarksWrapper", "Unable to update favicon: " + e.getMessage());
@@ -513,24 +544,23 @@ public static void updateFavicon(ContentResolver contentResolver, String url, St
 		}
 	}
 	
-	private static final String BOOKMARK_BY_URL_WHERE_PATTERN_1 = "(" + BookmarksProvider.Columns.URL + " = %s OR " + BookmarksProvider.Columns.URL + " = %s) AND " + BookmarksProvider.Columns.BOOKMARK + " = 1";
-	private static final String BOOKMARK_BY_URL_WHERE_PATTERN_2 = BookmarksProvider.Columns.URL + " = %s AND " + BookmarksProvider.Columns.BOOKMARK + " = 1";
+	private static final String BOOKMARK_BY_URL_WHERE_PATTERN_1 = "(" + BookmarksProvider.Columns.URL + " = ? OR " + BookmarksProvider.Columns.URL + " = ?) AND " + BookmarksProvider.Columns.BOOKMARK + " = 1";
+	private static final String BOOKMARK_BY_URL_WHERE_PATTERN_2 = BookmarksProvider.Columns.URL + " = ? AND " + BookmarksProvider.Columns.BOOKMARK + " = 1";
 	
 	public static void updateThumbnail(ContentResolver contentResolver, String url, String originalUrl, Bitmap thumbnail) {
 		if ((url != null) &&
 				(thumbnail != null) &&
 				(contentResolver != null)) {
 			String whereClause;
+			String whereArgs[];
 
 			if ((originalUrl != null) &&
 					!url.equals(originalUrl)) {
-				url = DatabaseUtils.sqlEscapeString(url);
-				originalUrl = DatabaseUtils.sqlEscapeString(originalUrl);
-				
-				whereClause = String.format(BOOKMARK_BY_URL_WHERE_PATTERN_1, url, originalUrl);
+				whereClause = BOOKMARK_BY_URL_WHERE_PATTERN_1;
+				whereArgs = new String[]{url, originalUrl};
 			} else {
-				url = DatabaseUtils.sqlEscapeString(url);				
-				whereClause = String.format(BOOKMARK_BY_URL_WHERE_PATTERN_2, url);
+				whereClause = BOOKMARK_BY_URL_WHERE_PATTERN_2;
+				whereArgs = new String[]{url};
 			}
 
 			ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -540,7 +570,7 @@ public static void updateThumbnail(ContentResolver contentResolver, String url,
 			values.put(BookmarksProvider.Columns.THUMBNAIL, os.toByteArray());				
 
 			try {
-				contentResolver.update(BookmarksProvider.BOOKMARKS_URI, values, whereClause, null);
+				contentResolver.update(BookmarksProvider.BOOKMARKS_URI, values, whereClause, whereArgs);
 			} catch (Exception e) {
 				e.printStackTrace();
 				Log.w("BookmarksWrapper", "Unable to update thumbnail: " + e.getMessage());
@@ -552,19 +582,18 @@ public static boolean urlHasBookmark(ContentResolver contentResolver, String url
 		if ((url != null) &&
 				(contentResolver != null)) {
 			String whereClause;
+			String whereArgs[];
 
 			if ((originalUrl != null) &&
 					!url.equals(originalUrl)) {
-				url = DatabaseUtils.sqlEscapeString(url);
-				originalUrl = DatabaseUtils.sqlEscapeString(originalUrl);
-				
-				whereClause = String.format(BOOKMARK_BY_URL_WHERE_PATTERN_1, url, originalUrl);
+				whereArgs = new String[]{url, originalUrl};
+				whereClause = BOOKMARK_BY_URL_WHERE_PATTERN_1;
 			} else {
-				url = DatabaseUtils.sqlEscapeString(url);
-				whereClause = String.format(BOOKMARK_BY_URL_WHERE_PATTERN_2, url);
+				whereClause = BOOKMARK_BY_URL_WHERE_PATTERN_2;
+				whereArgs = new String[]{url};
 			}
 
-			Cursor c = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, HISTORY_BOOKMARKS_PROJECTION, whereClause, null, null);
+			Cursor c = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, HISTORY_BOOKMARKS_PROJECTION, whereClause, whereArgs, null);
 
 			return c != null && c.getCount() > 0;
 		} else {
@@ -572,13 +601,14 @@ public static boolean urlHasBookmark(ContentResolver contentResolver, String url
 		}
 	}
 	
-	private static final String TOGGLE_BOOKMARK_WHERE_PATTERN =  BookmarksProvider.Columns._ID + " = %s";
+	private static final String TOGGLE_BOOKMARK_WHERE_PATTERN =  BookmarksProvider.Columns._ID + " = ?";
 	
 	public static void toggleBookmark(ContentResolver contentResolver, long id, boolean bookmark) {
 		String[] colums = new String[] { BookmarksProvider.Columns._ID };
-		String whereClause = String.format(TOGGLE_BOOKMARK_WHERE_PATTERN, id);
+		String whereClause = TOGGLE_BOOKMARK_WHERE_PATTERN;
+		String[] whereArgs = new String[] {String.valueOf(id)};
 
-		Cursor cursor = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, colums, whereClause, null, null);
+		Cursor cursor = contentResolver.query(BookmarksProvider.BOOKMARKS_URI, colums, whereClause, whereArgs, null);
 		boolean recordExists = (cursor != null) && (cursor.moveToFirst());
 		
 		if (recordExists) {
@@ -594,7 +624,7 @@ public static void toggleBookmark(ContentResolver contentResolver, long id, bool
 				values.putNull(BookmarksProvider.Columns.THUMBNAIL);				
 			}
 			
-			contentResolver.update(BookmarksProvider.BOOKMARKS_URI, values, whereClause, null);
+			contentResolver.update(BookmarksProvider.BOOKMARKS_URI, values, whereClause, whereArgs);
 		}
 	}
 	
@@ -645,7 +675,7 @@ public static void fillDefaultBookmaks(ContentResolver contentResolver, String[]
 	}
 	
 	private static final String SUGGESTIONS_PATTERN = "%%%s%%";
-	private static final String SUGGESTIONS_WHERE_PATTERN = BookmarksProvider.Columns.TITLE + " LIKE %s OR " + BookmarksProvider.Columns.URL  + " LIKE %s";
+	private static final String SUGGESTIONS_WHERE_PATTERN = BookmarksProvider.Columns.TITLE + " LIKE ? OR " + BookmarksProvider.Columns.URL  + " LIKE ?";
 	private static final String SUGGESTIONS_ORDER = BookmarksProvider.Columns.VISITED_DATE + " DESC, " + BookmarksProvider.Columns.BOOKMARK + " DESC, " + BookmarksProvider.Columns.TITLE + " ASC";
 	
 	/**
@@ -658,25 +688,25 @@ public static void fillDefaultBookmaks(ContentResolver contentResolver, String[]
 	public static Cursor getUrlSuggestions(ContentResolver contentResolver, String pattern) {
 		if ((pattern != null) &&
     			(pattern.length() > 0)) {
-			
-			String sqlPattern = DatabaseUtils.sqlEscapeString(String.format(SUGGESTIONS_PATTERN, pattern));
-			String whereClause = String.format(SUGGESTIONS_WHERE_PATTERN, sqlPattern, sqlPattern);
-			
+
+			String whereClause = SUGGESTIONS_WHERE_PATTERN;
+			String imLike = String.format(SUGGESTIONS_PATTERN, pattern);
+
 			return contentResolver.query(BookmarksProvider.BOOKMARKS_URI,
     				HISTORY_BOOKMARKS_PROJECTION,
     				whereClause,
-    				null,
+    				new String[]{imLike, imLike},
     				SUGGESTIONS_ORDER);
 		}
 		
 		return null;
 	}
 	
-	private static final String CHILDREN_FOLDERS_WHERE_PATTERN = BookmarksProvider.Columns.IS_FOLDER + " > 0 AND " + BookmarksProvider.Columns.PARENT_FOLDER_ID + " = %S";
+	private static final String CHILDREN_FOLDERS_WHERE_PATTERN = BookmarksProvider.Columns.IS_FOLDER + " > 0 AND " + BookmarksProvider.Columns.PARENT_FOLDER_ID + " = ?";
     
     private static Cursor getChildrenFolders(ContentResolver contentResolver, long folderId) {
-		String whereClause = String.format(CHILDREN_FOLDERS_WHERE_PATTERN, folderId);
-		return contentResolver.query(BookmarksProvider.BOOKMARKS_URI, HISTORY_BOOKMARKS_PROJECTION, whereClause, null, null);
+		String whereClause = CHILDREN_FOLDERS_WHERE_PATTERN;
+		return contentResolver.query(BookmarksProvider.BOOKMARKS_URI, HISTORY_BOOKMARKS_PROJECTION, whereClause, new String[]{String.valueOf(folderId)}, null);
 	}
 
 }
diff --git a/src/org/tint/ui/activities/BookmarksActivity.java b/src/org/tint/ui/activities/BookmarksActivity.java
index 101c246..c4a239d 100644
--- a/src/org/tint/ui/activities/BookmarksActivity.java
+++ b/src/org/tint/ui/activities/BookmarksActivity.java
@@ -25,6 +25,7 @@
 import org.tint.tasks.HistoryBookmarksExportTask;
 import org.tint.tasks.HistoryBookmarksImportTask;
 import org.tint.ui.fragments.BookmarksFragment;
+import org.tint.ui.fragments.FoldersOnlyFragment;
 import org.tint.ui.fragments.HistoryFragment;
 import org.tint.ui.managers.UIManager;
 import org.tint.ui.preferences.IHistoryBookmaksExportListener;
@@ -50,7 +51,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 
-public class BookmarksActivity extends Activity implements IHistoryBookmaksExportListener, IHistoryBookmaksImportListener {
+public class BookmarksActivity extends Activity implements IHistoryBookmaksExportListener, IHistoryBookmaksImportListener, FoldersOnlyFragment.FoldersOnlyListener {
 	
 	private static final String EXTRA_SELECTED_TAB_INDEX = "EXTRA_SELECTED_TAB_INDEX";
 	
@@ -135,6 +136,8 @@ public boolean onPrepareOptionsMenu(Menu menu) {
 	
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
+		BookmarksFragment bfg;
+
 		switch (item.getItemId()) {
 		case android.R.id.home:
 			setResult(RESULT_CANCELED);
@@ -147,7 +150,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
 			startActivity(i);
 			
 			return true;
-			
+
+		case R.id.BookmarksActivityMenuAddFolder:
+			bfg = (BookmarksFragment)getFragmentManager().findFragmentByTag("bookmarks");
+			bfg.newFolder();
+			return true;
+
 		case R.id.BookmarksActivityMenuSortBookmarks:
 			changeSortMode();
 			return true;
@@ -370,5 +378,10 @@ public void onClick(DialogInterface dialog, int which) {
     	AlertDialog alert = builder.create();
     	alert.show();		
 	}
-	
+
+	@Override
+	public void onSelectFolder(long folder_id, String folder_name) {
+		BookmarksFragment bfg = (BookmarksFragment)getFragmentManager().findFragmentByTag("bookmarks");
+		bfg.onSelectFolder(folder_id, folder_name);
+	}
 }
diff --git a/src/org/tint/ui/activities/EditBookmarkActivity.java b/src/org/tint/ui/activities/EditBookmarkActivity.java
index 2c960b9..9afb714 100644
--- a/src/org/tint/ui/activities/EditBookmarkActivity.java
+++ b/src/org/tint/ui/activities/EditBookmarkActivity.java
@@ -15,46 +15,36 @@
 
 package org.tint.ui.activities;
 
-import java.util.List;
-
 import org.tint.R;
-import org.tint.model.FolderItem;
+import org.tint.model.BookmarkHistoryItem;
 import org.tint.providers.BookmarksWrapper;
+import org.tint.ui.fragments.FoldersOnlyFragment;
 import org.tint.utils.Constants;
 
 import android.app.ActionBar;
 import android.app.Activity;
-import android.content.Context;
+import android.app.Fragment;
+import android.app.FragmentTransaction;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.Spinner;
-import android.widget.TextView;
 import android.widget.Toast;
 
-public class EditBookmarkActivity extends Activity {
+public class EditBookmarkActivity extends Activity implements FoldersOnlyFragment.FoldersOnlyListener {
 
 	private long mId = -1;
+	private long mFolderId = -1;
 	
 	private EditText mLabel;
 	private EditText mUrl;
 	
-	private Spinner mFoldersSpinner;
-	
-	private EditText mNewFolderName;
-	
 	private Button mOk;
 	private Button mCancel;
-	
-	private List<FolderItem> mFolders;
+	private Button mPickFolder;
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {		
@@ -67,41 +57,10 @@ protected void onCreate(Bundle savedInstanceState) {
 			actionBar.setHomeButtonEnabled(true);
 			actionBar.setDisplayHomeAsUpEnabled(true);
 		}
-        
-		mFolders = BookmarksWrapper.getFirstLevelFoldersList(getContentResolver());
-		mFolders.add(0, new FolderItem(-1, getString(R.string.Bookmarks)));
-		mFolders.add(0, new FolderItem(-2, getString(R.string.NewFolder)));
 		
         mLabel = (EditText) findViewById(R.id.EditBookmarkActivity_LabelEdit);
         mUrl = (EditText) findViewById(R.id.EditBookmarkActivity_UrlEdit);
         
-        mFoldersSpinner = (Spinner) findViewById(R.id.EditBookmarkActivity_FolderSpinner);
-        
-        FoldersAdapter adapter = new FoldersAdapter(this, mFolders);
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        mFoldersSpinner.setAdapter(adapter);
-        
-        mFoldersSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
-
-			@Override
-			public void onItemSelected(AdapterView<?> arg0, View arg1, int position, long id) {
-				if (position == 0) {
-					mNewFolderName.setVisibility(View.VISIBLE);
-					mNewFolderName.requestFocus();
-				} else {
-					mNewFolderName.setVisibility(View.GONE);
-				}
-			}
-
-			@Override
-			public void onNothingSelected(AdapterView<?> arg0) { }
-		});
-        
-        // Default to root folder.
-        mFoldersSpinner.setSelection(1);
-        
-        mNewFolderName = (EditText) findViewById(R.id.EditBookmarkActivity_FolderValue);
-        
         mOk = (Button) findViewById(R.id.EditBookmarkActivity_OK);
         mOk.setOnClickListener(new OnClickListener() {			
 			@Override
@@ -121,7 +80,9 @@ public void onClick(View arg0) {
 	            finish();
 			}
 		});
-        
+
+		mPickFolder = (Button) findViewById(R.id.PickFolder);
+
         Bundle extras = getIntent().getExtras();
     	if (extras != null) {
     		String label = extras.getString(Constants.EXTRA_LABEL);
@@ -135,15 +96,16 @@ public void onClick(View arg0) {
     		}
     		
     		// This is a bit dirty...
-    		long folderId = extras.getLong(Constants.EXTRA_FOLDER_ID);
-    		if (folderId != -1) {
-    			for (int i = 0; i < mFolders.size(); i++) {
-    				if (mFolders.get(i).getId() == folderId) {
-    					mFoldersSpinner.setSelection(i);
-    					break;
-    				}
-    			}
+			if (extras.containsKey(Constants.EXTRA_FOLDER_ID)) {
+				mFolderId = extras.getLong(Constants.EXTRA_FOLDER_ID);
+			}
+    		if (mFolderId != -1) {
+				BookmarkHistoryItem bhi = BookmarksWrapper.getBookmarkById(getContentResolver(), mFolderId);
+				mPickFolder.setText(bhi.getTitle());
     		}
+			else {
+				mPickFolder.setText(R.string.Bookmarks);
+			}
     		
     		mId = extras.getLong(Constants.EXTRA_ID);
     	}
@@ -167,62 +129,42 @@ private boolean save() {
 		if ((!TextUtils.isEmpty(label)) &&
 				(!TextUtils.isEmpty(url))) {
 			
-			long folderId = -1;
-			int folderSpinnerSelection = mFoldersSpinner.getSelectedItemPosition();
-			
-			switch (folderSpinnerSelection) {
-			case 0:
-				if (TextUtils.isEmpty(mNewFolderName.getText().toString())) {
-					Toast.makeText(this, R.string.ProvideNewFolderName, Toast.LENGTH_SHORT).show();
-					return false;
-				} else {
-					folderId = BookmarksWrapper.getFolderId(getContentResolver(), mNewFolderName.getText().toString(), true);
-				}
-				break;
-				
-			case 1:
-				folderId = -1;
-				break;
-			default:
-				folderId = mFolders.get(folderSpinnerSelection).getId();
-				break;
-			}			
-			
-			BookmarksWrapper.setAsBookmark(getContentResolver(), mId, folderId, label, url, true);
+			BookmarksWrapper.setAsBookmark(getContentResolver(), mId, mFolderId, label, url, true);
 			return true;
 		} else {
 			Toast.makeText(this, R.string.AddBookmarkLabelOrUrlEmpty, Toast.LENGTH_SHORT).show();
 			return false;
 		}
 	}
-	
-	private class FoldersAdapter extends ArrayAdapter<FolderItem> {
-		
-		public FoldersAdapter(Context context, List<FolderItem> values) {
-			super(context, android.R.layout.simple_spinner_item, android.R.id.text1, values);
-		}
 
-		@Override
-		public View getView(int position, View convertView, ViewGroup parent) {
-			View v = super.getView(position, convertView, parent);
-			
-			TextView tv = (TextView) v.findViewById(android.R.id.text1);
-			tv.setText(getItem(position).getTitle());
-			
-			return v;
+	public void pickFolder(View view) {
+		FragmentTransaction ft = getFragmentManager().beginTransaction();
+		//Remove fragment else it will crash as it is already added to backstack
+		Fragment prev = getFragmentManager().findFragmentByTag("dialog");
+		if (prev != null) {
+			ft.remove(prev);
 		}
+		ft.addToBackStack(null);
 
-		@Override
-		public View getDropDownView(int position, View convertView,	ViewGroup parent) {
-			View v = super.getDropDownView(position, convertView, parent);
-			
-			TextView tv = (TextView) v.findViewById(android.R.id.text1);
-			tv.setText(getItem(position).getTitle());
-			
-			return v;
-		}
+		final FoldersOnlyFragment newFragment = new FoldersOnlyFragment();
+		Bundle args = new Bundle();
+		args.putString(FoldersOnlyFragment.EXTRA_FOLDER_STACK,
+				BookmarksWrapper.getFolderStack(getContentResolver(), mFolderId));
+		newFragment.setArguments(args);
 
-				
+		newFragment.show(getFragmentManager(), "dialog");
+	}
+
+	@Override
+	public void onSelectFolder(long folder_id, String folder_name) {
+		//Toast.makeText(this, "Folder id "+folder_id+" selected", Toast.LENGTH_SHORT).show();
+		mFolderId = folder_id;
+		if (folder_id == -1) {
+			mPickFolder.setText(R.string.Bookmarks);
+		}
+		else {
+			mPickFolder.setText(folder_name);
+		}
 	}
 
 }
diff --git a/src/org/tint/ui/activities/TintBrowserActivity.java b/src/org/tint/ui/activities/TintBrowserActivity.java
index c8663ae..dc6b062 100644
--- a/src/org/tint/ui/activities/TintBrowserActivity.java
+++ b/src/org/tint/ui/activities/TintBrowserActivity.java
@@ -368,7 +368,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
         	if (mUIManager.getUploadMessage() == null) {
         		return;
         	}
-        	
+
         	Uri result = intent == null || resultCode != RESULT_OK ? null : intent.getData();
         	mUIManager.getUploadMessage().onReceiveValue(result);
         	mUIManager.setUploadMessage(null);
diff --git a/src/org/tint/ui/fragments/BookmarksFragment.java b/src/org/tint/ui/fragments/BookmarksFragment.java
index 040176e..97a49b3 100644
--- a/src/org/tint/ui/fragments/BookmarksFragment.java
+++ b/src/org/tint/ui/fragments/BookmarksFragment.java
@@ -40,6 +40,7 @@
 import android.app.AlertDialog;
 import android.app.Fragment;
 import android.app.FragmentBreadCrumbs;
+import android.app.FragmentTransaction;
 import android.app.LoaderManager;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
@@ -53,6 +54,7 @@
 import android.os.Handler;
 import android.os.Message;
 import android.preference.PreferenceManager;
+import android.text.TextUtils;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -62,6 +64,7 @@
 import android.view.ViewGroup;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AdapterView;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
@@ -81,6 +84,8 @@ public class BookmarksFragment extends Fragment implements LoaderManager.LoaderC
 	private static final int CONTEXT_MENU_DELETE_BOOKMARK = Menu.FIRST + 4;
 
 	private static final int CONTEXT_MENU_DELETE_FOLDER = Menu.FIRST + 5;
+	private static final int CONTEXT_MENU_RENAME_FOLDER = Menu.FIRST + 6;
+	private static final int CONTEXT_MENU_MOVE_ITEM = Menu.FIRST + 7;
 
 	private View mContainer = null;
 
@@ -93,6 +98,7 @@ public class BookmarksFragment extends Fragment implements LoaderManager.LoaderC
 	private ViewGroup mBreadCrumbGroup;
 	private FragmentBreadCrumbs mFoldersBreadCrumb;
 	private ImageView mBackBreadCrumb;
+	//private ImageView mAddFolderBreadCrumb;
 
 	private BookmarksAdapter mAdapter;
 
@@ -105,14 +111,20 @@ public class BookmarksFragment extends Fragment implements LoaderManager.LoaderC
 	
 	private OnSharedPreferenceChangeListener mPreferenceChangeListener;
 
+	private long contextItemId;
+
 	public BookmarksFragment() {
 		mUIManager = Controller.getInstance().getUIManager();
 	}
 
+	public long getCurrentFolderId() {
+		return mNavigationList.get(mNavigationList.size() - 1).getId();
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {		
 		super.onCreate(savedInstanceState);
-		
+
 		mPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
 
 			@Override
@@ -137,6 +149,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 		mIsTablet = UIFactory.isTablet(getActivity());
 
 		if (mContainer == null) {
+
 			mContainer = inflater.inflate(R.layout.bookmarks_fragment, container, false);
 			
 			mBreadCrumbGroup = (ViewGroup) mContainer.findViewById(R.id.BookmarksBreadCrumbGroup);			
@@ -145,21 +158,29 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 			mFoldersBreadCrumb.setMaxVisible(2);
 			mFoldersBreadCrumb.setActivity(getActivity());
 
-			mFoldersBreadCrumb.setParentTitle(getString(R.string.Bookmarks), null, new OnClickListener() {				
+			mFoldersBreadCrumb.setParentTitle(getString(R.string.Bookmarks), null, new OnClickListener() {
 				@Override
 				public void onClick(View v) {
-					popNavigation();					
+					popNavigation();
 				}
 			});
 
 			mBackBreadCrumb = (ImageView) mContainer.findViewById(R.id.BookmarksBreadCrumbBackHierarchy);
-			mBackBreadCrumb.setOnClickListener(new OnClickListener() {				
+			mBackBreadCrumb.setOnClickListener(new OnClickListener() {
 				@Override
 				public void onClick(View arg0) {
 					popNavigation();
 				}
 			});
 
+			/* mAddFolderBreadCrumb = (ImageView) mContainer.findViewById(R.id.BookmarksBreadCrumbAddFolder);
+			mAddFolderBreadCrumb.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View arg0) {
+					newFolder();
+				}
+			}); */
+
 			mBookmarksGrid = (GridView) mContainer.findViewById(R.id.BookmarksGridView);
 			mProgress = (ProgressBar) mContainer.findViewById(R.id.BookmarksProgressBar);
 
@@ -256,14 +277,18 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuIn
 					}					
 
 					menu.add(0, CONTEXT_MENU_OPEN_IN_TAB, 0, R.string.OpenInTab);
+					menu.add(0, CONTEXT_MENU_MOVE_ITEM, 0, R.string.MoveBookmark);
 					menu.add(0, CONTEXT_MENU_EDIT_BOOKMARK, 0, R.string.EditBookmark);
 					menu.add(0, CONTEXT_MENU_COPY_URL, 0, R.string.CopyUrl);
 					menu.add(0, CONTEXT_MENU_SHARE_URL, 0, R.string.ContextMenuShareUrl);
 					menu.add(0, CONTEXT_MENU_DELETE_BOOKMARK, 0, R.string.DeleteBookmark);
 
 
+
 				} else {
 
+					menu.add(0, CONTEXT_MENU_RENAME_FOLDER, 0, R.string.RenameFolder);
+					menu.add(0, CONTEXT_MENU_MOVE_ITEM, 0, R.string.MoveFolder);
 					menu.add(0, CONTEXT_MENU_DELETE_FOLDER, 0, R.string.DeleteFolder);
 
 				}
@@ -281,6 +306,8 @@ public boolean onContextItemSelected(MenuItem item) {
 		final AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
 
 		BookmarkHistoryItem selectedItem = BookmarksWrapper.getBookmarkById(getActivity().getContentResolver(), info.id);
+		AlertDialog.Builder builder;
+		final EditText input;
 
 		Intent i;
 		switch (item.getItemId()) {
@@ -327,7 +354,7 @@ public boolean onContextItemSelected(MenuItem item) {
 			return true;
 
 		case CONTEXT_MENU_DELETE_FOLDER:
-			AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+			builder = new AlertDialog.Builder(getActivity());
 			builder.setCancelable(true);
 			builder.setIcon(android.R.drawable.ic_dialog_info);
 			builder.setTitle(R.string.DeleteFolder);
@@ -336,7 +363,7 @@ public boolean onContextItemSelected(MenuItem item) {
 			builder.setPositiveButton(R.string.Yes, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
-					doDeleteFolder(info.id);					
+					doDeleteFolder(info.id);
 				}				
 			});
 
@@ -346,6 +373,50 @@ public void onClick(DialogInterface dialog, int which) {
 
 			return true;
 
+		case CONTEXT_MENU_RENAME_FOLDER:
+			builder = new AlertDialog.Builder(getActivity());
+			builder.setCancelable(true);
+			builder.setIcon(android.R.drawable.ic_dialog_info);
+			builder.setTitle(R.string.RenameFolder);
+
+			input = new EditText(getActivity());
+			input.setText(selectedItem.getTitle());
+			builder.setView(input);
+
+			builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					doRenameFolder(info.id, input.getText().toString());
+				}
+			});
+			builder.setNegativeButton(R.string.Cancel, null);
+
+			builder.create().show();
+			return true;
+
+		case CONTEXT_MENU_MOVE_ITEM:
+			contextItemId = info.id;
+			FragmentTransaction ft = getFragmentManager().beginTransaction();
+			//Remove fragment else it will crash as it is already added to backstack
+			Fragment prev = getFragmentManager().findFragmentByTag("dialog");
+			if (prev != null) {
+				ft.remove(prev);
+			}
+			ft.addToBackStack(null);
+
+			final FoldersOnlyFragment newFragment = new FoldersOnlyFragment();
+			Bundle args = new Bundle();
+			String fstack = BookmarksWrapper.getFolderStack(getActivity().getContentResolver(),
+					selectedItem.getFolderId());
+			args.putString(FoldersOnlyFragment.EXTRA_FOLDER_STACK, fstack);
+			if (selectedItem.isFolder()) {
+				args.putLong(FoldersOnlyFragment.EXTRA_FOLDER_BLACKLIST, selectedItem.getId());
+			}
+			newFragment.setArguments(args);
+
+			newFragment.show(getFragmentManager(), "dialog");
+			return true;
+
 		default:
 			if (Controller.getInstance().getAddonManager().onContributedBookmarkContextMenuItemSelected(
 					getActivity(),
@@ -363,7 +434,8 @@ public void onClick(DialogInterface dialog, int which) {
 	@Override
 	public Loader<Cursor> onCreateLoader(int id, Bundle args) {
 		setListShown(false);
-		return BookmarksWrapper.getCursorLoaderForBookmarks(getActivity(), mNavigationList.get(mNavigationList.size() - 1).getId());
+		return BookmarksWrapper.getCursorLoaderForBookmarks(getActivity(),
+				mNavigationList.get(mNavigationList.size() - 1).getId());
 	}
 
 	@Override
@@ -427,7 +499,7 @@ public void onAnimationEnd(Animator animation) {
 				getLoaderManager().restartLoader(0, null, this);
 			}
 
-			mFoldersBreadCrumb.setParentTitle(getString(R.string.Bookmarks), null, new OnClickListener() {					
+			mFoldersBreadCrumb.setParentTitle(getString(R.string.Bookmarks), null, new OnClickListener() {
 				@Override
 				public void onClick(View arg0) {
 					popNavigation();
@@ -482,6 +554,35 @@ private void popNavigation() {
 		updateFolderId();
 	}
 
+	public void newFolder() {
+		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+		final EditText input;
+
+		builder.setCancelable(true);
+		builder.setIcon(android.R.drawable.ic_dialog_info);
+		builder.setTitle(R.string.NewFolder);
+		builder.setMessage(R.string.NewFolderHint);
+
+		input = new EditText(getActivity());
+		builder.setView(input);
+
+		builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				if (!TextUtils.isEmpty(input.getText().toString())) {
+					new Thread(new NewFolderRunnable(getCurrentFolderId(), input.getText().toString())).start();
+				}
+			}
+		});
+		builder.setNegativeButton(R.string.Cancel, null);
+
+		builder.create().show();
+	}
+
+	private void doRenameFolder(long id, String newName) {
+		new Thread(new RenameFolderRunnable(id, newName)).start();
+	}
+
 	private void doDeleteFolder(long folderId) {
 		mProgressDialog = ProgressDialog.show(
 				getActivity(),
@@ -491,6 +592,81 @@ private void doDeleteFolder(long folderId) {
 		new Thread(new DeleteFolderRunnable(folderId)).start();
 	}
 
+	//@Override
+	public void onSelectFolder(long folder_id, String folder_name) {
+		new Thread(new MoveItemRunnable(contextItemId, folder_id)).start();
+	}
+
+	@SuppressLint("HandlerLeak")
+	private class MoveItemRunnable implements Runnable {
+		private long mParentFolderId;
+		private long mItemId;
+
+		public MoveItemRunnable(long item_id, long folder_id) {
+			mParentFolderId = folder_id;
+			mItemId = item_id;
+		}
+
+		private Handler mHandler = new Handler() {
+			public void handleMessage(Message msg) {
+				getLoaderManager().restartLoader(0, null, BookmarksFragment.this);
+			}
+		};
+
+		@Override
+		public void run() {
+			BookmarksWrapper.moveItem(getActivity().getContentResolver(), mItemId, mParentFolderId);
+			mHandler.sendEmptyMessage(0);
+		}
+	}
+
+
+	@SuppressLint("HandlerLeak")
+	private class NewFolderRunnable implements Runnable {
+		private long mParentFolderId;
+		private String mFolderName;
+
+		public NewFolderRunnable(long id, String name) {
+			mParentFolderId = id;
+			mFolderName = name;
+		}
+
+		private Handler mHandler = new Handler() {
+			public void handleMessage(Message msg) {
+				getLoaderManager().restartLoader(0, null, BookmarksFragment.this);
+			}
+		};
+
+		@Override
+		public void run() {
+			BookmarksWrapper.createFolder(getActivity().getContentResolver(), mFolderName, mParentFolderId);
+			mHandler.sendEmptyMessage(0);
+		}
+	}
+
+	@SuppressLint("HandlerLeak")
+	private class RenameFolderRunnable implements Runnable {
+		private long mFolderId;
+		private String mFolderName;
+
+		public RenameFolderRunnable(long id, String newName) {
+			mFolderId = id;
+			mFolderName = newName;
+		}
+
+		@Override
+		public void run() {
+			BookmarksWrapper.renameFolder(getActivity().getContentResolver(), mFolderId, mFolderName);
+			mHandler.sendEmptyMessage(0);
+		}
+
+		private Handler mHandler = new Handler() {
+			public void handleMessage(Message msg) {
+				getLoaderManager().restartLoader(0, null, BookmarksFragment.this);
+			}
+		};
+	}
+
 	@SuppressLint("HandlerLeak")
 	private class DeleteFolderRunnable implements Runnable {
 
diff --git a/src/org/tint/ui/fragments/FoldersOnlyFragment.java b/src/org/tint/ui/fragments/FoldersOnlyFragment.java
new file mode 100644
index 0000000..a160042
--- /dev/null
+++ b/src/org/tint/ui/fragments/FoldersOnlyFragment.java
@@ -0,0 +1,514 @@
+/*
+ * Tint Browser for Android
+ * 
+ * Copyright (C) 2012 - to infinity and beyond J. Devauchelle and contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 3 as published by the Free Software Foundation.
+ *
+ * This program 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 General Public License for more details.
+ */
+
+package org.tint.ui.fragments;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.FragmentBreadCrumbs;
+import android.app.LoaderManager;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.Loader;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.ProgressBar;
+
+import org.tint.R;
+import org.tint.controllers.Controller;
+import org.tint.model.BookmarkHistoryItem;
+import org.tint.model.FoldersOnlyAdapter;
+import org.tint.providers.BookmarksProvider;
+import org.tint.providers.BookmarksWrapper;
+import org.tint.ui.managers.UIFactory;
+import org.tint.ui.managers.UIManager;
+import org.tint.utils.Constants;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FoldersOnlyFragment extends DialogFragment implements LoaderManager.LoaderCallbacks<Cursor> {
+
+	public static final String EXTRA_FOLDER_STACK = "EXTRA_FOLDER_STACK";
+	public static final String EXTRA_FOLDER_BLACKLIST = "EXTRA_FOLDER_BLACKLIST";
+
+	private static final String STACK_SEPARATOR = "//;//";
+
+	private static final int CONTEXT_MENU_OPEN_IN_TAB = Menu.FIRST;
+	private static final int CONTEXT_MENU_EDIT_BOOKMARK = Menu.FIRST + 1;
+	private static final int CONTEXT_MENU_COPY_URL = Menu.FIRST + 2;
+	private static final int CONTEXT_MENU_SHARE_URL = Menu.FIRST + 3;
+	private static final int CONTEXT_MENU_DELETE_BOOKMARK = Menu.FIRST + 4;
+
+	private static final int CONTEXT_MENU_DELETE_FOLDER = Menu.FIRST + 5;
+	private static final int CONTEXT_MENU_RENAME_FOLDER = Menu.FIRST + 6;
+	private static final int CONTEXT_MENU_MOVE_ITEM = Menu.FIRST + 7;
+
+	private View mContainer = null;
+
+	private UIManager mUIManager;
+
+	private ListView mFoldersList;
+
+	private ProgressBar mProgress;
+
+	private ViewGroup mBreadCrumbGroup;
+	private FragmentBreadCrumbs mFoldersBreadCrumb;
+	private ImageView mBackBreadCrumb;
+	private ImageView mAddFolderBreadCrumb;
+
+	private FoldersOnlyAdapter mAdapter;
+
+	private List<NavigationItem> mNavigationList;
+
+	private boolean mIsTablet;
+	private boolean mIsListShown = true;
+
+	private ProgressDialog mProgressDialog;
+
+	private OnSharedPreferenceChangeListener mPreferenceChangeListener;
+
+	private long mBlacklistId = -1;
+
+
+	public interface FoldersOnlyListener {
+		void onSelectFolder(long folder_id, String folder_name);
+	}
+
+	public FoldersOnlyFragment() {
+		mUIManager = Controller.getInstance().getUIManager();
+	}
+
+	public long getCurrentFolderId() {
+		return mNavigationList.get(mNavigationList.size() - 1).getId();
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {		
+		super.onCreate(savedInstanceState);
+
+		mPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
+
+			@Override
+			public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+				if (Constants.PREFERENCE_BOOKMARKS_SORT_MODE.equals(key)) {
+					getLoaderManager().restartLoader(0, null, FoldersOnlyFragment.this);
+				}
+			}				
+		};
+		
+		PreferenceManager.getDefaultSharedPreferences(getActivity()).registerOnSharedPreferenceChangeListener(mPreferenceChangeListener);
+	}
+	
+	@Override
+	public void onDestroy() {		
+		super.onDestroy();
+		PreferenceManager.getDefaultSharedPreferences(getActivity()).unregisterOnSharedPreferenceChangeListener(mPreferenceChangeListener);
+	}
+
+	@Override
+	public Dialog onCreateDialog(Bundle savedInstanceState) {
+
+		View view = makeView(getActivity().getLayoutInflater(), savedInstanceState);
+		final FoldersOnlyListener fol = (FoldersOnlyListener)getActivity();
+
+		return new AlertDialog.Builder(getActivity())
+				.setView(view)
+				.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialogInterface, int i) {
+						NavigationItem ni = mNavigationList.get(mNavigationList.size() - 1);
+						fol.onSelectFolder(ni.getId(), ni.getTitle());
+					}
+				})
+				.setNegativeButton(R.string.Cancel, null)
+				.create();
+	}
+
+
+	//@Override
+	private View makeView(LayoutInflater inflater, Bundle savedInstanceState) {
+		mIsTablet = UIFactory.isTablet(getActivity());
+
+		if (mContainer == null) {
+
+			mContainer = inflater.inflate(R.layout.foldersonly_fragment, null);
+			
+			mBreadCrumbGroup = (ViewGroup) mContainer.findViewById(R.id.BookmarksBreadCrumbGroup);			
+
+			mFoldersBreadCrumb = (FragmentBreadCrumbs) mContainer.findViewById(R.id.BookmarksBreadCrumb);
+			mFoldersBreadCrumb.setMaxVisible(2);
+			mFoldersBreadCrumb.setActivity(getActivity());
+
+			mFoldersBreadCrumb.setParentTitle(getString(R.string.Bookmarks), null, new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					popNavigation();
+				}
+			});
+
+			mBackBreadCrumb = (ImageView) mContainer.findViewById(R.id.BookmarksBreadCrumbBackHierarchy);
+			mBackBreadCrumb.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View arg0) {
+					popNavigation();
+				}
+			});
+
+			mAddFolderBreadCrumb = (ImageView) mContainer.findViewById(R.id.BookmarksBreadCrumbAddFolder);
+			mAddFolderBreadCrumb.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View arg0) {
+					newFolder();
+				}
+			});
+
+			mFoldersList = (ListView) mContainer.findViewById(R.id.BookmarksGridView);
+			mProgress = (ProgressBar) mContainer.findViewById(R.id.BookmarksProgressBar);
+
+			String[] from = new String[] { BookmarksProvider.Columns.TITLE, BookmarksProvider.Columns.URL };
+			int[] to = new int[] { R.id.BookmarkRow_Title, R.id.BookmarkRow_Url };
+
+			mAdapter = new FoldersOnlyAdapter(
+					getActivity(),
+					R.layout.foldersonly_row,
+					null,
+					from,
+					to,
+					0);
+
+			mFoldersList.setAdapter(mAdapter);
+
+			mFoldersList.setOnItemClickListener(new OnItemClickListener() {
+				@Override
+				public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
+					BookmarkHistoryItem item = BookmarksWrapper.getBookmarkById(getActivity().getContentResolver(), id);
+
+					if (item != null) {
+						if (item.isFolder()) {
+							mNavigationList.add(new NavigationItem(item.getId(), item.getTitle()));
+							updateFolderId();
+						} else {
+							Intent result = new Intent();
+							result.putExtra(Constants.EXTRA_URL, item.getUrl());
+
+							getActivity().setResult(Activity.RESULT_OK, result);
+							getActivity().finish();
+						}
+					}
+				}
+			});
+
+			mNavigationList = new ArrayList<NavigationItem>();		
+
+			if (getArguments() != null) {
+				Bundle args = getArguments();
+				if (args.containsKey(EXTRA_FOLDER_STACK)) {
+					String folderStack = getArguments().getString(EXTRA_FOLDER_STACK);
+
+					String[] stack = folderStack.split(STACK_SEPARATOR);
+					for (int i = 0; i < stack.length; i++) {
+						mNavigationList.add(new NavigationItem(stack[i]));
+					}
+				}
+
+				if (args.containsKey(EXTRA_FOLDER_BLACKLIST)) {
+					mBlacklistId = args.getLong(EXTRA_FOLDER_BLACKLIST);
+				}
+			} else {
+				mNavigationList.add(new NavigationItem(-1, null));
+			}
+
+			setListShown(false);
+
+			updateFolderId();
+		}
+
+		return mContainer;
+	}
+
+	@Override
+	public void onSaveInstanceState(Bundle outState) {		
+		super.onSaveInstanceState(outState);
+
+		StringBuilder sb = new StringBuilder();
+		for (NavigationItem item : mNavigationList) {
+			sb.append(item.toString() + STACK_SEPARATOR);
+		}
+
+		outState.putString(EXTRA_FOLDER_STACK, sb.toString());
+	}
+
+	@Override
+	public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+		setListShown(false);
+		return BookmarksWrapper.getCursorLoaderForBookmarks(getActivity(),
+				mNavigationList.get(mNavigationList.size() - 1).getId(),
+				true, mBlacklistId);
+	}
+
+	@Override
+	public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+		mAdapter.swapCursor(data);
+		setListShown(true);
+	}
+
+	@Override
+	public void onLoaderReset(Loader<Cursor> loader) {
+		mAdapter.swapCursor(null);
+	}
+
+	private void setListShown(boolean shown) {
+		if (mIsListShown == shown) {
+			return;
+		}
+
+		mIsListShown = shown;
+
+		if (shown) {
+			mProgress.setVisibility(View.GONE);
+			mFoldersList.setVisibility(View.VISIBLE);
+		} else {
+			mProgress.setVisibility(View.VISIBLE);
+			mFoldersList.setVisibility(View.GONE);
+		}
+	}
+
+	private void updateFolderId() {
+		if (mAdapter != null) {
+			mAdapter.swapCursor(null);
+		}
+
+		NavigationItem current = mNavigationList.get(mNavigationList.size() - 1);
+		if (current.getId() == -1) {
+			mBackBreadCrumb.setVisibility(View.GONE);
+			getLoaderManager().restartLoader(0, null, this);
+
+			mFoldersBreadCrumb.setParentTitle(getString(R.string.Bookmarks), null, new OnClickListener() {
+				@Override
+				public void onClick(View arg0) {
+					popNavigation();
+				}
+			});
+
+		} else {
+			mBackBreadCrumb.setVisibility(View.VISIBLE);
+			getLoaderManager().restartLoader(0, null, this);
+
+			if (mNavigationList.size() > 2) {
+				NavigationItem previous = mNavigationList.get(mNavigationList.size() - 2);
+				mFoldersBreadCrumb.setParentTitle(previous.getTitle(), null, new OnClickListener() {					
+					@Override
+					public void onClick(View arg0) {
+						popNavigation();
+					}
+				});
+			} else {
+				mFoldersBreadCrumb.setParentTitle(getString(R.string.Bookmarks), null, new OnClickListener() {					
+					@Override
+					public void onClick(View arg0) {
+						popNavigation();
+					}
+				});
+			}
+		}
+
+		mFoldersBreadCrumb.setTitle(current.getTitle(), current.getTitle());
+	}
+
+	private void popNavigation() {
+		mNavigationList.remove(mNavigationList.size() - 1);
+		updateFolderId();
+	}
+
+	private void newFolder() {
+		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+		final EditText input;
+
+		builder.setCancelable(true);
+		builder.setIcon(android.R.drawable.ic_dialog_info);
+		builder.setTitle(R.string.NewFolder);
+		builder.setMessage(R.string.NewFolderHint);
+
+		input = new EditText(getActivity());
+		builder.setView(input);
+
+		builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				if (!TextUtils.isEmpty(input.getText().toString())) {
+					new Thread(new NewFolderRunnable(getCurrentFolderId(), input.getText().toString())).start();
+				}
+			}
+		});
+		builder.setNegativeButton(R.string.Cancel, null);
+
+		builder.create().show();
+	}
+
+	private void doRenameFolder(long id, String newName) {
+		new Thread(new RenameFolderRunnable(id, newName)).start();
+	}
+
+	private void doDeleteFolder(long folderId) {
+		mProgressDialog = ProgressDialog.show(
+				getActivity(),
+				getString(R.string.DeleteFolderTitle),
+				getString(R.string.DeleteFolderMessage));
+
+		new Thread(new DeleteFolderRunnable(folderId)).start();
+	}
+
+
+	@SuppressLint("HandlerLeak")
+	private class NewFolderRunnable implements Runnable {
+		private long mParentFolderId;
+		private String mFolderName;
+
+		public NewFolderRunnable(long id, String name) {
+			mParentFolderId = id;
+			mFolderName = name;
+		}
+
+		private Handler mHandler = new Handler() {
+			public void handleMessage(Message msg) {
+				getLoaderManager().restartLoader(0, null, FoldersOnlyFragment.this);
+			}
+		};
+
+		@Override
+		public void run() {
+			BookmarksWrapper.createFolder(getActivity().getContentResolver(), mFolderName, mParentFolderId);
+			mHandler.sendEmptyMessage(0);
+		}
+	}
+
+	@SuppressLint("HandlerLeak")
+	private class RenameFolderRunnable implements Runnable {
+		private long mFolderId;
+		private String mFolderName;
+
+		public RenameFolderRunnable(long id, String newName) {
+			mFolderId = id;
+			mFolderName = newName;
+		}
+
+		@Override
+		public void run() {
+			BookmarksWrapper.renameFolder(getActivity().getContentResolver(), mFolderId, mFolderName);
+			mHandler.sendEmptyMessage(0);
+		}
+
+		private Handler mHandler = new Handler() {
+			public void handleMessage(Message msg) {
+				getLoaderManager().restartLoader(0, null, FoldersOnlyFragment.this);
+			}
+		};
+	}
+
+	@SuppressLint("HandlerLeak")
+	private class DeleteFolderRunnable implements Runnable {
+
+		private long mFolderId;
+
+		public DeleteFolderRunnable(long folderId) {
+			mFolderId = folderId;
+		}
+
+		@Override
+		public void run() {			
+			BookmarksWrapper.deleteFolder(getActivity().getContentResolver(), mFolderId);
+			mHandler.sendEmptyMessage(0);
+		}
+
+		private Handler mHandler = new Handler() {
+			public void handleMessage(Message msg) {
+				mProgressDialog.dismiss();
+				getLoaderManager().restartLoader(0, null, FoldersOnlyFragment.this);
+			}
+		};
+
+	}
+
+	private class NavigationItem {
+		private long mId;
+		private String mTitle;
+
+		public NavigationItem(long id, String title) {
+			mId = id;
+			mTitle = title;
+		}
+
+		public NavigationItem(String builder) {
+			if ((builder.startsWith("{")) &&
+					(builder.endsWith("}"))) {
+
+				try {
+					builder = builder.substring(1, builder.length() - 1);
+					String[] parts = builder.split(",");
+
+					mId = Long.parseLong(parts[0]);
+					if (mId == -1) {
+						mTitle = null;
+					} else {
+						mTitle = parts[1];
+					}
+				} catch (Exception e) {
+					mId = -1;
+					mTitle = null;
+				}
+
+			} else {
+				mId = -1;
+				mTitle = null;
+			}
+		}
+
+		public long getId() {
+			return mId;
+		}
+
+		public String getTitle() {
+			return mTitle;
+		}
+
+		@Override
+		public String toString() {
+			return String.format("{%s,%s}", mId, mTitle);
+		}
+
+	}
+
+}

From 7c5858fa3735ef0c0b7e2ebe6e129a8d6914965e Mon Sep 17 00:00:00 2001
From: ShadowKyogre <shadowkyogre.public@gmail.com>
Date: Wed, 31 Aug 2016 21:11:43 -0700
Subject: [PATCH 3/3] Do not doubly escape urls in updateHistory query

Why? The content resolver takes care of the escaping for us. Not to mention,
leaving it like that adds way too many duplicate history entries.
---
 src/org/tint/providers/BookmarksWrapper.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/org/tint/providers/BookmarksWrapper.java b/src/org/tint/providers/BookmarksWrapper.java
index a7ed536..2a939b3 100644
--- a/src/org/tint/providers/BookmarksWrapper.java
+++ b/src/org/tint/providers/BookmarksWrapper.java
@@ -422,10 +422,15 @@ public static void deleteHistoryRecord(ContentResolver contentResolver, long id)
 	 * @param originalUrl The original url 
 	 */
 	public static void updateHistory(ContentResolver contentResolver, String title, String url, String originalUrl) {
-		String[] colums = new String[] { BookmarksProvider.Columns._ID, BookmarksProvider.Columns.URL, BookmarksProvider.Columns.BOOKMARK, BookmarksProvider.Columns.VISITS };
+		String[] colums = new String[] {
+				BookmarksProvider.Columns._ID,
+				BookmarksProvider.Columns.URL,
+				BookmarksProvider.Columns.BOOKMARK,
+				BookmarksProvider.Columns.VISITS
+		};
 		
-		String escapedUrl = url != null ? DatabaseUtils.sqlEscapeString(url) : "";
-		String escapedOriginalUrl = originalUrl != null ? DatabaseUtils.sqlEscapeString(originalUrl) : "";
+		String escapedUrl = url != null ? url : "";
+		String escapedOriginalUrl = originalUrl != null ? originalUrl : "";
 		
 		String whereClause = BookmarksProvider.Columns.URL + " = ? OR " + BookmarksProvider.Columns.URL + " = ?";