Skip to content

Logout flow - display login screen upon deleting the current access key. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Logout flow - display login screen upon deleting the current access key. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
864ad84
Update to ignore Android Studio metadata
sbeitzel Aug 1, 2013
b8f5e34
Upon deleting the access key (logging out) immediately display the lo…
sbeitzel Aug 5, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Ignore metadata from IDEA (Android Studio)
*.iml
.idea/
out/
bin/
gen/
*~
24 changes: 15 additions & 9 deletions src/com/BreakingBytes/SifterReader/SifterReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@ public void onCreate(Bundle savedInstanceState) {
mAccessKey = mSifterHelper.mAccessKey;
} else {
mLoginError = mSifterHelper.mLoginError;
loginKeys();
loginKeys(null);
return;
}
String projectsURL = HTTPS_PREFIX + mDomain + PROJECTS_URL + PROJECTS;
URLConnection sifterConnection = mSifterHelper.getSifterConnection(projectsURL);
if (sifterConnection == null) {
loginKeys();
loginKeys(null);
return;
}
mDialog = ProgressDialog.show(this, "", "Loading ...",true);
Expand All @@ -139,7 +139,7 @@ protected void onPostExecute(JSONObject sifterJSONObject) {
if (sifterJSONObject == null)
return;
if (getSifterError(sifterJSONObject)) {
loginKeys();
loginKeys(null);
return;
}
try {
Expand Down Expand Up @@ -188,7 +188,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case LOGIN_ID:
loginKeys();
loginKeys(null);
return true;
case DELETE_ID:
deleteKeys();
Expand All @@ -198,8 +198,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
}

/** start LoginActivity to get domain and access key. */
private void loginKeys() {
private void loginKeys(Integer flags) {
Intent intent = new Intent(this, LoginActivity.class);
if (flags != null) {
intent.addFlags(flags);
}
intent.putExtra(DOMAIN, mDomain);
intent.putExtra(ACCESS_KEY, mAccessKey);
intent.putExtra(LOGIN_ERROR, mLoginError.toString());
Expand All @@ -209,7 +212,8 @@ private void loginKeys() {
private void deleteKeys() {
File keyFile = getFileStreamPath(KEY_FILE);
if (keyFile.exists()) {
keyFile.delete();
//noinspection ResultOfMethodCallIgnored
keyFile.delete();
mAllProjects = null;
mDomain = null;
mAccessKey = null;
Expand All @@ -223,6 +227,8 @@ private void deleteKeys() {
setListAdapter(null);
onContentChanged();
}
// launch the login activity
loginKeys(Intent.FLAG_ACTIVITY_CLEAR_TOP);
}

/** start ProjectDetail activity for clicked project in list. */
Expand Down Expand Up @@ -315,7 +321,7 @@ protected void onPostExecute(JSONObject sifterJSONObject) {
if (sifterJSONObject == null)
return;
if (getSifterError(sifterJSONObject)) {
loginKeys();
loginKeys(null);
return;
}
if (PROJ_DETAIL.equals(ISSUES)) {
Expand Down Expand Up @@ -432,7 +438,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
if (mDomain.length()==0 || mAccessKey.length()==0) {
try {
mLoginError = mSifterHelper.onMissingToken();
loginKeys();
loginKeys(null);
} catch (Exception e) {
e.printStackTrace();
mSifterHelper.onException(e.toString());
Expand All @@ -443,7 +449,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
String projectsURL = HTTPS_PREFIX + mDomain + PROJECTS_URL + PROJECTS;
URLConnection sifterConnection = mSifterHelper.getSifterConnection(projectsURL);
if (sifterConnection == null) {
loginKeys();
loginKeys(null);
break;
} // if URL misformatted return to LoginActivity
mDialog = ProgressDialog.show(this, "", "Loading ...",true);
Expand Down