diff --git a/.classpath b/.classpath index 6e9239ff..aa605c85 100644 --- a/.classpath +++ b/.classpath @@ -3,5 +3,6 @@ + diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 74d5ecfb..2496b372 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,17 +2,25 @@ + android:versionName="0.1"> + + - + + + + \ No newline at end of file diff --git a/lib/gson-1.7.1.jar b/lib/gson-1.7.1.jar new file mode 100644 index 00000000..acd16c06 Binary files /dev/null and b/lib/gson-1.7.1.jar differ diff --git a/res/layout/login.xml b/res/layout/login.xml new file mode 100644 index 00000000..73fa1869 --- /dev/null +++ b/res/layout/login.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/res/menu/login_menu.xml b/res/menu/login_menu.xml new file mode 100644 index 00000000..0c244247 --- /dev/null +++ b/res/menu/login_menu.xml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml new file mode 100644 index 00000000..8552cfcd --- /dev/null +++ b/res/menu/main_menu.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/res/values/arrays.xml b/res/values/arrays.xml new file mode 100644 index 00000000..fcac426d --- /dev/null +++ b/res/values/arrays.xml @@ -0,0 +1,12 @@ + + + + @string/theme_dark + @string/theme_light + + + + THEME_DARK + THEME_LIGHT + + diff --git a/res/values/attrs.xml b/res/values/attrs.xml new file mode 100644 index 00000000..9ad509d1 --- /dev/null +++ b/res/values/attrs.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 11c590fa..76ff7d7e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,5 +1,26 @@ - Hello World, MainActivity! + Login session refused by server + Logging in... + Login failed. Tiny Tiny RSS + Please configure the application first. + Ready to login. + Log in + Log out + Login + Password + http://example.domain/tt-rss/ + Authentication + Look and feel + Theme + Changes color theme of the application. + Tiny Tiny RSS URL + Login automatically + Dark + Preferences + Light + Login failed: API disabled. + Login failed: username or password incorrect. + Logged in. diff --git a/res/values/style.xml b/res/values/style.xml new file mode 100644 index 00000000..952f70ff --- /dev/null +++ b/res/values/style.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml new file mode 100644 index 00000000..c158a5f8 --- /dev/null +++ b/res/xml/preferences.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/org/fox/ttrss/ApiRequest.java b/src/org/fox/ttrss/ApiRequest.java new file mode 100644 index 00000000..aaac25c2 --- /dev/null +++ b/src/org/fox/ttrss/ApiRequest.java @@ -0,0 +1,83 @@ +package org.fox.ttrss; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; + +import org.apache.http.HttpResponse; +import org.apache.http.client.ClientProtocolException; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.DefaultHttpClient; + +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; + +import android.content.SharedPreferences; +import android.os.AsyncTask; +import android.preference.PreferenceManager; +import android.util.Log; + +public class ApiRequest extends AsyncTask, Integer, JsonElement> { + private final String TAG = this.getClass().getSimpleName(); + + protected String m_sessionId; + protected String m_apiEndpoint; + + protected ApiRequest(String sessionId, String apiEndpoint) { + super(); + m_sessionId = sessionId; + m_apiEndpoint = apiEndpoint; + } + + @Override + protected JsonElement doInBackground(HashMap... params) { + + Gson gson = new Gson(); + + String requestStr = gson.toJson(params); + + // FIXME ugly hack + requestStr = requestStr.substring(1).substring(0, requestStr.length()-2); + + Log.d(TAG, "executing API request...: " + requestStr + " " + m_apiEndpoint); + + DefaultHttpClient client = new DefaultHttpClient(); + HttpPost httpPost = new HttpPost(m_apiEndpoint + "/api/"); + + try { + httpPost.setEntity(new StringEntity(requestStr, "utf-8")); + HttpResponse execute = client.execute(httpPost); + + InputStream content = execute.getEntity().getContent(); + + BufferedReader buffer = new BufferedReader( + new InputStreamReader(content)); + + String s = ""; + String response = ""; + + while ((s = buffer.readLine()) != null) { + response += s; + } + + Log.d(TAG, "Server returned: " + response); + + JsonParser parser = new JsonParser(); + + return parser.parse(response); + + } catch (Exception e) { + e.printStackTrace(); + } + + return null; + } +} diff --git a/src/org/fox/ttrss/LoginActivity.java b/src/org/fox/ttrss/LoginActivity.java new file mode 100644 index 00000000..6cf1ff1e --- /dev/null +++ b/src/org/fox/ttrss/LoginActivity.java @@ -0,0 +1,192 @@ +package org.fox.ttrss; + +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; + +import org.apache.http.HttpResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.message.BasicNameValuePair; +import org.json.JSONObject; +import org.json.JSONTokener; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +import android.app.Activity; +import android.content.ComponentName; +import android.content.Intent; +import android.content.ServiceConnection; +import android.content.SharedPreferences; +import android.os.AsyncTask; +import android.os.Bundle; +import android.os.IBinder; +import android.preference.PreferenceManager; +import android.util.Log; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.widget.TextView; +import android.widget.Toast; + +public class LoginActivity extends Activity { + private final String TAG = this.getClass().getSimpleName(); + private SharedPreferences m_prefs; + private String m_themeName = ""; + private String m_sessionId = null; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + m_prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + + if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) { + setTheme(R.style.DarkTheme); + } else { + setTheme(R.style.LightTheme); + } + + m_themeName = m_prefs.getString("theme", "THEME_DARK"); + + setContentView(R.layout.login); + } + + protected void updateLoginStatus(int id) { + TextView tv = (TextView) findViewById(R.id.login_status_text); + if (tv != null) { + tv.setText(id); + } + } + + protected void showLoginProgress(boolean show) { + View v = findViewById(R.id.login_progress); + v.setVisibility((show) ? View.VISIBLE : View.GONE); + } + + @Override + public void onResume() { + super.onResume(); + + if (!m_prefs.getString("theme", "THEME_DARK").equals(m_themeName)) { + Intent refresh = new Intent(this, LoginActivity.class); + startActivity(refresh); + finish(); + } + + showLoginProgress(false); + + if (isConfigured()) { + updateLoginStatus(R.string.login_ready); + } else { + updateLoginStatus(R.string.login_need_configure); + } + + } + + public boolean isConfigured() { + String login = m_prefs.getString("login", ""); + String password = m_prefs.getString("password", ""); + String ttrssUrl = m_prefs.getString("ttrss_url", ""); + + return !(login.equals("") || password.equals("") || ttrssUrl.equals("")); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.login_menu, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.preferences: + Intent intent = new Intent(this, PreferencesActivity.class); + startActivityForResult(intent, 0); + return true; + case R.id.login: + performLogin(); + return true; + default: + return super.onOptionsItemSelected(item); + } + } + + @SuppressWarnings({ "serial", "unchecked" }) + private void performLogin() { + ApiRequest task = new ApiRequest(null, m_prefs.getString("ttrss_url", null)) { + @Override + protected void onPostExecute(JsonElement result) { + if (result != null) { + try { + + JsonObject rv = result.getAsJsonObject(); + + int status = rv.get("status").getAsInt(); + + if (status == 0) { + JsonObject content = rv.get("content").getAsJsonObject(); + if (content != null) { + m_sessionId = content.get("session_id").getAsString(); + + showLoginProgress(false); + updateLoginStatus(R.string.login_success); + + Intent intent = new Intent(getApplicationContext(), MainActivity.class); + intent.putExtra("sessionId", m_sessionId); + startActivityForResult(intent, 0); + + finish(); + return; + } + } else { + JsonObject content = rv.get("content").getAsJsonObject(); + + if (content != null) { + String error = content.get("error").getAsString(); + + if (error.equals("LOGIN_ERROR")) { + updateLoginStatus(R.string.login_wrong_password); + } else if (error.equals("API_DISABLED")) { + updateLoginStatus(R.string.login_api_disabled); + } + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + showLoginProgress(false); + updateLoginStatus(R.string.login_failed); + + } + }; + + updateLoginStatus(R.string.login_in_progress); + showLoginProgress(true); + + task.execute(new HashMap() { + { + put("op", "login"); + put("user", m_prefs.getString("login", null)); + put("password", m_prefs.getString("password", null)); + } + }); + + } + + @Override + protected void onDestroy() { + super.onDestroy(); + } +} \ No newline at end of file diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index 5ee2fc62..a25e4e8f 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -1,16 +1,86 @@ package org.fox.ttrss; import android.app.Activity; +import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; +import android.preference.PreferenceManager; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; public class MainActivity extends Activity { + private SharedPreferences m_prefs; + private String m_themeName = ""; + private String m_sessionId; + /** Called when the activity is first created. */ @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setTheme(android.R.style.Theme_Holo_Light); + m_prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + + if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) { + setTheme(R.style.DarkTheme); + } else { + setTheme(R.style.LightTheme); + } + + m_themeName = m_prefs.getString("theme", "THEME_DARK"); - setContentView(R.layout.main); + Bundle extras = getIntent().getExtras(); + + if (extras != null) { + m_sessionId = extras.getString("sessionId"); + } else if (savedInstanceState != null) { + m_sessionId = savedInstanceState.getString("sessionId"); + } + + setContentView(R.layout.main); } + + @Override + public void onSaveInstanceState (Bundle out) { + super.onSaveInstanceState(out); + + out.putString("sessionId", m_sessionId); + } + + @Override + public void onResume() { + super.onResume(); + + if (!m_prefs.getString("theme", "THEME_DARK").equals(m_themeName)) { + Intent refresh = new Intent(this, LoginActivity.class); + startActivity(refresh); + finish(); + } + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.main_menu, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.preferences: + Intent intent = new Intent(this, PreferencesActivity.class); + startActivityForResult(intent, 0); + return true; + case R.id.logout: + intent = new Intent(this, LoginActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); + startActivityForResult(intent, 0); + finish(); + return true; + default: + return super.onOptionsItemSelected(item); + } + } + } \ No newline at end of file diff --git a/src/org/fox/ttrss/PreferencesActivity.java b/src/org/fox/ttrss/PreferencesActivity.java new file mode 100644 index 00000000..5d538fc0 --- /dev/null +++ b/src/org/fox/ttrss/PreferencesActivity.java @@ -0,0 +1,14 @@ +package org.fox.ttrss; + +import android.os.Bundle; +import android.preference.PreferenceActivity; + +public class PreferencesActivity extends PreferenceActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + addPreferencesFromResource(R.xml.preferences); + } +}