Merge branch 'develop' into configure_circle_ci_artifact

6b6e1e83 · Yusuke Iwaki · GitHub · 561685a6 · b0a3df91 · 6b6e1e83
Commit 6b6e1e83 authored Dec 23, 2016 by Yusuke Iwaki Committed by GitHub Dec 23, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

MainActivity.java .../main/java/chat/rocket/android/activity/MainActivity.java +1 -1

No files found.
--- a/app/src/main/java/chat/rocket/android/activity/MainActivity.java
+++ b/app/src/main/java/chat/rocket/android/activity/MainActivity.java
@@ -53,8 +53,8 @@ public class MainActivity extends AbstractAuthedActivity {

  @Override
  protected void onResume() {
-    super.onResume();
    isForeground = true;
+    super.onResume();
  }

  @Override