Revert "Move stuff"

This reverts commit 84e721718aa7087bdc2f897c0b24aa5c9ea1fcac.

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -159,7 +159,21 @@ public class FileDisplayActivity extends HookActivity
             Intent initObserversIntent = FileObserverService.makeInitIntent(this);
             startService(initObserversIntent);
         }
-        
+
+        /// Load of saved instance state
+        if (savedInstanceState != null) {
+            mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(
+                    FileDisplayActivity.KEY_WAITING_TO_PREVIEW);
+            mSyncInProgress = savedInstanceState.getBoolean(KEY_SYNC_IN_PROGRESS);
+            mWaitingToSend = (OCFile) savedInstanceState.getParcelable(
+                    FileDisplayActivity.KEY_WAITING_TO_SEND);
+            searchQuery = savedInstanceState.getString(KEY_SEARCH_QUERY);
+        } else {
+            mWaitingToPreview = null;
+            mSyncInProgress = false;
+            mWaitingToSend = null;
+        }
+
         /// USER INTERFACE
 
         // Inflate and set the layout view
@@ -949,22 +963,6 @@ public class FileDisplayActivity extends HookActivity
         }
     }
 
-    @Override
-    public void onRestoreInstanceState(Bundle savedInstanceState) {
-        if (savedInstanceState != null) {
-            mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(
-                    FileDisplayActivity.KEY_WAITING_TO_PREVIEW);
-            mSyncInProgress = savedInstanceState.getBoolean(KEY_SYNC_IN_PROGRESS);
-            mWaitingToSend = (OCFile) savedInstanceState.getParcelable(
-                    FileDisplayActivity.KEY_WAITING_TO_SEND);
-            searchQuery = savedInstanceState.getString(KEY_SEARCH_QUERY);
-        } else {
-            mWaitingToPreview = null;
-            mSyncInProgress = false;
-            mWaitingToSend = null;
-        }
-    }
-
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         // responsibility of restore is preferred in onCreate() before than in