Fixed an error when try to using GoogleApiClient which is null or not connected.| Close #127.

Author: DenBond7

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/EmailManagerActivity.java

@@ -343,7 +343,11 @@ private void logout() {
 
         switch (accountDao.getAccountType()) {
             case AccountDao.ACCOUNT_TYPE_GOOGLE:
-                GoogleApiClientHelper.signOutFromGoogleAccount(this, googleApiClient);
+                if (googleApiClient != null && googleApiClient.isConnected()) {
+                    GoogleApiClientHelper.signOutFromGoogleAccount(this, googleApiClient);
+                } else {
+                    showInfoSnackbar(getRootView(), getString(R.string.google_api_is_not_available));
+                }
                 break;
         }
 

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/SplashActivity.java

@@ -32,7 +32,6 @@
 import com.google.android.gms.auth.api.Auth;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInResult;
-import com.google.android.gms.common.api.GoogleApiClient;
 
 import org.acra.ACRA;
 
@@ -46,9 +45,7 @@
  *         Time: 14:50
  *         E-mail: [email protected]
  */
-public class SplashActivity extends BaseSignInActivity implements
-        GoogleApiClient.OnConnectionFailedListener, GoogleApiClient.ConnectionCallbacks,
-        LoaderManager.LoaderCallbacks<LoaderResult> {
+public class SplashActivity extends BaseSignInActivity implements LoaderManager.LoaderCallbacks<LoaderResult> {
 
     private static final int REQUEST_CODE_CHECK_PRIVATE_KEYS_FROM_GMAIL = 101;
     private static final int REQUEST_CODE_CREATE_OR_IMPORT_KEY = 102;

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BaseSignInActivity.java

@@ -15,7 +15,6 @@
 import com.flowcrypt.email.R;
 import com.flowcrypt.email.ui.activity.AddNewAccountManuallyActivity;
 import com.flowcrypt.email.util.GeneralUtil;
-import com.flowcrypt.email.util.UIUtil;
 import com.flowcrypt.email.util.google.GoogleApiClientHelper;
 import com.google.android.gms.auth.api.Auth;
 import com.google.android.gms.common.ConnectionResult;
@@ -52,12 +51,15 @@ public void onClick(View v) {
         switch (v.getId()) {
             case R.id.buttonSignInWithGmail:
                 if (GeneralUtil.isInternetConnectionAvailable(this)) {
-                    googleApiClient.clearDefaultAccountAndReconnect();
-                    Intent signInIntent = Auth.GoogleSignInApi.getSignInIntent(googleApiClient);
-                    startActivityForResult(signInIntent, REQUEST_CODE_SIGN_IN);
+                    if (googleApiClient != null && googleApiClient.isConnected()) {
+                        googleApiClient.clearDefaultAccountAndReconnect();
+                        Intent signInIntent = Auth.GoogleSignInApi.getSignInIntent(googleApiClient);
+                        startActivityForResult(signInIntent, REQUEST_CODE_SIGN_IN);
+                    } else {
+                        showInfoSnackbar(getRootView(), getString(R.string.google_api_is_not_available));
+                    }
                 } else {
-                    UIUtil.showInfoSnackbar(getRootView(),
-                            getString(R.string.internet_connection_is_not_available));
+                    showInfoSnackbar(getRootView(), getString(R.string.internet_connection_is_not_available));
                 }
                 break;
 
@@ -66,7 +68,7 @@ public void onClick(View v) {
                     startActivityForResult(new Intent(this, AddNewAccountManuallyActivity.class),
                             REQUEST_CODE_ADD_OTHER_ACCOUNT);
                 } else {
-                    UIUtil.showInfoSnackbar(getRootView(), getString(R.string.internet_connection_is_not_available));
+                    showInfoSnackbar(getRootView(), getString(R.string.internet_connection_is_not_available));
                 }
                 break;
         }
@@ -84,7 +86,7 @@ public void onConnectionSuspended(int i) {
 
     @Override
     public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
-        UIUtil.showInfoSnackbar(getRootView(), connectionResult.getErrorMessage());
+        showInfoSnackbar(getRootView(), connectionResult.getErrorMessage());
     }
 
     protected void initGoogleApiClient() {

FlowCrypt/src/main/res/values/strings.xml

@@ -213,4 +213,5 @@
     <string name="diagnostic_info">Diagnostic info</string>
     <string name="email_does_not_available_in_this_folder">This email doesn\'t available in this folder</string>
     <string name="from">From</string>
+    <string name="google_api_is_not_available">Error: Google API is not available</string>
 </resources>