Skip to content

commit #1 #33

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

Merged
merged 1 commit into from
Apr 19, 2018
Merged

commit #1 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions app/src/main/java/com/example/android/audacity/DashboardActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {

mFirebaseAuth = FirebaseAuth.getInstance();
if (mFirebaseAuth == null) {
startActivity(new Intent(this, LoginActivity.class));
finish();

navigateToLogin();
}
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
Expand Down Expand Up @@ -141,14 +139,18 @@ public boolean onOptionsItemSelected(MenuItem item) {
case R.id.nav_sign_out:
if (mFirebaseAuth != null) {
mFirebaseAuth.signOut();
Intent intent1 = new Intent(DashboardActivity.this, LoginActivity.class);
startActivity(intent1);
finish();
navigateToLogin();
}
break;
default:
break;
}
return super.onOptionsItemSelected(item);
}

private void navigateToLogin() {
Intent intent = new Intent(DashboardActivity.this, LoginActivity.class);
startActivity(intent);
finish();
}
}
15 changes: 5 additions & 10 deletions app/src/main/java/com/example/android/audacity/LoginActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,14 @@
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.Toast;

import com.google.android.gms.auth.api.Auth;
import com.google.android.gms.auth.api.signin.GoogleSignIn;
import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
import com.google.android.gms.auth.api.signin.GoogleSignInClient;
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.ApiException;
import com.google.android.gms.common.api.GoogleApi;
import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.Task;
import com.google.firebase.auth.AuthCredential;
Expand All @@ -32,7 +26,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList

private static final String TAG = LoginActivity.class.getSimpleName();
private FirebaseAuth mFirebaseAuth;
private SignInButton googleSignInButton;
private SignInButton mGoogleSignInButton;
private GoogleSignInClient mGoogleSignInClient;
private static final int RC_SIGN_IN = 1012;

Expand All @@ -54,8 +48,9 @@ protected void onCreate(Bundle savedInstanceState) {
showDashboard();
}

googleSignInButton = findViewById(R.id.google_sign_in_button);
googleSignInButton.setOnClickListener(this);
mGoogleSignInButton = findViewById(R.id.google_sign_in_button);
mGoogleSignInButton.setOnClickListener(this);
mGoogleSignInButton.setSize(SignInButton.SIZE_WIDE);
}

@Override
Expand Down Expand Up @@ -119,7 +114,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
private void showDashboard() {
Intent intent = new Intent(LoginActivity.this, DashboardActivity.class);
startActivity(intent);

finish();
}


Expand Down