diff --git a/src/bitmessagekivy/kivy_helper_search.py b/src/bitmessagekivy/kivy_helper_search.py
new file mode 100644
index 00000000..c9c93685
--- /dev/null
+++ b/src/bitmessagekivy/kivy_helper_search.py
@@ -0,0 +1,41 @@
+from helper_sql import *
+
+
+def search_sql(xAddress = "toaddress", account = None, folder = "inbox", where = None, what = None, unreadOnly = False):
+ if what is not None and what != "":
+ what = "%" + what + "%"
+ else:
+ what = None
+
+ sqlStatementBase = '''SELECT folder, msgid, toaddress, fromaddress, subject, received, read
+ FROM inbox '''
+
+ sqlStatementParts = []
+ sqlArguments = []
+ if account is not None:
+ if xAddress == 'both':
+ sqlStatementParts.append("(fromaddress = ? OR toaddress = ?)")
+ sqlArguments.append(account)
+ sqlArguments.append(account)
+ else:
+ sqlStatementParts.append(xAddress + " = ? ")
+ sqlArguments.append(account)
+ if folder is not None:
+ if folder == "new":
+ folder = "inbox"
+ unreadOnly = True
+ sqlStatementParts.append("folder = ? ")
+ sqlArguments.append(folder)
+ else:
+ sqlStatementParts.append("folder != ?")
+ sqlArguments.append("trash")
+ if what is not None:
+ sqlStatementParts.append("%s LIKE ?" % (where))
+ sqlArguments.append(what)
+ if unreadOnly:
+ sqlStatementParts.append("read = 0")
+ if len(sqlStatementParts) > 0:
+ sqlStatementBase += "WHERE " + " AND ".join(sqlStatementParts)
+ if folder == "sent":
+ sqlStatementBase += " ORDER BY lastactiontime"
+ return sqlQuery(sqlStatementBase, sqlArguments)
\ No newline at end of file
diff --git a/src/bitmessagekivy/main.kv b/src/bitmessagekivy/main.kv
index c678331a..b859f987 100644
--- a/src/bitmessagekivy/main.kv
+++ b/src/bitmessagekivy/main.kv
@@ -10,8 +10,8 @@
pos_hint:{"x":0,"y":.3}
id: btn
background_color: app.theme_cls.primary_dark
- text: '
'
- values: app.showmeaddresses()
+ text: app.showmeaddresses(name='text')
+ values: app.showmeaddresses(name='values')
NavigationDrawerIconButton:
icon: 'email-open'
@@ -148,8 +148,8 @@ BoxLayout:
pos_hint: {"x":0,"top":1.}
pos: 10,10
id: spinner_id
- text: '