ki9
/
tracman-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#8 Fixed back button to login

master
Keith Irwin 2017-04-23 09:06:31 -04:00
parent b25f57c35d
commit 289743142c
No known key found for this signature in database
GPG Key ID: 378933C743E2BBC0
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/us/keithirwin/tracman/LoginActivity.java
View File

@ -16,7 +16,6 @@ import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
import com.google.android.gms.auth.api.signin.GoogleSignInResult;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.SignInButton;
import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.common.api.OptionalPendingResult;
import com.google.android.gms.common.api.ResultCallback;
@ -43,6 +42,8 @@ public class LoginActivity extends AppCompatActivity implements
View.OnClickListener {
private static final String TAG = "LoginActivity";
private static final int RC_SIGN_IN = 9001;
static final int SIGN_OUT = 1;
private static boolean DONT_LOG_IN = false;
// Development
private final String SERVER_ADDRESS = "https://dev.tracman.org/";
@ -91,18 +92,10 @@ public class LoginActivity extends AppCompatActivity implements
@Override
public void onStart() {
super.onStart();
Log.v(TAG, "Started. Checking for intent method");
// Just logged out - don't sign back in
if (getIntent().hasExtra("method")) {
Log.v(TAG, "Intent has method extra");
if (getIntent().getStringExtra("method").equals("signOut")) {
Log.d(TAG, "Got intent to sign out");
}
}
Log.v(TAG, "onStart() called");
// Try to sign in
else {
if (!DONT_LOG_IN) {
Log.v(TAG, "Trying to sign in...");
OptionalPendingResult<GoogleSignInResult> opr = Auth.GoogleSignInApi.silentSignIn(mGoogleApiClient);
if (opr.isDone()) {
@ -131,12 +124,18 @@ public class LoginActivity extends AppCompatActivity implements
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
Log.v(TAG, "onActivityResult() called");
// Result returned from launching the Intent from GoogleSignInApi.getSignInIntent(...);
if (requestCode == RC_SIGN_IN) {
Log.v(TAG, "requestCode was RC_SIGN_IN");
GoogleSignInResult result = Auth.GoogleSignInApi.getSignInResultFromIntent(data);
handleSignInResult(result);
}
else if (requestCode == SIGN_OUT) {
Log.v(TAG, "requestCode was SIGN_OUT");
DONT_LOG_IN = true;
}
}
private void AuthenticateGoogle(final String token) throws Exception {
@ -203,7 +202,7 @@ public class LoginActivity extends AppCompatActivity implements
editor.putString("loggedInUserSk", userSK);
editor.commit();
startActivity(new Intent(getBaseContext(), SettingsActivity.class));
startActivityForResult(new Intent(LoginActivity.this, SettingsActivity.class), SIGN_OUT);
}
}

25
app/src/main/java/us/keithirwin/tracman/SettingsActivity.java
View File

@ -21,6 +21,8 @@ import android.view.MenuItem;
import java.util.List;
import static us.keithirwin.tracman.LoginActivity.SIGN_OUT;
/**
* A {@link PreferenceActivity} that presents a set of application settings. On
@ -205,15 +207,28 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
@Override
public void onBackPressed() {
// super.onBackPressed();
Log.v(TAG, "onBackPressed() called");
// Stop LocationService
Log.v(TAG, "Stopping location service...");
stopService(new Intent(SettingsActivity.this, LocationService.class));
// Remove saved loggedInUser
Log.v(TAG, "Removing saved user...");
SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
SharedPreferences.Editor editor = sharedPref.edit();
editor.remove("loggedInUser");
editor.remove("loggedInUserId");
editor.remove("loggedInUserName");
editor.remove("loggedInUserSk");
editor.commit();
// Return to LoginActivity and don't sign back in again
Intent signOutIntent = new Intent();
signOutIntent.putExtra("method","signOut");
setResult(RESULT_OK, signOutIntent);
setResult(SIGN_OUT, new Intent());
// Finish the job
// finish();
super.onBackPressed();
// finish();
}