Merge branch 'develop' into iss321

app/src/main/AndroidManifest.xml

@@ -70,14 +70,6 @@
             </intent-filter>
         </service>
 
-        <service android:name=".service.TaskService"
-            android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY"/>
-            </intent-filter>
-        </service>
-
         <meta-data
             android:name="io.fabric.ApiKey"
             android:value="12ac6e94f850aaffcdff52001af77ca415d06a43" />

app/src/main/java/chat/rocket/android/api/MethodCallHelper.java

@@ -8,26 +8,27 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.UUID;
+
 import bolts.Continuation;
 import bolts.Task;
 import chat.rocket.android.helper.CheckSum;
 import chat.rocket.android.helper.TextUtils;
 import chat.rocket.android.service.ConnectivityManager;
+import chat.rocket.android.service.DDPClientRef;
+import chat.rocket.android_ddp.DDPClientCallback;
+import chat.rocket.core.SyncState;
 import chat.rocket.core.models.ServerInfo;
+import chat.rocket.persistence.realm.RealmHelper;
+import chat.rocket.persistence.realm.RealmStore;
+import chat.rocket.persistence.realm.models.ddp.RealmMessage;
 import chat.rocket.persistence.realm.models.ddp.RealmPermission;
 import chat.rocket.persistence.realm.models.ddp.RealmPublicSetting;
-import chat.rocket.core.SyncState;
-import chat.rocket.persistence.realm.models.ddp.RealmMessage;
 import chat.rocket.persistence.realm.models.ddp.RealmRoom;
 import chat.rocket.persistence.realm.models.ddp.RealmRoomRole;
 import chat.rocket.persistence.realm.models.ddp.RealmSpotlightRoom;
 import chat.rocket.persistence.realm.models.ddp.RealmSpotlightUser;
 import chat.rocket.persistence.realm.models.internal.MethodCall;
 import chat.rocket.persistence.realm.models.internal.RealmSession;
-import chat.rocket.persistence.realm.RealmHelper;
-import chat.rocket.persistence.realm.RealmStore;
-import chat.rocket.android.service.DDPClientRef;
-import chat.rocket.android_ddp.DDPClientCallback;
 import hugo.weaving.DebugLog;
 
 /**
@@ -83,10 +84,6 @@ public class MethodCallHelper {
     return task.continueWithTask(_task -> {
       if (_task.isFaulted()) {
         Exception exception = _task.getError();
-        // If wet get any error, close the socket to let the RocketChatWebSocketThread aware of it.
-        // FIXME: when rewriting the network layer we should get rid of this MethodCallHelper
-        // monolith concept. It decouples a lot the socket from the rest of the app.
-        ddpClientRef.get().close();
         if (exception instanceof MethodCall.Error) {
           String errMessageJson = exception.getMessage();
           if (TextUtils.isEmpty(errMessageJson)) {

app/src/main/java/chat/rocket/android/service/RocketChatWebSocketThread.java

@@ -4,9 +4,6 @@ import android.content.Context;
 import android.os.Handler;
 import android.os.HandlerThread;
 
-import com.google.android.gms.gcm.GcmNetworkManager;
-import com.google.android.gms.gcm.PeriodicTask;
-
 import org.json.JSONObject;
 
 import java.lang.reflect.Constructor;
@@ -418,28 +415,6 @@ public class RocketChatWebSocketThread extends HandlerThread {
   }
 
   private void startHeartBeat() {
-    // This task is scheduled to guarantee that RocketChatService is still bound at the application
-    // process. This is necessary due to the way the keep-alive assertions are currently architectured.
-    // By doing those keep-alives periodically we try to ensure that we have the app alive
-    // if for some reason its process gets killed (for any reason).
-    // TODO: should set this at another point; we should specify a reasonable time-window.
-    // TODO: should check and handle the case Google Play Services isn't available.
-    // TODO: consider on using https://github.com/evernote/android-job for this as it allows much more
-    // customisation like running at exponential backoff and others. We should alos use it more
-    // extensively throughout the app on all the common tasks, like i.e. sending a message
-    GcmNetworkManager gcmNetworkManager = GcmNetworkManager.getInstance(appContext);
-    gcmNetworkManager.schedule(
-            new PeriodicTask.Builder()
-                    .setRequiresCharging(false)
-                    .setUpdateCurrent(true)
-                    .setRequiredNetwork(com.google.android.gms.gcm.Task.NETWORK_STATE_ANY)
-                    .setTag(TaskService.TAG_KEEP_ALIVE)
-                    .setService(TaskService.class)
-                    .setPeriod(30)
-                    .setFlex(15)
-                    .build()
-    );
-
     hearbeatDisposable.clear();
     hearbeatDisposable.add(
         heartbeat(HEARTBEAT_PERIOD_MS)

app/src/main/java/chat/rocket/android/service/TaskService.java

-package chat.rocket.android.service;
-
-import com.google.android.gms.gcm.GcmNetworkManager;
-import com.google.android.gms.gcm.GcmTaskService;
-import com.google.android.gms.gcm.TaskParams;
-
-public class TaskService extends GcmTaskService {
-
-    public static final String TAG_KEEP_ALIVE = "TAG_KEEP_ALIVE";
-
-    @Override
-    public int onRunTask(TaskParams taskParams) {
-        switch (taskParams.getTag()) {
-            case TAG_KEEP_ALIVE:
-                ConnectivityManager.getInstance(getApplicationContext()).keepAliveServer();
-                return GcmNetworkManager.RESULT_SUCCESS;
-            default:
-                return GcmNetworkManager.RESULT_FAILURE;
-        }
-    }
-}