basic login things
This commit is contained in:
parent
2c12a4b677
commit
2250b86e3b
|
@ -3,7 +3,10 @@
|
||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent">
|
android:layout_height="fill_parent">
|
||||||
<TextView android:layout_width="wrap_content" android:id="@+id/no_unread_feeds" android:textAppearance="?android:attr/textAppearanceLarge" android:layout_height="wrap_content" android:text="@string/no_unread_feeds" android:layout_gravity="center" ></TextView>
|
<LinearLayout android:layout_width="match_parent" android:id="@+id/linearLayout1" android:gravity="center" android:layout_height="match_parent">
|
||||||
|
<ProgressBar android:id="@+id/loading_progress" android:layout_height="wrap_content" android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge"></ProgressBar>
|
||||||
|
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/loading_message" android:textAppearance="?android:attr/textAppearanceLarge" android:text="@string/loading_message"></TextView>
|
||||||
|
</LinearLayout>
|
||||||
<ListView android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/feeds"></ListView>
|
<ListView android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/feeds"></ListView>
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
|
@ -22,7 +22,8 @@ import android.widget.SimpleCursorAdapter;
|
||||||
public class FeedsFragment extends Fragment implements OnItemClickListener {
|
public class FeedsFragment extends Fragment implements OnItemClickListener {
|
||||||
private final String TAG = this.getClass().getSimpleName();
|
private final String TAG = this.getClass().getSimpleName();
|
||||||
private SharedPreferences m_prefs;
|
private SharedPreferences m_prefs;
|
||||||
|
private String m_sessionId;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
|
|
||||||
|
@ -32,6 +33,8 @@ public class FeedsFragment extends Fragment implements OnItemClickListener {
|
||||||
|
|
||||||
View view = inflater.inflate(R.layout.feeds_fragment, container, false);
|
View view = inflater.inflate(R.layout.feeds_fragment, container, false);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return view;
|
return view;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -55,6 +58,17 @@ public class FeedsFragment extends Fragment implements OnItemClickListener {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onItemClick(AdapterView<?> av, View view, int position, long id) {
|
public void onItemClick(AdapterView<?> av, View view, int position, long id) {
|
||||||
|
}
|
||||||
|
|
||||||
|
public void initialize(String sessionId) {
|
||||||
|
m_sessionId = sessionId;
|
||||||
|
|
||||||
|
refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void refresh() {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@ import org.jsoup.Jsoup;
|
||||||
|
|
||||||
import android.animation.LayoutTransition;
|
import android.animation.LayoutTransition;
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
|
import android.app.FragmentManager;
|
||||||
import android.app.FragmentTransaction;
|
import android.app.FragmentTransaction;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
|
@ -23,11 +24,14 @@ import android.util.Log;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuInflater;
|
import android.view.MenuInflater;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
|
import android.view.View;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
|
import android.widget.TextView;
|
||||||
import android.widget.ViewFlipper;
|
import android.widget.ViewFlipper;
|
||||||
|
|
||||||
import com.google.gson.JsonArray;
|
import com.google.gson.JsonArray;
|
||||||
import com.google.gson.JsonElement;
|
import com.google.gson.JsonElement;
|
||||||
|
import com.google.gson.JsonObject;
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
|
|
||||||
public class MainActivity extends Activity {
|
public class MainActivity extends Activity {
|
||||||
|
@ -39,19 +43,12 @@ public class MainActivity extends Activity {
|
||||||
|
|
||||||
protected MenuItem m_syncStatus;
|
protected MenuItem m_syncStatus;
|
||||||
|
|
||||||
protected String getSessionId() {
|
public synchronized String getSessionId() {
|
||||||
return m_sessionId;
|
return m_sessionId;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected synchronized void setSessionId(String sessionId) {
|
|
||||||
m_sessionId = sessionId;
|
|
||||||
|
|
||||||
SharedPreferences.Editor editor = m_prefs.edit();
|
|
||||||
editor.putString("last_session_id", m_sessionId);
|
|
||||||
editor.commit();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Called when the activity is first created. */
|
/** Called when the activity is first created. */
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
@ -65,15 +62,14 @@ public class MainActivity extends Activity {
|
||||||
}
|
}
|
||||||
|
|
||||||
m_themeName = m_prefs.getString("theme", "THEME_DARK");
|
m_themeName = m_prefs.getString("theme", "THEME_DARK");
|
||||||
m_sessionId = m_prefs.getString("last_session_id", null);
|
|
||||||
|
|
||||||
if (savedInstanceState != null) {
|
if (savedInstanceState != null) {
|
||||||
m_sessionId = savedInstanceState.getString("sessionId");
|
m_sessionId = savedInstanceState.getString("sessionId");
|
||||||
}
|
}
|
||||||
|
|
||||||
setContentView(R.layout.main);
|
setContentView(R.layout.main);
|
||||||
|
|
||||||
ApiRequest ar = new ApiRequest();
|
LoginRequest ar = new LoginRequest();
|
||||||
ar.setApi(m_prefs.getString("ttrss_url", null));
|
ar.setApi(m_prefs.getString("ttrss_url", null));
|
||||||
|
|
||||||
HashMap<String,String> loginMap = new HashMap<String,String>() {
|
HashMap<String,String> loginMap = new HashMap<String,String>() {
|
||||||
|
@ -86,6 +82,8 @@ public class MainActivity extends Activity {
|
||||||
|
|
||||||
ar.execute(loginMap);
|
ar.execute(loginMap);
|
||||||
|
|
||||||
|
setLoadingStatus(R.string.login_in_progress, true);
|
||||||
|
|
||||||
/* ViewFlipper vf = (ViewFlipper) findViewById(R.id.main_flipper);
|
/* ViewFlipper vf = (ViewFlipper) findViewById(R.id.main_flipper);
|
||||||
|
|
||||||
if (vf != null) {
|
if (vf != null) {
|
||||||
|
@ -105,6 +103,20 @@ public class MainActivity extends Activity {
|
||||||
ft.commit(); */
|
ft.commit(); */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setLoadingStatus(int status, boolean showProgress) {
|
||||||
|
TextView tv = (TextView)findViewById(R.id.loading_message);
|
||||||
|
|
||||||
|
if (tv != null) {
|
||||||
|
tv.setText(status);
|
||||||
|
}
|
||||||
|
|
||||||
|
View pb = findViewById(R.id.loading_progress);
|
||||||
|
|
||||||
|
if (pb != null) {
|
||||||
|
pb.setVisibility(showProgress ? View.VISIBLE : View.GONE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSaveInstanceState (Bundle out) {
|
public void onSaveInstanceState (Bundle out) {
|
||||||
super.onSaveInstanceState(out);
|
super.onSaveInstanceState(out);
|
||||||
|
@ -149,4 +161,58 @@ public class MainActivity extends Activity {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private class LoginRequest extends ApiRequest {
|
||||||
|
|
||||||
|
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();
|
||||||
|
|
||||||
|
Log.d(TAG, "<<< Authentified, sessionId=" + m_sessionId);
|
||||||
|
|
||||||
|
setLoadingStatus(R.string.loading_message, true);
|
||||||
|
|
||||||
|
FragmentManager fm = getFragmentManager();
|
||||||
|
FeedsFragment ff = (FeedsFragment) fm.findFragmentById(R.id.feeds);
|
||||||
|
|
||||||
|
if (ff != null) {
|
||||||
|
ff.initialize(m_sessionId);
|
||||||
|
}
|
||||||
|
|
||||||
|
ViewFlipper vf = (ViewFlipper) findViewById(R.id.main_flipper);
|
||||||
|
|
||||||
|
if (vf != null) {
|
||||||
|
vf.showNext();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
JsonObject content = rv.get("content").getAsJsonObject();
|
||||||
|
|
||||||
|
if (content != null) {
|
||||||
|
String error = content.get("error").getAsString();
|
||||||
|
|
||||||
|
m_sessionId = null;
|
||||||
|
|
||||||
|
if (error.equals("LOGIN_ERROR")) {
|
||||||
|
setLoadingStatus(R.string.login_wrong_password, false);
|
||||||
|
} else if (error.equals("API_DISABLED")) {
|
||||||
|
setLoadingStatus(R.string.login_api_disabled, false);
|
||||||
|
} else {
|
||||||
|
setLoadingStatus(R.string.login_failed, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user