android-openrat

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit fd1f2eebc948f328c771788b9bba03ce95f98690
parent e2d95b5a80bbbb818eee7b9ac60c17f08fdaba56
Author: dankert <devnull@localhost>
Date:   Thu, 20 Oct 2011 21:28:52 +0200

Datenbank-Id in Server-Konfiguration

Diffstat:
res/drawable/logo.png | 0
res/drawable/logo_old.png | 0
res/values/strings.xml | 2++
res/xml/server.xml | 2++
src/de/openrat/android/blog/OpenRatBlog.java | 3++-
src/de/openrat/client/OpenRatClient.java | 11++++++-----
6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/res/drawable/logo.png b/res/drawable/logo.png Binary files differ. diff --git a/res/drawable/logo_old.png b/res/drawable/logo_old.png Binary files differ. diff --git a/res/values/strings.xml b/res/values/strings.xml @@ -73,4 +73,6 @@ <string name="server">Server</string> <string name="timeout">Zeitablauf</string> <string name="timeout_desc">Timeout der TCP/IP-Verbindung in Sekunden</string> + <string name="databaseid">Datenbank-Id</string> + <string name="databaseid_desc">Datenbank-Id aus der Server-Konfiguration</string> </resources> diff --git a/res/xml/server.xml b/res/xml/server.xml @@ -10,6 +10,8 @@ android:defaultValue="80" android:title="@string/port"></EditTextPreference> <EditTextPreference android:key="path" android:defaultValue="/" android:title="@string/path"></EditTextPreference> + <EditTextPreference android:key="database" + android:title="@string/databaseid" android:summary="@string/databaseid_desc"></EditTextPreference> <EditTextPreference android:key="username" android:title="@string/username"></EditTextPreference> <EditTextPreference android:key="password" diff --git a/src/de/openrat/android/blog/OpenRatBlog.java b/src/de/openrat/android/blog/OpenRatBlog.java @@ -107,11 +107,12 @@ public class OpenRatBlog extends ListActivity "80")); String path = prefs.getString("path", "/"); String host = prefs.getString("hostname", ""); + String dbid = prefs.getString("database", ""); client = new OpenRatClient(host, path, port); client.login(prefs.getString("username", ""), prefs - .getString("password", "")); + .getString("password", ""),dbid); } diff --git a/src/de/openrat/client/OpenRatClient.java b/src/de/openrat/client/OpenRatClient.java @@ -311,11 +311,13 @@ public class OpenRatClient extends CMSRequest JSONObject response = readJSON(); } - public void login(String login, String password) throws IOException + public void login(String login, String password, String database) + throws IOException { super.setParameter("action", "index"); super.setParameter("subaction", "login"); - super.setParameter("dbid", "db1"); + if (database.length() > 0) + super.setParameter("dbid", database); super.setParameter("login_name", login); super.setParameter("login_password", password); @@ -513,9 +515,8 @@ public class OpenRatClient extends CMSRequest super.setParameter("type", "delete"); super.setParameter("ids", ids); super.setParameter("commit", "1"); - - + readJSON(); - + } }