Fix #175 - properly save email for Google Auth logins

Author: niftynei

app/src/main/java/com/zulip/android/ZulipApp.java

@@ -381,11 +381,11 @@ public void useDefaultServerURL() {
         setServerURL(DEFAULT_SERVER_URL);
     }
 
-    public void setLoggedInApiKey(String apiKey) {
+    public void setLoggedInApiKey(String apiKey, String email) {
         this.api_key = apiKey;
         Editor ed = this.settings.edit();
-        ed.putString(EMAIL, this.getEmail());
-        ed.putString(API_KEY, api_key);
+        ed.putString(EMAIL, email);
+        ed.putString(API_KEY, apiKey);
         ed.apply();
         afterLogin();
     }

app/src/main/java/com/zulip/android/activities/DevAuthActivity.java

@@ -61,15 +61,12 @@ protected void onCreate(Bundle savedInstanceState) {
         authEmailAdapter.setOnItemClickListener(new AuthClickListener() {
             @Override
             public void onItemClick(String email) {
-                if(email.contains("@")) {
-                    getApp().setEmail(email);
-                }
                 getServices()
                         .loginDEV(email)
                         .enqueue(new DefaultCallback<LoginResponse>() {
                             @Override
                             public void onSuccess(Call<LoginResponse> call, Response<LoginResponse> response) {
-                                getApp().setLoggedInApiKey(response.body().getApiKey());
+                                getApp().setLoggedInApiKey(response.body().getApiKey(), response.body().getEmail());
                                 openHome();
                             }
 

app/src/main/java/com/zulip/android/activities/LoginActivity.java

@@ -275,7 +275,7 @@ private void handleSignInResult(final GoogleSignInResult result) {
                         @Override
                         public void onSuccess(Call<LoginResponse> call, Response<LoginResponse> response) {
                             connectionProgressDialog.dismiss();
-                            getApp().setEmail(response.body().getEmail());
+                            getApp().setLoggedInApiKey(response.body().getApiKey(), response.body().getEmail());
                             openHome();
                         }
 
@@ -372,15 +372,14 @@ public void onClick(View v) {
                 connectionProgressDialog.show();
                 String username = mUserName.getText().toString();
                 String password = mPassword.getText().toString();
-                getApp().setEmail(username);
                 getServices()
                         .login(username, password)
                         .enqueue(new DefaultCallback<LoginResponse>() {
 
                             @Override
                             public void onSuccess(Call<LoginResponse> call, Response<LoginResponse> response) {
                                 connectionProgressDialog.dismiss();
-                                getApp().setLoggedInApiKey(response.body().getApiKey());
+                                getApp().setLoggedInApiKey(response.body().getApiKey(), response.body().getEmail());
                                 openHome();
                             }