Fixed a connection issue when BaseSyncActivity restored after the system kills it. | #67

Author: DenBond7

FlowCrypt/src/main/java/com/flowcrypt/email/service/EmailSyncService.java

@@ -27,6 +27,8 @@
 import com.flowcrypt.email.api.email.model.AttachmentInfo;
 import com.flowcrypt.email.api.email.sync.GmailSynsManager;
 import com.flowcrypt.email.api.email.sync.SyncListener;
+import com.flowcrypt.email.database.dao.source.AccountDao;
+import com.flowcrypt.email.database.dao.source.AccountDaoSource;
 import com.flowcrypt.email.database.dao.source.imap.AttachmentDaoSource;
 import com.flowcrypt.email.database.dao.source.imap.ImapLabelsDaoSource;
 import com.flowcrypt.email.database.dao.source.imap.MessageDaoSource;
@@ -101,6 +103,8 @@ public class EmailSyncService extends Service implements SyncListener {
      */
     private Account account;
 
+    private boolean isServiceStarted;
+
     public EmailSyncService() {
         this.replyToMessengers = new HashMap<>();
     }
@@ -134,6 +138,7 @@ public void onCreate() {
     public int onStartCommand(Intent intent, int flags, int startId) {
         Log.d(TAG, "onStartCommand |intent =" + intent + "|flags = " + flags + "|startId = " +
                 startId);
+        isServiceStarted = true;
         if (intent != null) {
             account = intent.getParcelableExtra(EXTRA_KEY_GMAIL_ACCOUNT);
             if (account != null) {
@@ -171,6 +176,21 @@ public void onRebind(Intent intent) {
     @Override
     public IBinder onBind(Intent intent) {
         Log.d(TAG, "onBind:" + intent);
+
+        if (account == null) {
+            AccountDao accountDao = new AccountDaoSource().getActiveAccountInformation
+                    (getApplicationContext());
+            if (accountDao != null) {
+                account = accountDao.getAccount();
+
+                if (account != null && !isServiceStarted) {
+                    EmailSyncService.startEmailSyncService(getContext(), account);
+                }
+            }
+        } else {
+            gmailSynsManager.beginSync(false);
+        }
+
         return messenger.getBinder();
     }
 

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

@@ -14,6 +14,7 @@
 import android.support.v4.content.Loader;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 
@@ -29,11 +30,16 @@
  *         E-mail: [email protected]
  */
 public abstract class BaseActivity extends AppCompatActivity {
+    protected static String TAG;
 
     private Snackbar snackbar;
     private Toolbar toolbar;
     private AppBarLayout appBarLayout;
 
+    public BaseActivity() {
+        TAG = getClass().getSimpleName();
+    }
+
     /**
      * This method can used to change "HomeAsUpEnabled" behavior.
      *
@@ -57,10 +63,35 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Log.d(TAG, "onCreate");
         setContentView(getContentViewResourceId());
         initViews();
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        Log.d(TAG, "onStart");
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        Log.d(TAG, "onResume");
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        Log.d(TAG, "onStop");
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        Log.d(TAG, "onDestroy");
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {

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

@@ -39,7 +39,6 @@
  */
 
 public abstract class BaseSyncActivity extends BaseActivity implements ServiceConnection {
-    private static final String TAG = BaseSyncActivity.class.getSimpleName();
     /**
      * Messenger for communicating with the service.
      */
@@ -95,6 +94,7 @@ protected void onDestroy() {
 
     @Override
     public void onServiceConnected(ComponentName name, IBinder service) {
+        Log.d(TAG, "Activity connected to " + EmailSyncService.class.getSimpleName());
         syncServiceMessenger = new Messenger(service);
         isBound = true;
 
@@ -103,6 +103,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {
 
     @Override
     public void onServiceDisconnected(ComponentName name) {
+        Log.d(TAG, "Activity disconnected from " + EmailSyncService.class.getSimpleName());
         syncServiceMessenger = null;
         isBound = false;
     }