ignore ConnectivityManager state on first connect after resuming the app

irccloud · Nov 30, 2016 · 6673cbe · 6673cbe
1 parent 2ff522e
commit 6673cbe
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build.gradle b/build.gradle
@@ -57,7 +57,7 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 94
+        versionCode 95
         versionName "3.12"
         minSdkVersion 10
         targetSdkVersion 25

diff --git a/src/com/irccloud/android/NetworkConnection.java b/src/com/irccloud/android/NetworkConnection.java
@@ -1040,8 +1040,12 @@ public boolean hasResult(BaseTransaction<List<Model>> baseTransaction, List<Mode
         saveTimer.schedule(saveTimerTask, delay);*/
     }
 
+    public void connect() {
+        connect(false);
+    }
+
     @TargetApi(24)
-    public synchronized void connect() {
+    public synchronized void connect(boolean ignoreNetworkState) {
         Crashlytics.log(Log.DEBUG, TAG, "connect()");
         Context ctx = IRCCloudApplication.getInstance().getApplicationContext();
         session = ctx.getSharedPreferences("prefs", 0).getString("session_key", "");
@@ -1059,7 +1063,7 @@ public synchronized void connect() {
         if(cm != null) {
             NetworkInfo ni = cm.getActiveNetworkInfo();
 
-            if (ni != null && !ni.isConnectedOrConnecting()) {
+            if (!ignoreNetworkState && ni != null && !ni.isConnectedOrConnecting()) {
                 Crashlytics.log(Log.INFO, TAG, "No active network connection");
                 cancel_idle_timer();
                 state = STATE_DISCONNECTED;

diff --git a/src/com/irccloud/android/activity/BaseActivity.java b/src/com/irccloud/android/activity/BaseActivity.java
@@ -269,7 +269,7 @@ protected void onPostResume() {
         if(conn != null){
             Crashlytics.log(Log.INFO, "IRCCloud", "App resumed, websocket state: " + conn.getState());
             if(conn.getState() == NetworkConnection.STATE_DISCONNECTED || conn.getState() == NetworkConnection.STATE_DISCONNECTING)
-                conn.connect();
+                conn.connect(true);
         }
     }