Update code to most recent develop

Author: nvbln

vector/src/main/java/im/vector/activity/MediasPreviewerActivity.java

@@ -36,8 +36,7 @@ public class MediasPreviewerActivity extends MXCActionBarActivity {
     private static final String LOG_TAG = MediasPreviewerActivity.class.getSimpleName();
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    public void initUiAndData() {
 
         if (CommonActivityUtils.shouldRestartApp(this)) {
             Log.d(LOG_TAG, "onCreate : restart the application");
@@ -50,8 +49,6 @@ protected void onCreate(Bundle savedInstanceState) {
             return;
         }
 
-        setContentView(R.layout.activity_medias_previewer);
-
         Toolbar toolbar = (android.support.v7.widget.Toolbar) findViewById(R.id.room_toolbar);
 
         setSupportActionBar(toolbar);
@@ -137,4 +134,8 @@ private int getStatusBarHeight() {
         return result;
     }
 
+    @Override
+    public int getLayoutRes() {
+        return R.layout.activity_medias_previewer;
+    }
 }

vector/src/main/java/im/vector/util/PreferencesManager.java

@@ -701,7 +701,7 @@ public static void setUseAnalytics(Context context, boolean useAnalytics) {
      * @return true to preview media
      */
     public static boolean previewMediaWhenSending(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SETTINGS_PREVIEW_MEDIA_BEFORE_SENDING_KEY, false);
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SETTINGS_PREVIEW_MEDIA_BEFORE_SENDING_KEY, true);
     }
 
     /**