Merge branch 'develop' into feature/gcm-push

app/src/main/AndroidManifest.xml

@@ -35,7 +35,8 @@
                 android:windowSoftInputMode="adjustResize" />
         <activity
                 android:name=".activity.ServerConfigActivity"
-                android:windowSoftInputMode="adjustResize" />
+                android:windowSoftInputMode="adjustResize"
+                android:configChanges="orientation|screenSize"/>
 
         <service android:name=".service.RocketChatService" />
 

app/src/main/java/chat/rocket/android/activity/ServerConfigActivity.java

@@ -60,20 +60,20 @@ public class ServerConfigActivity extends AbstractFragmentActivity {
 
     setContentView(R.layout.simple_screen);
     showFragment(new WaitingFragment());
+    serverConfigErrorObserver.sub();
   }
 
   @Override
   protected void onResume() {
     super.onResume();
     RocketChatService.keepAlive(this);
-    serverConfigErrorObserver.sub();
   }
 
   @Override
-  protected void onPause() {
+  protected void onDestroy() {
     sessionObserver.unsub();
     serverConfigErrorObserver.unsub();
-    super.onPause();
+    super.onDestroy();
   }
 
   private void onRenderServerConfigError(ServerConfig config) {