Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

51 files changed, 423 insertions, 2465 deletions

diff --git a/Conversations-Plus-ChangeLog.md b/Conversations-Plus-ChangeLog.md
index 0f23c1f1..8cb7db2f 100644
--- a/Conversations-Plus-ChangeLog.md
+++ b/Conversations-Plus-ChangeLog.md
@@ -1,7 +1,9 @@
 ###Conversations+ ChangeLog
 
 ####Version 0.0.6
+* Fixes FS#95: NPE when opening message details for failed file transfer
 * Implements FS#89: Change about information
+* Implements FS#84: Setting for location to store received pictures
 * Implements FS#83: Reload from last received message
 * Fixes FS#82: Strange layout in share with activity
 * Fixes FS#81: Interactive message loading causes "jumps"
@@ -12,6 +14,7 @@
 * Fixes FS#47: Setting "WLAN only" no longer works for received links
 * Implements FS#26: Introduce dialog to choose whether to send resized picture or original picture
 * Implements FS#24: Introduce setting for picture resizing
+* Implements FS#19: Received and Sent pictures are automatically stored in public picture folder
 * Partially implements FS#6: Change "Report bug to developer" - Reporting conference changed to c+bugs@conference.thedevstack.de
 
 ####Version 0.0.5
diff --git a/build.gradle b/build.gradle
index fb67b7f0..61521f2d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,26 +20,33 @@ allprojects {
 apply plugin: 'com.android.application'
 
 repositories {
-	jcenter()
-	mavenCentral()
+    flatDir {
+        dirs 'libs/3rdParty', 'libs/3rdParty/zxing'
+    }
 }
 
 dependencies {
+    // Local JAR files
+    //compile fileTree(dir: 'libs/zxing', includes: ['core-3.1.0.jar', 'android-integration-3.1.0.jar'])
+	compile name: 'core-3.1.0' //zxing
+	compile name: 'android-integration-3.1.0' //zxing
+    compile name: 'libidn-1.15'
+    compile name: 'minidns-0.1.3'
+    compile name: 'org.otr4j-0.22'
+    compile name: 'bcprov-jdk15on-1.51'
+    compile name: 'EnhancedListView-0.3.4', ext: 'aar'
+    compile name: 'ShortcutBadger-1.1.1', ext: 'aar'
+    compile name: 'swipy-1.2.1', ext: 'aar'
+
+    // Local modules
     compile project(':libs:openpgp-api-lib')
     compile project(':libs:MemorizingTrustManager')
-    compile 'com.android.support:support-v13:21.0.3'
-    compile 'org.bouncycastle:bcprov-jdk15on:1.51'
-    compile 'org.jitsi:org.otr4j:0.22'
-    compile 'org.gnu.inet:libidn:1.15'
-    compile 'com.google.zxing:core:3.1.0'
-    compile 'com.google.zxing:android-integration:3.1.0'
-    compile 'de.measite.minidns:minidns:0.1.3'
-	compile 'de.timroes.android:EnhancedListView:0.3.4'
-	compile 'me.leolin:ShortcutBadger:1.1.1@aar'
     compile project(':libs:emojicon')
 	compile project(':libs:colorpicker')
-	compile project(':libs:SwipyRefreshLayout')
 	compile project(':libs:thedevstacklogcat')
+
+    // Android dependencies
+    compile 'com.android.support:support-v13:21.0.3'
 }
 
 android {
diff --git a/libs/3rdParty/EnhancedListView-0.3.4.aar b/libs/3rdParty/EnhancedListView-0.3.4.aar
new file mode 100644
index 00000000..1d649e4f
--- /dev/null
+++ b/libs/3rdParty/EnhancedListView-0.3.4.aar
diff --git a/libs/3rdParty/ShortcutBadger-1.1.1.aar b/libs/3rdParty/ShortcutBadger-1.1.1.aar
new file mode 100644
index 00000000..becd4961
--- /dev/null
+++ b/libs/3rdParty/ShortcutBadger-1.1.1.aar
diff --git a/libs/bcprov-jdk15on-1.50.jar b/libs/3rdParty/bcprov-jdk15on-1.51.jar
index d4b510d7..4076e116 100644
--- a/libs/bcprov-jdk15on-1.50.jar
+++ b/libs/3rdParty/bcprov-jdk15on-1.51.jar
diff --git a/libs/libidn-1.15.jar b/libs/3rdParty/libidn-1.15.jar
index 79a44f92..79a44f92 100644
--- a/libs/libidn-1.15.jar
+++ b/libs/3rdParty/libidn-1.15.jar
diff --git a/libs/3rdParty/minidns-0.1.3.jar b/libs/3rdParty/minidns-0.1.3.jar
new file mode 100644
index 00000000..d8e74660
--- /dev/null
+++ b/libs/3rdParty/minidns-0.1.3.jar
diff --git a/libs/3rdParty/org.otr4j-0.22.jar b/libs/3rdParty/org.otr4j-0.22.jar
new file mode 100644
index 00000000..f217db1d
--- /dev/null
+++ b/libs/3rdParty/org.otr4j-0.22.jar
diff --git a/libs/3rdParty/swipy-1.2.1.aar b/libs/3rdParty/swipy-1.2.1.aar
new file mode 100644
index 00000000..428e97db
--- /dev/null
+++ b/libs/3rdParty/swipy-1.2.1.aar
diff --git a/libs/zxing/android-core-3.1.0.jar b/libs/3rdParty/zxing/android-core-3.1.0.jar
index 0c6137de..0c6137de 100644
--- a/libs/zxing/android-core-3.1.0.jar
+++ b/libs/3rdParty/zxing/android-core-3.1.0.jar
diff --git a/libs/zxing/android-integration-3.1.0.jar b/libs/3rdParty/zxing/android-integration-3.1.0.jar
index fb621f8b..fb621f8b 100644
--- a/libs/zxing/android-integration-3.1.0.jar
+++ b/libs/3rdParty/zxing/android-integration-3.1.0.jar
diff --git a/libs/zxing/core-3.1.0.jar b/libs/3rdParty/zxing/core-3.1.0.jar
index 63c228a9..63c228a9 100644
--- a/libs/zxing/core-3.1.0.jar
+++ b/libs/3rdParty/zxing/core-3.1.0.jar
diff --git a/libs/SwipyRefreshLayout/.gitignore b/libs/SwipyRefreshLayout/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/libs/SwipyRefreshLayout/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/libs/SwipyRefreshLayout/build.gradle b/libs/SwipyRefreshLayout/build.gradle
deleted file mode 100644
index 79f47d55..00000000
--- a/libs/SwipyRefreshLayout/build.gradle
+++ /dev/null
@@ -1,24 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
-
-    defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 22
-        versionCode 1
-        versionName "1.2.1"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.2.1'
-}
diff --git a/libs/SwipyRefreshLayout/proguard-rules.pro b/libs/SwipyRefreshLayout/proguard-rules.pro
deleted file mode 100644
index 7c07ec21..00000000
--- a/libs/SwipyRefreshLayout/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/oliviergoutay/Documents/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/libs/SwipyRefreshLayout/src/main/AndroidManifest.xml b/libs/SwipyRefreshLayout/src/main/AndroidManifest.xml
deleted file mode 100644
index a2916954..00000000
--- a/libs/SwipyRefreshLayout/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.orangegangsters.github.swipyrefreshlayout.library">
-
-    <application android:allowBackup="true">
-
-    </application>
-
-</manifest>
diff --git a/libs/SwipyRefreshLayout/src/main/java/com/orangegangsters/github/swipyrefreshlayout/library/CircleImageView.java b/libs/SwipyRefreshLayout/src/main/java/com/orangegangsters/github/swipyrefreshlayout/library/CircleImageView.java
deleted file mode 100644
index 2609655b..00000000
--- a/libs/SwipyRefreshLayout/src/main/java/com/orangegangsters/github/swipyrefreshlayout/library/CircleImageView.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.orangegangsters.github.swipyrefreshlayout.library;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.RadialGradient;
-import android.graphics.Shader;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.OvalShape;
-import android.support.v4.view.ViewCompat;
-import android.view.animation.Animation;
-import android.widget.ImageView;
-
-/**
- * Private class created to work around issues with AnimationListeners being
- * called before the animation is actually complete and support shadows on older
- * platforms.
- *
- * @hide
- */
-class CircleImageView extends ImageView {
-
-    private static final int KEY_SHADOW_COLOR = 0x1E000000;
-    private static final int FILL_SHADOW_COLOR = 0x3D000000;
-    // PX
-    private static final float X_OFFSET = 0f;
-    private static final float Y_OFFSET = 1.75f;
-    private static final float SHADOW_RADIUS = 3.5f;
-    private static final int SHADOW_ELEVATION = 4;
-
-    private Animation.AnimationListener mListener;
-    private int mShadowRadius;
-
-    public CircleImageView(Context context, int color, final float radius) {
-        super(context);
-        final float density = getContext().getResources().getDisplayMetrics().density;
-        final int diameter = (int) (radius * density * 2);
-        final int shadowYOffset = (int) (density * Y_OFFSET);
-        final int shadowXOffset = (int) (density * X_OFFSET);
-
-        mShadowRadius = (int) (density * SHADOW_RADIUS);
-
-        ShapeDrawable circle;
-        if (elevationSupported()) {
-            circle = new ShapeDrawable(new OvalShape());
-            ViewCompat.setElevation(this, SHADOW_ELEVATION * density);
-        } else {
-            OvalShape oval = new OvalShadow(mShadowRadius, diameter);
-            circle = new ShapeDrawable(oval);
-            ViewCompat.setLayerType(this, ViewCompat.LAYER_TYPE_SOFTWARE, circle.getPaint());
-            circle.getPaint().setShadowLayer(mShadowRadius, shadowXOffset, shadowYOffset,
-                    KEY_SHADOW_COLOR);
-            final int padding = (int) mShadowRadius;
-            // set padding so the inner image sits correctly within the shadow.
-            setPadding(padding, padding, padding, padding);
-        }
-        circle.getPaint().setColor(color);
-        setBackgroundDrawable(circle);
-    }
-
-    private boolean elevationSupported() {
-        return android.os.Build.VERSION.SDK_INT >= 21;
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        if (!elevationSupported()) {
-            setMeasuredDimension(getMeasuredWidth() + mShadowRadius*2, getMeasuredHeight()
-                    + mShadowRadius*2);
-        }
-    }
-
-    public void setAnimationListener(Animation.AnimationListener listener) {
-        mListener = listener;
-    }
-
-    @Override
-    public void onAnimationStart() {
-        super.onAnimationStart();
-        if (mListener != null) {
-            mListener.onAnimationStart(getAnimation());
-        }
-    }
-
-    @Override
-    public void onAnimationEnd() {
-        super.onAnimationEnd();
-        if (mListener != null) {
-            mListener.onAnimationEnd(getAnimation());
-        }
-    }
-
-    /**
-     * Update the background color of the circle image view.
-     */
-    public void setBackgroundColor(int colorRes) {
-        if (getBackground() instanceof ShapeDrawable) {
-            final Resources res = getResources();
-            ((ShapeDrawable) getBackground()).getPaint().setColor(res.getColor(colorRes));
-        }
-    }
-
-    private class OvalShadow extends OvalShape {
-        private RadialGradient mRadialGradient;
-        private int mShadowRadius;
-        private Paint mShadowPaint;
-        private int mCircleDiameter;
-
-        public OvalShadow(int shadowRadius, int circleDiameter) {
-            super();
-            mShadowPaint = new Paint();
-            mShadowRadius = shadowRadius;
-            mCircleDiameter = circleDiameter;
-            mRadialGradient = new RadialGradient(mCircleDiameter / 2, mCircleDiameter / 2,
-                    mShadowRadius, new int[] {
-                            FILL_SHADOW_COLOR, Color.TRANSPARENT
-                    }, null, Shader.TileMode.CLAMP);
-            mShadowPaint.setShader(mRadialGradient);
-        }
-
-        @Override
-        public void draw(Canvas canvas, Paint paint) {
-            final int viewWidth = CircleImageView.this.getWidth();
-            final int viewHeight = CircleImageView.this.getHeight();
-            canvas.drawCircle(viewWidth / 2, viewHeight / 2, (mCircleDiameter / 2 + mShadowRadius),
-                    mShadowPaint);
-            canvas.drawCircle(viewWidth / 2, viewHeight / 2, (mCircleDiameter / 2), paint);
-        }
-    }
-}
diff --git a/libs/SwipyRefreshLayout/src/main/java/com/orangegangsters/github/swipyrefreshlayout/library/MaterialProgressDrawable.java b/libs/SwipyRefreshLayout/src/main/java/com/orangegangsters/github/swipyrefreshlayout/library/MaterialProgressDrawable.java
deleted file mode 100644
index c7eef8c1..00000000
--- a/libs/SwipyRefreshLayout/src/main/java/com/orangegangsters/github/swipyrefreshlayout/library/MaterialProgressDrawable.java
+++ /dev/null
@@ -1,722 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.orangegangsters.github.swipyrefreshlayout.library;
-
-import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.animation.Interpolator;
-import android.view.animation.Animation;
-import android.view.animation.LinearInterpolator;
-import android.view.animation.Transformation;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.Paint.Style;
-import android.graphics.Path;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Animatable;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.util.DisplayMetrics;
-import android.view.View;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-
-/**
- * Fancy progress indicator for Material theme.
- *
- * @hide 
- */
-class MaterialProgressDrawable extends Drawable implements Animatable {
-    private static final Interpolator LINEAR_INTERPOLATOR = new LinearInterpolator();
-    private static final Interpolator END_CURVE_INTERPOLATOR = new EndCurveInterpolator();
-    private static final Interpolator START_CURVE_INTERPOLATOR = new StartCurveInterpolator();
-    private static final Interpolator EASE_INTERPOLATOR = new AccelerateDecelerateInterpolator();
-
-    @Retention(RetentionPolicy.CLASS)
-    @IntDef({LARGE, DEFAULT})
-    public @interface ProgressDrawableSize {}
-    // Maps to ProgressBar.Large style
-    static final int LARGE = 0;
-    // Maps to ProgressBar default style
-    static final int DEFAULT = 1;
-
-    // Maps to ProgressBar default style
-    private static final int CIRCLE_DIAMETER = 40;
-    private static final float CENTER_RADIUS = 8.75f; //should add up to 10 when + stroke_width
-    private static final float STROKE_WIDTH = 2.5f;
-
-    // Maps to ProgressBar.Large style
-    private static final int CIRCLE_DIAMETER_LARGE = 56;
-    private static final float CENTER_RADIUS_LARGE = 12.5f;
-    private static final float STROKE_WIDTH_LARGE = 3f;
-
-    private final int[] COLORS = new int[] {
-        Color.BLACK
-    };
-
-    /** The duration of a single progress spin in milliseconds. */
-    private static final int ANIMATION_DURATION = 1000 * 80 / 60;
-
-    /** The number of points in the progress "star". */
-    private static final float NUM_POINTS = 5f;
-    /** The list of animators operating on this drawable. */
-    private final ArrayList<Animation> mAnimators = new ArrayList<Animation>();
-
-    /** The indicator ring, used to manage animation state. */
-    private final Ring mRing;
-
-    /** Canvas rotation in degrees. */
-    private float mRotation;
-
-    /** Layout info for the arrowhead in dp */
-    private static final int ARROW_WIDTH = 10;
-    private static final int ARROW_HEIGHT = 5;
-    private static final float ARROW_OFFSET_ANGLE = 5;
-
-    /** Layout info for the arrowhead for the large spinner in dp */
-    private static final int ARROW_WIDTH_LARGE = 12;
-    private static final int ARROW_HEIGHT_LARGE = 6;
-    private static final float MAX_PROGRESS_ARC = .8f;
-
-    private Resources mResources;
-    private View mParent;
-    private Animation mAnimation;
-    private float mRotationCount;
-    private double mWidth;
-    private double mHeight;
-    private Animation mFinishAnimation;
-
-    public MaterialProgressDrawable(Context context, View parent) {
-        mParent = parent;
-        mResources = context.getResources();
-
-        mRing = new Ring(mCallback);
-        mRing.setColors(COLORS);
-
-        updateSizes(DEFAULT);
-        setupAnimators();
-    }
-
-    private void setSizeParameters(double progressCircleWidth, double progressCircleHeight,
-            double centerRadius, double strokeWidth, float arrowWidth, float arrowHeight) {
-        final Ring ring = mRing;
-        final DisplayMetrics metrics = mResources.getDisplayMetrics();
-        final float screenDensity = metrics.density;
-
-        mWidth = progressCircleWidth * screenDensity;
-        mHeight = progressCircleHeight * screenDensity;
-        ring.setStrokeWidth((float) strokeWidth * screenDensity);
-        ring.setCenterRadius(centerRadius * screenDensity);
-        ring.setColorIndex(0);
-        ring.setArrowDimensions(arrowWidth * screenDensity, arrowHeight * screenDensity);
-        ring.setInsets((int) mWidth, (int) mHeight);
-    }
-
-    /**
-     * Set the overall size for the progress spinner. This updates the radius
-     * and stroke width of the ring.
-     *
-     * @param size One of {@link com.orangegangsters.github.swiperefreshlayout.MaterialProgressDrawable.LARGE} or
-     *            {@link com.orangegangsters.github.swiperefreshlayout.MaterialProgressDrawable.DEFAULT}
-     */
-    public void updateSizes(@ProgressDrawableSize int size) {
-        if (size == LARGE) {
-            setSizeParameters(CIRCLE_DIAMETER_LARGE, CIRCLE_DIAMETER_LARGE, CENTER_RADIUS_LARGE,
-                    STROKE_WIDTH_LARGE, ARROW_WIDTH_LARGE, ARROW_HEIGHT_LARGE);
-        } else {
-            setSizeParameters(CIRCLE_DIAMETER, CIRCLE_DIAMETER, CENTER_RADIUS, STROKE_WIDTH,
-                    ARROW_WIDTH, ARROW_HEIGHT);
-        }
-    }
-
-    /**
-     * @param show Set to true to display the arrowhead on the progress spinner.
-     */
-    public void showArrow(boolean show) {
-        mRing.setShowArrow(show);
-    }
-
-    /**
-     * @param scale Set the scale of the arrowhead for the spinner.
-     */
-    public void setArrowScale(float scale) {
-        mRing.setArrowScale(scale);
-    }
-
-    /**
-     * Set the start and end trim for the progress spinner arc.
-     *
-     * @param startAngle start angle
-     * @param endAngle end angle
-     */
-    public void setStartEndTrim(float startAngle, float endAngle) {
-        mRing.setStartTrim(startAngle);
-        mRing.setEndTrim(endAngle);
-    }
-
-    /**
-     * Set the amount of rotation to apply to the progress spinner.
-     *
-     * @param rotation Rotation is from [0..1]
-     */
-    public void setProgressRotation(float rotation) {
-        mRing.setRotation(rotation);
-    }
-
-    /**
-     * Update the background color of the circle image view.
-     */
-    public void setBackgroundColor(int color) {
-        mRing.setBackgroundColor(color);
-     }
-
-    /**
-     * Set the colors used in the progress animation from color resources.
-     * The first color will also be the color of the bar that grows in response
-     * to a user swipe gesture.
-     *
-     * @param colors
-     */
-    public void setColorSchemeColors(int... colors) {
-        mRing.setColors(colors);
-        mRing.setColorIndex(0);
-    }
-
-    @Override
-    public int getIntrinsicHeight() {
-        return (int) mHeight;
-    }
-
-    @Override
-    public int getIntrinsicWidth() {
-        return (int) mWidth;
-    }
-
-    @Override
-    public void draw(Canvas c) {
-        final Rect bounds = getBounds();
-        final int saveCount = c.save();
-        c.rotate(mRotation, bounds.exactCenterX(), bounds.exactCenterY());
-        mRing.draw(c, bounds);
-        c.restoreToCount(saveCount);
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        mRing.setAlpha(alpha);
-    }
-
-    public int getAlpha() {
-        return mRing.getAlpha();
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter colorFilter) {
-        mRing.setColorFilter(colorFilter);
-    }
-
-    @SuppressWarnings("unused")
-    void setRotation(float rotation) {
-        mRotation = rotation;
-        invalidateSelf();
-    }
-
-    @SuppressWarnings("unused")
-    private float getRotation() {
-        return mRotation;
-    }
-
-    @Override
-    public int getOpacity() {
-        return PixelFormat.TRANSLUCENT;
-    }
-
-    @Override
-    public boolean isRunning() {
-        final ArrayList<Animation> animators = mAnimators;
-        final int N = animators.size();
-        for (int i = 0; i < N; i++) {
-            final Animation animator = animators.get(i);
-            if (animator.hasStarted() && !animator.hasEnded()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public void start() {
-        mAnimation.reset();
-        mRing.storeOriginals();
-        // Already showing some part of the ring
-        if (mRing.getEndTrim() != mRing.getStartTrim()) {
-            mParent.startAnimation(mFinishAnimation);
-        } else {
-            mRing.setColorIndex(0);
-            mRing.resetOriginals();
-            mParent.startAnimation(mAnimation);
-        }
-    }
-
-    @Override
-    public void stop() {
-        mParent.clearAnimation();
-        setRotation(0);
-        mRing.setShowArrow(false);
-        mRing.setColorIndex(0);
-        mRing.resetOriginals();
-    }
-
-    private void setupAnimators() {
-        final Ring ring = mRing;
-        final Animation finishRingAnimation = new Animation() {
-            public void applyTransformation(float interpolatedTime, Transformation t) {
-                // shrink back down and complete a full rotation before starting other circles
-                // Rotation goes between [0..1].
-                float targetRotation = (float) (Math.floor(ring.getStartingRotation()
-                        / MAX_PROGRESS_ARC) + 1f);
-                final float startTrim = ring.getStartingStartTrim()
-                        + (ring.getStartingEndTrim() - ring.getStartingStartTrim())
-                        * interpolatedTime;
-                ring.setStartTrim(startTrim);
-                final float rotation = ring.getStartingRotation()
-                        + ((targetRotation - ring.getStartingRotation()) * interpolatedTime);
-                ring.setRotation(rotation);
-                ring.setArrowScale(1 - interpolatedTime);
-            }
-        };
-        finishRingAnimation.setInterpolator(EASE_INTERPOLATOR);
-        finishRingAnimation.setDuration(ANIMATION_DURATION/2);
-        finishRingAnimation.setAnimationListener(new Animation.AnimationListener() {
-
-            @Override
-            public void onAnimationStart(Animation animation) {
-            }
-
-            @Override
-            public void onAnimationEnd(Animation animation) {
-                ring.goToNextColor();
-                ring.storeOriginals();
-                ring.setShowArrow(false);
-                mParent.startAnimation(mAnimation);
-            }
-
-            @Override
-            public void onAnimationRepeat(Animation animation) {
-            }
-        });
-        final Animation animation = new Animation() {
-            @Override
-            public void applyTransformation(float interpolatedTime, Transformation t) {
-                // The minProgressArc is calculated from 0 to create an angle that
-                // matches the stroke width.
-                final float minProgressArc = (float) Math.toRadians(ring.getStrokeWidth()
-                        / (2 * Math.PI * ring.getCenterRadius()));
-                final float startingEndTrim = ring.getStartingEndTrim();
-                final float startingTrim = ring.getStartingStartTrim();
-                final float startingRotation = ring.getStartingRotation();
-
-                // Offset the minProgressArc to where the endTrim is located.
-                final float minArc = MAX_PROGRESS_ARC - minProgressArc;
-                final float endTrim = startingEndTrim
-                        + (minArc * START_CURVE_INTERPOLATOR.getInterpolation(interpolatedTime));
-                ring.setEndTrim(endTrim);
-
-                final float startTrim = startingTrim
-                        + (MAX_PROGRESS_ARC * END_CURVE_INTERPOLATOR
-                                .getInterpolation(interpolatedTime));
-                ring.setStartTrim(startTrim);
-
-                final float rotation = startingRotation + (0.25f * interpolatedTime);
-                ring.setRotation(rotation);
-
-                float groupRotation = ((720.0f / NUM_POINTS) * interpolatedTime)
-                        + (720.0f * (mRotationCount / NUM_POINTS));
-                setRotation(groupRotation);
-            }
-        };
-        animation.setRepeatCount(Animation.INFINITE);
-        animation.setRepeatMode(Animation.RESTART);
-        animation.setInterpolator(LINEAR_INTERPOLATOR);
-        animation.setDuration(ANIMATION_DURATION);
-        animation.setAnimationListener(new Animation.AnimationListener() {
-
-            @Override
-            public void onAnimationStart(Animation animation) {
-                mRotationCount = 0;
-            }
-
-            @Override
-            public void onAnimationEnd(Animation animation) {
-                // do nothing
-            }
-
-            @Override
-            public void onAnimationRepeat(Animation animation) {
-                ring.storeOriginals();
-                ring.goToNextColor();
-                ring.setStartTrim(ring.getEndTrim());
-                mRotationCount = (mRotationCount + 1) % (NUM_POINTS);
-            }
-        });
-        mFinishAnimation = finishRingAnimation;
-        mAnimation = animation;
-    }
-
-    private final Callback mCallback = new Callback() {
-        @Override
-        public void invalidateDrawable(Drawable d) {
-            invalidateSelf();
-        }
-
-        @Override
-        public void scheduleDrawable(Drawable d, Runnable what, long when) {
-            scheduleSelf(what, when);
-        }
-
-        @Override
-        public void unscheduleDrawable(Drawable d, Runnable what) {
-            unscheduleSelf(what);
-        }
-    };
-
-    private static class Ring {
-        private final RectF mTempBounds = new RectF();
-        private final Paint mPaint = new Paint();
-        private final Paint mArrowPaint = new Paint();
-
-        private final Callback mCallback;
-
-        private float mStartTrim = 0.0f;
-        private float mEndTrim = 0.0f;
-        private float mRotation = 0.0f;
-        private float mStrokeWidth = 5.0f;
-        private float mStrokeInset = 2.5f;
-
-        private int[] mColors;
-        // mColorIndex represents the offset into the available mColors that the
-        // progress circle should currently display. As the progress circle is
-        // animating, the mColorIndex moves by one to the next available color.
-        private int mColorIndex;
-        private float mStartingStartTrim;
-        private float mStartingEndTrim;
-        private float mStartingRotation;
-        private boolean mShowArrow;
-        private Path mArrow;
-        private float mArrowScale;
-        private double mRingCenterRadius;
-        private int mArrowWidth;
-        private int mArrowHeight;
-        private int mAlpha;
-        private final Paint mCirclePaint = new Paint();
-        private int mBackgroundColor;
-
-        public Ring(Callback callback) {
-            mCallback = callback;
-
-            mPaint.setStrokeCap(Paint.Cap.SQUARE);
-            mPaint.setAntiAlias(true);
-            mPaint.setStyle(Style.STROKE);
-
-            mArrowPaint.setStyle(Style.FILL);
-            mArrowPaint.setAntiAlias(true);
-        }
-
-        public void setBackgroundColor(int color) {
-            mBackgroundColor = color;
-        }
-
-        /**
-         * Set the dimensions of the arrowhead.
-         *
-         * @param width Width of the hypotenuse of the arrow head
-         * @param height Height of the arrow point
-         */
-        public void setArrowDimensions(float width, float height) {
-            mArrowWidth = (int) width;
-            mArrowHeight = (int) height;
-        }
-
-        /**
-         * Draw the progress spinner
-         */
-        public void draw(Canvas c, Rect bounds) {
-            final RectF arcBounds = mTempBounds;
-            arcBounds.set(bounds);
-            arcBounds.inset(mStrokeInset, mStrokeInset);
-
-            final float startAngle = (mStartTrim + mRotation) * 360;
-            final float endAngle = (mEndTrim + mRotation) * 360;
-            float sweepAngle = endAngle - startAngle;
-
-            mPaint.setColor(mColors[mColorIndex]);
-            c.drawArc(arcBounds, startAngle, sweepAngle, false, mPaint);
-
-            drawTriangle(c, startAngle, sweepAngle, bounds);
-
-            if (mAlpha < 255) {
-                mCirclePaint.setColor(mBackgroundColor);
-                mCirclePaint.setAlpha(255 - mAlpha);
-                c.drawCircle(bounds.exactCenterX(), bounds.exactCenterY(), bounds.width() / 2,
-                        mCirclePaint);
-            }
-        }
-
-        private void drawTriangle(Canvas c, float startAngle, float sweepAngle, Rect bounds) {
-            if (mShowArrow) {
-                if (mArrow == null) {
-                    mArrow = new Path();
-                    mArrow.setFillType(Path.FillType.EVEN_ODD);
-                } else {
-                    mArrow.reset();
-                }
-
-                // Adjust the position of the triangle so that it is inset as
-                // much as the arc, but also centered on the arc.
-                float inset = (int) mStrokeInset / 2 * mArrowScale;
-                float x = (float) (mRingCenterRadius * Math.cos(0) + bounds.exactCenterX());
-                float y = (float) (mRingCenterRadius * Math.sin(0) + bounds.exactCenterY());
-
-                // Update the path each time. This works around an issue in SKIA
-                // where concatenating a rotation matrix to a scale matrix
-                // ignored a starting negative rotation. This appears to have
-                // been fixed as of API 21.
-                mArrow.moveTo(0, 0);
-                mArrow.lineTo(mArrowWidth * mArrowScale, 0);
-                mArrow.lineTo((mArrowWidth * mArrowScale / 2), (mArrowHeight
-                        * mArrowScale));
-                mArrow.offset(x - inset, y);
-                mArrow.close();
-                // draw a triangle
-                mArrowPaint.setColor(mColors[mColorIndex]);
-                c.rotate(startAngle + sweepAngle - ARROW_OFFSET_ANGLE, bounds.exactCenterX(),
-                        bounds.exactCenterY());
-                c.drawPath(mArrow, mArrowPaint);
-            }
-        }
-
-        /**
-         * Set the colors the progress spinner alternates between.
-         *
-         * @param colors Array of integers describing the colors. Must be non-<code>null</code>.
-         */
-        public void setColors(@NonNull int[] colors) {
-            mColors = colors;
-            // if colors are reset, make sure to reset the color index as well
-            setColorIndex(0);
-        }
-
-        /**
-         * @param index Index into the color array of the color to display in
-         *            the progress spinner.
-         */
-        public void setColorIndex(int index) {
-            mColorIndex = index;
-        }
-
-        /**
-         * Proceed to the next available ring color. This will automatically
-         * wrap back to the beginning of colors.
-         */
-        public void goToNextColor() {
-            mColorIndex = (mColorIndex + 1) % (mColors.length);
-        }
-
-        public void setColorFilter(ColorFilter filter) {
-            mPaint.setColorFilter(filter);
-            invalidateSelf();
-        }
-
-        /**
-         * @param alpha Set the alpha of the progress spinner and associated arrowhead.
-         */
-        public void setAlpha(int alpha) {
-            mAlpha = alpha;
-        }
-
-        /**
-         * @return Current alpha of the progress spinner and arrowhead.
-         */
-        public int getAlpha() {
-            return mAlpha;
-        }
-
-        /**
-         * @param strokeWidth Set the stroke width of the progress spinner in pixels.
-         */
-        public void setStrokeWidth(float strokeWidth) {
-            mStrokeWidth = strokeWidth;
-            mPaint.setStrokeWidth(strokeWidth);
-            invalidateSelf();
-        }
-
-        @SuppressWarnings("unused")
-        public float getStrokeWidth() {
-            return mStrokeWidth;
-        }
-
-        @SuppressWarnings("unused")
-        public void setStartTrim(float startTrim) {
-            mStartTrim = startTrim;
-            invalidateSelf();
-        }
-
-        @SuppressWarnings("unused")
-        public float getStartTrim() {
-            return mStartTrim;
-        }
-
-        public float getStartingStartTrim() {
-            return mStartingStartTrim;
-        }
-
-        public float getStartingEndTrim() {
-            return mStartingEndTrim;
-        }
-
-        @SuppressWarnings("unused")
-        public void setEndTrim(float endTrim) {
-            mEndTrim = endTrim;
-            invalidateSelf();
-        }
-
-        @SuppressWarnings("unused")
-        public float getEndTrim() {
-            return mEndTrim;
-        }
-
-        @SuppressWarnings("unused")
-        public void setRotation(float rotation) {
-            mRotation = rotation;
-            invalidateSelf();
-        }
-
-        @SuppressWarnings("unused")
-        public float getRotation() {
-            return mRotation;
-        }
-
-        public void setInsets(int width, int height) {
-            final float minEdge = (float) Math.min(width, height);
-            float insets;
-            if (mRingCenterRadius <= 0 || minEdge < 0) {
-                insets = (float) Math.ceil(mStrokeWidth / 2.0f);
-            } else {
-                insets = (float) (minEdge / 2.0f - mRingCenterRadius);
-            }
-            mStrokeInset = insets;
-        }
-
-        @SuppressWarnings("unused")
-        public float getInsets() {
-            return mStrokeInset;
-        }
-
-        /**
-         * @param centerRadius Inner radius in px of the circle the progress
-         *            spinner arc traces.
-         */
-        public void setCenterRadius(double centerRadius) {
-            mRingCenterRadius = centerRadius;
-        }
-
-        public double getCenterRadius() {
-            return mRingCenterRadius;
-        }
-
-        /**
-         * @param show Set to true to show the arrow head on the progress spinner.
-         */
-        public void setShowArrow(boolean show) {
-            if (mShowArrow != show) {
-                mShowArrow = show;
-                invalidateSelf();
-            }
-        }
-
-        /**
-         * @param scale Set the scale of the arrowhead for the spinner.
-         */
-        public void setArrowScale(float scale) {
-            if (scale != mArrowScale) {
-                mArrowScale = scale;
-                invalidateSelf();
-            }
-        }
-
-        /**
-         * @return The amount the progress spinner is currently rotated, between [0..1].
-         */
-        public float getStartingRotation() {
-            return mStartingRotation;
-        }
-
-        /**
-         * If the start / end trim are offset to begin with, store them so that
-         * animation starts from that offset.
-         */
-        public void storeOriginals() {
-            mStartingStartTrim = mStartTrim;
-            mStartingEndTrim = mEndTrim;
-            mStartingRotation = mRotation;
-        }
-
-        /**
-         * Reset the progress spinner to default rotation, start and end angles.
-         */
-        public void resetOriginals() {
-            mStartingStartTrim = 0;
-            mStartingEndTrim = 0;
-            mStartingRotation = 0;
-            setStartTrim(0);
-            setEndTrim(0);
-            setRotation(0);
-        }
-
-        private void invalidateSelf() {
-            mCallback.invalidateDrawable(null);
-        }
-    }
-
-    /**
-     * Squishes the interpolation curve into the second half of the animation.
-     */
-    private static class EndCurveInterpolator extends AccelerateDecelerateInterpolator {
-        @Override
-        public float getInterpolation(float input) {
-            return super.getInterpolation(Math.max(0, (input - 0.5f) * 2.0f));
-        }
-    }
-
-    /**
-     * Squishes the interpolation curve into the first half of the animation.
-     */
-    private static class StartCurveInterpolator extends AccelerateDecelerateInterpolator {
-        @Override
-        public float getInterpolation(float input) {
-            return super.getInterpolation(Math.min(1, input * 2.0f));
-        }
-    }
-}
diff --git a/libs/SwipyRefreshLayout/src/main/java/com/orangegangsters/github/swipyrefreshlayout/library/SwipyRefreshLayout.java b/libs/SwipyRefreshLayout/src/main/java/com/orangegangsters/github/swipyrefreshlayout/library/SwipyRefreshLayout.java
deleted file mode 100644
index f193a0e1..00000000
--- a/libs/SwipyRefreshLayout/src/main/java/com/orangegangsters/github/swipyrefreshlayout/library/SwipyRefreshLayout.java
+++ /dev/null
@@ -1,1152 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.orangegangsters.github.swipyrefreshlayout.library;
-
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.ViewCompat;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.Animation.AnimationListener;
-import android.view.animation.DecelerateInterpolator;
-import android.view.animation.Transformation;
-import android.widget.AbsListView;
-
-/**
- * The SwipeRefreshLayout should be used whenever the user can refresh the
- * contents of a view via a vertical swipe gesture. The activity that
- * instantiates this view should add an OnRefreshListener to be notified
- * whenever the swipe to refresh gesture is completed. The SwipeRefreshLayout
- * will notify the listener each and every time the gesture is completed again;
- * the listener is responsible for correctly determining when to actually
- * initiate a refresh of its content. If the listener determines there should
- * not be a refresh, it must call setRefreshing(false) to cancel any visual
- * indication of a refresh. If an activity wishes to show just the progress
- * animation, it should call setRefreshing(true). To disable the gesture and
- * progress animation, call setEnabled(false) on the view.
- * <p>
- * This layout should be made the parent of the view that will be refreshed as a
- * result of the gesture and can only support one direct child. This view will
- * also be made the target of the gesture and will be forced to match both the
- * width and the height supplied in this layout. The SwipeRefreshLayout does not
- * provide accessibility events; instead, a menu item must be provided to allow
- * refresh of the content wherever this gesture is used.
- * </p>
- */
-public class SwipyRefreshLayout extends ViewGroup {
-
-    public static final String TAG = "SwipyRefreshLayout";
-
-    private static final float MAX_SWIPE_DISTANCE_FACTOR = .6f;
-    private static final int REFRESH_TRIGGER_DISTANCE = 120;
-
-    // Maps to ProgressBar.Large style
-    public static final int LARGE = MaterialProgressDrawable.LARGE;
-    // Maps to ProgressBar default style
-    public static final int DEFAULT = MaterialProgressDrawable.DEFAULT;
-
-    private static final String LOG_TAG = SwipyRefreshLayout.class.getSimpleName();
-
-    private static final int MAX_ALPHA = 255;
-    private static final int STARTING_PROGRESS_ALPHA = (int) (.3f * MAX_ALPHA);
-
-    private static final int CIRCLE_DIAMETER = 40;
-    private static final int CIRCLE_DIAMETER_LARGE = 56;
-
-    private static final float DECELERATE_INTERPOLATION_FACTOR = 2f;
-    private static final int INVALID_POINTER = -1;
-    private static final float DRAG_RATE = .5f;
-
-    // Max amount of circle that can be filled by progress during swipe gesture,
-    // where 1.0 is a full circle
-    private static final float MAX_PROGRESS_ANGLE = .8f;
-
-    private static final int SCALE_DOWN_DURATION = 150;
-
-    private static final int ALPHA_ANIMATION_DURATION = 300;
-
-    private static final int ANIMATE_TO_TRIGGER_DURATION = 200;
-
-    private static final int ANIMATE_TO_START_DURATION = 200;
-
-    // Default background for the progress spinner
-    private static final int CIRCLE_BG_LIGHT = 0xFFFAFAFA;
-    // Default offset in dips from the top of the view to where the progress spinner should stop
-    private static final int DEFAULT_CIRCLE_TARGET = 64;
-
-    private View mTarget; // the target of the gesture
-    private SwipyRefreshLayoutDirection mDirection;
-    private boolean mBothDirection;
-    private OnRefreshListener mListener;
-    private boolean mRefreshing = false;
-    private int mTouchSlop;
-    private float mTotalDragDistance = -1;
-    private int mMediumAnimationDuration;
-    private int mCurrentTargetOffsetTop;
-    // Whether or not the starting offset has been determined.
-    private boolean mOriginalOffsetCalculated = false;
-
-    private float mInitialMotionY;
-    private float mInitialDownY;
-    private boolean mIsBeingDragged;
-    private int mActivePointerId = INVALID_POINTER;
-    // Whether this item is scaled up rather than clipped
-    private boolean mScale;
-
-    // Target is returning to its start offset because it was cancelled or a
-    // refresh was triggered.
-    private boolean mReturningToStart;
-    private final DecelerateInterpolator mDecelerateInterpolator;
-    private static final int[] LAYOUT_ATTRS = new int[]{
-            android.R.attr.enabled
-    };
-
-    private CircleImageView mCircleView;
-    private int mCircleViewIndex = -1;
-
-    protected int mFrom;
-
-    private float mStartingScale;
-
-    protected int mOriginalOffsetTop;
-
-    private MaterialProgressDrawable mProgress;
-
-    private Animation mScaleAnimation;
-
-    private Animation mScaleDownAnimation;
-
-    private Animation mAlphaStartAnimation;
-
-    private Animation mAlphaMaxAnimation;
-
-    private Animation mScaleDownToStartAnimation;
-
-    private float mSpinnerFinalOffset;
-
-    private boolean mNotify;
-
-    private int mCircleWidth;
-
-    private int mCircleHeight;
-
-    // Whether the client has set a custom starting position;
-    private boolean mUsingCustomStart;
-
-    private AnimationListener mRefreshListener = new AnimationListener() {
-        @Override
-        public void onAnimationStart(Animation animation) {
-        }
-
-        @Override
-        public void onAnimationRepeat(Animation animation) {
-        }
-
-        @Override
-        public void onAnimationEnd(Animation animation) {
-            if (mRefreshing) {
-                // Make sure the progress view is fully visible
-                mProgress.setAlpha(MAX_ALPHA);
-                mProgress.start();
-                if (mNotify) {
-                    if (mListener != null) {
-                        mListener.onRefresh(mDirection);
-                    }
-                }
-            } else {
-                mProgress.stop();
-                mCircleView.setVisibility(View.GONE);
-                setColorViewAlpha(MAX_ALPHA);
-                // Return the circle to its start position
-                if (mScale) {
-                    setAnimationProgress(0 /* animation complete and view is hidden */);
-                } else {
-                    setTargetOffsetTopAndBottom(mOriginalOffsetTop - mCurrentTargetOffsetTop,
-                            true /* requires update */);
-                }
-            }
-            mCurrentTargetOffsetTop = mCircleView.getTop();
-        }
-    };
-
-    private void setColorViewAlpha(int targetAlpha) {
-        mCircleView.getBackground().setAlpha(targetAlpha);
-        mProgress.setAlpha(targetAlpha);
-    }
-
-    /**
-     * The refresh indicator starting and resting position is always positioned
-     * near the top of the refreshing content. This position is a consistent
-     * location, but can be adjusted in either direction based on whether or not
-     * there is a toolbar or actionbar present.
-     *
-     * @param scale Set to true if there is no view at a higher z-order than
-     *            where the progress spinner is set to appear.
-     * @param start The offset in pixels from the top of this view at which the
-     *            progress spinner should appear.
-     * @param end The offset in pixels from the top of this view at which the
-     *            progress spinner should come to rest after a successful swipe
-     *            gesture.
-     */
-    /*
-    public void setProgressViewOffset(boolean scale, int start, int end) {
-        mScale = scale;
-        mCircleView.setVisibility(View.GONE);
-        mOriginalOffsetTop = mCurrentTargetOffsetTop = start;
-        mSpinnerFinalOffset = end;
-        mUsingCustomStart = true;
-        mCircleView.invalidate();
-    }*/
-
-    /**
-     * The refresh indicator resting position is always positioned near the top
-     * of the refreshing content. This position is a consistent location, but
-     * can be adjusted in either direction based on whether or not there is a
-     * toolbar or actionbar present.
-     *
-     * @param scale Set to true if there is no view at a higher z-order than
-     *            where the progress spinner is set to appear.
-     * @param end The offset in pixels from the top of this view at which the
-     *            progress spinner should come to rest after a successful swipe
-     *            gesture.
-     */
-    /*
-    public void setProgressViewEndTarget(boolean scale, int end) {
-        mSpinnerFinalOffset = end;
-        mScale = scale;
-        mCircleView.invalidate();
-    }*/
-
-    /**
-     * One of DEFAULT, or LARGE.
-     */
-    public void setSize(int size) {
-        if (size != MaterialProgressDrawable.LARGE && size != MaterialProgressDrawable.DEFAULT) {
-            return;
-        }
-        final DisplayMetrics metrics = getResources().getDisplayMetrics();
-        if (size == MaterialProgressDrawable.LARGE) {
-            mCircleHeight = mCircleWidth = (int) (CIRCLE_DIAMETER_LARGE * metrics.density);
-        } else {
-            mCircleHeight = mCircleWidth = (int) (CIRCLE_DIAMETER * metrics.density);
-        }
-        // force the bounds of the progress circle inside the circle view to
-        // update by setting it to null before updating its size and then
-        // re-setting it
-        mCircleView.setImageDrawable(null);
-        mProgress.updateSizes(size);
-        mCircleView.setImageDrawable(mProgress);
-    }
-
-    /**
-     * Simple constructor to use when creating a SwipeRefreshLayout from code.
-     *
-     * @param context
-     */
-    public SwipyRefreshLayout(Context context) {
-        this(context, null);
-    }
-
-    /**
-     * Constructor that is called when inflating SwipeRefreshLayout from XML.
-     *
-     * @param context
-     * @param attrs
-     */
-    public SwipyRefreshLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
-
-        mMediumAnimationDuration = getResources().getInteger(
-                android.R.integer.config_mediumAnimTime);
-
-        setWillNotDraw(false);
-        mDecelerateInterpolator = new DecelerateInterpolator(DECELERATE_INTERPOLATION_FACTOR);
-
-        final TypedArray a = context.obtainStyledAttributes(attrs, LAYOUT_ATTRS);
-        setEnabled(a.getBoolean(0, true));
-        a.recycle();
-
-        final TypedArray a2 = context.obtainStyledAttributes(attrs, R.styleable.SwipyRefreshLayout);
-        SwipyRefreshLayoutDirection direction
-                = SwipyRefreshLayoutDirection.getFromInt(a2.getInt(R.styleable.SwipyRefreshLayout_direction, 0));
-        if (direction != SwipyRefreshLayoutDirection.BOTH) {
-            mDirection = direction;
-            mBothDirection = false;
-        } else {
-            mDirection = SwipyRefreshLayoutDirection.TOP;
-            mBothDirection = true;
-        }
-        a2.recycle();
-
-        final DisplayMetrics metrics = getResources().getDisplayMetrics();
-        mCircleWidth = (int) (CIRCLE_DIAMETER * metrics.density);
-        mCircleHeight = (int) (CIRCLE_DIAMETER * metrics.density);
-
-        createProgressView();
-        ViewCompat.setChildrenDrawingOrderEnabled(this, true);
-        // the absolute offset has to take into account that the circle starts at an offset
-        mSpinnerFinalOffset = DEFAULT_CIRCLE_TARGET * metrics.density;
-    }
-
-    protected int getChildDrawingOrder(int childCount, int i) {
-        if (mCircleViewIndex < 0) {
-            return i;
-        } else if (i == childCount - 1) {
-            // Draw the selected child last
-            return mCircleViewIndex;
-        } else if (i >= mCircleViewIndex) {
-            // Move the children after the selected child earlier one
-            return i + 1;
-        } else {
-            // Keep the children before the selected child the same
-            return i;
-        }
-    }
-
-    private void createProgressView() {
-        mCircleView = new CircleImageView(getContext(), CIRCLE_BG_LIGHT, CIRCLE_DIAMETER / 2);
-        mProgress = new MaterialProgressDrawable(getContext(), this);
-        mProgress.setBackgroundColor(CIRCLE_BG_LIGHT);
-        mCircleView.setImageDrawable(mProgress);
-        mCircleView.setVisibility(View.GONE);
-        addView(mCircleView);
-    }
-
-    /**
-     * Set the listener to be notified when a refresh is triggered via the swipe
-     * gesture.
-     */
-    public void setOnRefreshListener(OnRefreshListener listener) {
-        mListener = listener;
-    }
-
-    /**
-     * Pre API 11, alpha is used to make the progress circle appear instead of scale.
-     */
-    private boolean isAlphaUsedForScale() {
-        return android.os.Build.VERSION.SDK_INT < 11;
-    }
-
-    /**
-     * Notify the widget that refresh state has changed. Do not call this when
-     * refresh is triggered by a swipe gesture.
-     *
-     * @param refreshing Whether or not the view should show refresh progress.
-     */
-    public void setRefreshing(boolean refreshing) {
-        if (refreshing && mRefreshing != refreshing) {
-            // scale and show
-            mRefreshing = refreshing;
-            int endTarget = 0;
-            if (!mUsingCustomStart) {
-                switch (mDirection) {
-                    case BOTTOM:
-                        endTarget = getMeasuredHeight() - (int) (mSpinnerFinalOffset);
-                        break;
-                    case TOP:
-                    default:
-                        endTarget = (int) (mSpinnerFinalOffset - Math.abs(mOriginalOffsetTop));
-                        break;
-                }
-            } else {
-                endTarget = (int) mSpinnerFinalOffset;
-            }
-            setTargetOffsetTopAndBottom(endTarget - mCurrentTargetOffsetTop,
-                    true /* requires update */);
-            mNotify = false;
-            startScaleUpAnimation(mRefreshListener);
-        } else {
-            setRefreshing(refreshing, false /* notify */);
-        }
-    }
-
-    private void startScaleUpAnimation(AnimationListener listener) {
-        mCircleView.setVisibility(View.VISIBLE);
-        if (android.os.Build.VERSION.SDK_INT >= 11) {
-            // Pre API 11, alpha is used in place of scale up to show the
-            // progress circle appearing.
-            // Don't adjust the alpha during appearance otherwise.
-            mProgress.setAlpha(MAX_ALPHA);
-        }
-        mScaleAnimation = new Animation() {
-            @Override
-            public void applyTransformation(float interpolatedTime, Transformation t) {
-                setAnimationProgress(interpolatedTime);
-            }
-        };
-        mScaleAnimation.setDuration(mMediumAnimationDuration);
-        if (listener != null) {
-            mCircleView.setAnimationListener(listener);
-        }
-        mCircleView.clearAnimation();
-        mCircleView.startAnimation(mScaleAnimation);
-    }
-
-    /**
-     * Pre API 11, this does an alpha animation.
-     *
-     * @param progress
-     */
-    private void setAnimationProgress(float progress) {
-        if (isAlphaUsedForScale()) {
-            setColorViewAlpha((int) (progress * MAX_ALPHA));
-        } else {
-            ViewCompat.setScaleX(mCircleView, progress);
-            ViewCompat.setScaleY(mCircleView, progress);
-        }
-    }
-
-    private void setRefreshing(boolean refreshing, final boolean notify) {
-        if (mRefreshing != refreshing) {
-            mNotify = notify;
-            ensureTarget();
-            mRefreshing = refreshing;
-            if (mRefreshing) {
-                animateOffsetToCorrectPosition(mCurrentTargetOffsetTop, mRefreshListener);
-            } else {
-                startScaleDownAnimation(mRefreshListener);
-            }
-        }
-    }
-
-    private void startScaleDownAnimation(AnimationListener listener) {
-        mScaleDownAnimation = new Animation() {
-            @Override
-            public void applyTransformation(float interpolatedTime, Transformation t) {
-                setAnimationProgress(1 - interpolatedTime);
-            }
-        };
-        mScaleDownAnimation.setDuration(SCALE_DOWN_DURATION);
-        mCircleView.setAnimationListener(listener);
-        mCircleView.clearAnimation();
-        mCircleView.startAnimation(mScaleDownAnimation);
-    }
-
-    private void startProgressAlphaStartAnimation() {
-        mAlphaStartAnimation = startAlphaAnimation(mProgress.getAlpha(), STARTING_PROGRESS_ALPHA);
-    }
-
-    private void startProgressAlphaMaxAnimation() {
-        mAlphaMaxAnimation = startAlphaAnimation(mProgress.getAlpha(), MAX_ALPHA);
-    }
-
-    private Animation startAlphaAnimation(final int startingAlpha, final int endingAlpha) {
-        // Pre API 11, alpha is used in place of scale. Don't also use it to
-        // show the trigger point.
-        if (mScale && isAlphaUsedForScale()) {
-            return null;
-        }
-        Animation alpha = new Animation() {
-            @Override
-            public void applyTransformation(float interpolatedTime, Transformation t) {
-                mProgress
-                        .setAlpha((int) (startingAlpha + ((endingAlpha - startingAlpha)
-                                * interpolatedTime)));
-            }
-        };
-        alpha.setDuration(ALPHA_ANIMATION_DURATION);
-        // Clear out the previous animation listeners.
-        mCircleView.setAnimationListener(null);
-        mCircleView.clearAnimation();
-        mCircleView.startAnimation(alpha);
-        return alpha;
-    }
-
-    /**
-     * Set the background color of the progress spinner disc.
-     *
-     * @param colorRes Resource id of the color.
-     */
-    public void setProgressBackgroundColor(int colorRes) {
-        mCircleView.setBackgroundColor(colorRes);
-        mProgress.setBackgroundColor(getResources().getColor(colorRes));
-    }
-
-    /**
-     * @deprecated Use {@link #setColorSchemeResources(int...)}
-     */
-    @Deprecated
-    public void setColorScheme(int... colors) {
-        setColorSchemeResources(colors);
-    }
-
-    /**
-     * Set the color resources used in the progress animation from color resources.
-     * The first color will also be the color of the bar that grows in response
-     * to a user swipe gesture.
-     *
-     * @param colorResIds
-     */
-    public void setColorSchemeResources(int... colorResIds) {
-        final Resources res = getResources();
-        int[] colorRes = new int[colorResIds.length];
-        for (int i = 0; i < colorResIds.length; i++) {
-            colorRes[i] = res.getColor(colorResIds[i]);
-        }
-        setColorSchemeColors(colorRes);
-    }
-
-    /**
-     * Set the colors used in the progress animation. The first
-     * color will also be the color of the bar that grows in response to a user
-     * swipe gesture.
-     *
-     * @param colors
-     */
-    public void setColorSchemeColors(int... colors) {
-        ensureTarget();
-        mProgress.setColorSchemeColors(colors);
-    }
-
-    /**
-     * @return Whether the SwipeRefreshWidget is actively showing refresh
-     * progress.
-     */
-    public boolean isRefreshing() {
-        return mRefreshing;
-    }
-
-    private void ensureTarget() {
-        // Don't bother getting the parent height if the parent hasn't been laid
-        // out yet.
-        if (mTarget == null) {
-            for (int i = 0; i < getChildCount(); i++) {
-                View child = getChildAt(i);
-                if (!child.equals(mCircleView)) {
-                    mTarget = child;
-                    break;
-                }
-            }
-        }
-        if (mTotalDragDistance == -1) {
-            if (getParent() != null && ((View) getParent()).getHeight() > 0) {
-                final DisplayMetrics metrics = getResources().getDisplayMetrics();
-                mTotalDragDistance = (int) Math.min(
-                        ((View) getParent()).getHeight() * MAX_SWIPE_DISTANCE_FACTOR,
-                        REFRESH_TRIGGER_DISTANCE * metrics.density);
-            }
-        }
-    }
-
-    /**
-     * Set the distance to trigger a sync in dips
-     *
-     * @param distance
-     */
-    public void setDistanceToTriggerSync(int distance) {
-        mTotalDragDistance = distance;
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        final int width = getMeasuredWidth();
-        final int height = getMeasuredHeight();
-        if (getChildCount() == 0) {
-            return;
-        }
-        if (mTarget == null) {
-            ensureTarget();
-        }
-        if (mTarget == null) {
-            return;
-        }
-        final View child = mTarget;
-        final int childLeft = getPaddingLeft();
-        final int childTop = getPaddingTop();
-        final int childWidth = width - getPaddingLeft() - getPaddingRight();
-        final int childHeight = height - getPaddingTop() - getPaddingBottom();
-        child.layout(childLeft, childTop, childLeft + childWidth, childTop + childHeight);
-        int circleWidth = mCircleView.getMeasuredWidth();
-        int circleHeight = mCircleView.getMeasuredHeight();
-        mCircleView.layout((width / 2 - circleWidth / 2), mCurrentTargetOffsetTop,
-                (width / 2 + circleWidth / 2), mCurrentTargetOffsetTop + circleHeight);
-    }
-
-    @Override
-    public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        if (mTarget == null) {
-            ensureTarget();
-        }
-        if (mTarget == null) {
-            return;
-        }
-        mTarget.measure(MeasureSpec.makeMeasureSpec(
-                getMeasuredWidth() - getPaddingLeft() - getPaddingRight(),
-                MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(
-                getMeasuredHeight() - getPaddingTop() - getPaddingBottom(), MeasureSpec.EXACTLY));
-        mCircleView.measure(MeasureSpec.makeMeasureSpec(mCircleWidth, MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(mCircleHeight, MeasureSpec.EXACTLY));
-        if (!mUsingCustomStart && !mOriginalOffsetCalculated) {
-            mOriginalOffsetCalculated = true;
-
-            switch (mDirection) {
-                case BOTTOM:
-                    mCurrentTargetOffsetTop = mOriginalOffsetTop = getMeasuredHeight();
-                    break;
-                case TOP:
-                default:
-                    mCurrentTargetOffsetTop = mOriginalOffsetTop = -mCircleView.getMeasuredHeight();
-                    break;
-            }
-        }
-        mCircleViewIndex = -1;
-        // Get the index of the circleview.
-        for (int index = 0; index < getChildCount(); index++) {
-            if (getChildAt(index) == mCircleView) {
-                mCircleViewIndex = index;
-                break;
-            }
-        }
-    }
-
-    /**
-     * @return Whether it is possible for the child view of this layout to
-     * scroll up. Override this if the child view is a custom view.
-     */
-    public boolean canChildScrollUp() {
-        if (android.os.Build.VERSION.SDK_INT < 14) {
-            if (mTarget instanceof AbsListView) {
-                final AbsListView absListView = (AbsListView) mTarget;
-                return absListView.getChildCount() > 0
-                        && (absListView.getFirstVisiblePosition() > 0 || absListView.getChildAt(0)
-                        .getTop() < absListView.getPaddingTop());
-            } else {
-                return mTarget.getScrollY() > 0;
-            }
-        } else {
-            return ViewCompat.canScrollVertically(mTarget, -1);
-        }
-    }
-//    public boolean canChildScrollUp() {
-//        if (android.os.Build.VERSION.SDK_INT < 14) {
-//            if (mTarget instanceof AbsListView) {
-//                final AbsListView absListView = (AbsListView) mTarget;
-//                if (absListView.getLastVisiblePosition() + 1 == absListView.getCount()) {
-//                    int lastIndex = absListView.getLastVisiblePosition() - absListView.getFirstVisiblePosition();
-//
-//                    boolean res = absListView.getChildAt(lastIndex).getBottom() == absListView.getPaddingBottom();
-//
-//                    return res;
-//                }
-//                return true;
-//            } else {
-//                return mTarget.getScrollY() > 0;
-//            }
-//        } else {
-//            return ViewCompat.canScrollVertically(mTarget, 1);
-//        }
-//    }
-
-
-    public boolean canChildScrollDown() {
-        if (android.os.Build.VERSION.SDK_INT < 14) {
-            if (mTarget instanceof AbsListView) {
-                final AbsListView absListView = (AbsListView) mTarget;
-                try {
-                    if (absListView.getCount() > 0) {
-                        if (absListView.getLastVisiblePosition() + 1 == absListView.getCount()) {
-                            int lastIndex = absListView.getLastVisiblePosition() - absListView.getFirstVisiblePosition();
-                            return absListView.getChildAt(lastIndex).getBottom() == absListView.getPaddingBottom();
-                        }
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return true;
-            } else {
-                return true;
-            }
-        } else {
-            return ViewCompat.canScrollVertically(mTarget, 1);
-        }
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
-        ensureTarget();
-
-        final int action = MotionEventCompat.getActionMasked(ev);
-
-        if (mReturningToStart && action == MotionEvent.ACTION_DOWN) {
-            mReturningToStart = false;
-        }
-
-        switch (mDirection) {
-            case BOTTOM:
-                if (!isEnabled() || mReturningToStart || (!mBothDirection && canChildScrollDown()) || mRefreshing) {
-                    // Fail fast if we're not in a state where a swipe is possible
-                    return false;
-                }
-                break;
-            case TOP:
-            default:
-                if (!isEnabled() || mReturningToStart || (!mBothDirection && canChildScrollUp()) || mRefreshing) {
-                    // Fail fast if we're not in a state where a swipe is possible
-                    return false;
-                }
-                break;
-        }
-
-        switch (action) {
-            case MotionEvent.ACTION_DOWN:
-                setTargetOffsetTopAndBottom(mOriginalOffsetTop - mCircleView.getTop(), true);
-                mActivePointerId = MotionEventCompat.getPointerId(ev, 0);
-                mIsBeingDragged = false;
-                final float initialDownY = getMotionEventY(ev, mActivePointerId);
-                if (initialDownY == -1) {
-                    return false;
-                }
-                mInitialDownY = initialDownY;
-
-            case MotionEvent.ACTION_MOVE:
-                if (mActivePointerId == INVALID_POINTER) {
-                    return false;
-                }
-
-                final float y = getMotionEventY(ev, mActivePointerId);
-                if (y == -1) {
-                    return false;
-                }
-                if (mBothDirection) {
-                    if (y > mInitialDownY) {
-                        setRawDirection(SwipyRefreshLayoutDirection.TOP);
-                    } else if (y < mInitialDownY) {
-                        setRawDirection(SwipyRefreshLayoutDirection.BOTTOM);
-                    }
-                    if ((mDirection == SwipyRefreshLayoutDirection.BOTTOM && canChildScrollDown())
-                            || (mDirection == SwipyRefreshLayoutDirection.TOP && canChildScrollUp())) {
-                        mInitialDownY = y;
-                        return false;
-                    }
-                }
-                float yDiff;
-                switch (mDirection) {
-                    case BOTTOM:
-                        yDiff = mInitialDownY - y;
-                        break;
-                    case TOP:
-                    default:
-                        yDiff = y - mInitialDownY;
-                        break;
-                }
-                if (yDiff > mTouchSlop && !mIsBeingDragged) {
-                    switch (mDirection) {
-                        case BOTTOM:
-                            mInitialMotionY = mInitialDownY - mTouchSlop;
-                            break;
-                        case TOP:
-                        default:
-                            mInitialMotionY = mInitialDownY + mTouchSlop;
-                            break;
-                    }
-                    mIsBeingDragged = true;
-                    mProgress.setAlpha(STARTING_PROGRESS_ALPHA);
-                }
-                break;
-
-            case MotionEventCompat.ACTION_POINTER_UP:
-                onSecondaryPointerUp(ev);
-                break;
-
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_CANCEL:
-                mIsBeingDragged = false;
-                mActivePointerId = INVALID_POINTER;
-                break;
-        }
-
-        return mIsBeingDragged;
-    }
-
-    private float getMotionEventY(MotionEvent ev, int activePointerId) {
-        final int index = MotionEventCompat.findPointerIndex(ev, activePointerId);
-        if (index < 0) {
-            return -1;
-        }
-        return MotionEventCompat.getY(ev, index);
-    }
-
-    @Override
-    public void requestDisallowInterceptTouchEvent(boolean b) {
-        // Nope.
-    }
-
-    private boolean isAnimationRunning(Animation animation) {
-        return animation != null && animation.hasStarted() && !animation.hasEnded();
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        try {
-            final int action = MotionEventCompat.getActionMasked(ev);
-
-            if (mReturningToStart && action == MotionEvent.ACTION_DOWN) {
-                mReturningToStart = false;
-            }
-
-            switch (mDirection) {
-                case BOTTOM:
-                    if (!isEnabled() || mReturningToStart || canChildScrollDown() || mRefreshing) {
-                        // Fail fast if we're not in a state where a swipe is possible
-                        return false;
-                    }
-                    break;
-                case TOP:
-                default:
-                    if (!isEnabled() || mReturningToStart || canChildScrollUp() || mRefreshing) {
-                        // Fail fast if we're not in a state where a swipe is possible
-                        return false;
-                    }
-                    break;
-            }
-
-            switch (action) {
-                case MotionEvent.ACTION_DOWN:
-                    mActivePointerId = MotionEventCompat.getPointerId(ev, 0);
-                    mIsBeingDragged = false;
-                    break;
-
-                case MotionEvent.ACTION_MOVE: {
-                    final int pointerIndex = MotionEventCompat.findPointerIndex(ev, mActivePointerId);
-                    if (pointerIndex < 0) {
-                        return false;
-                    }
-
-                    final float y = MotionEventCompat.getY(ev, pointerIndex);
-
-                    float overscrollTop;
-                    switch (mDirection) {
-                        case BOTTOM:
-                            overscrollTop = (mInitialMotionY - y) * DRAG_RATE;
-                            break;
-                        case TOP:
-                        default:
-                            overscrollTop = (y - mInitialMotionY) * DRAG_RATE;
-                            break;
-                    }
-                    if (mIsBeingDragged) {
-                        mProgress.showArrow(true);
-                        float originalDragPercent = overscrollTop / mTotalDragDistance;
-                        if (originalDragPercent < 0) {
-                            return false;
-                        }
-                        float dragPercent = Math.min(1f, Math.abs(originalDragPercent));
-                        float adjustedPercent = (float) Math.max(dragPercent - .4, 0) * 5 / 3;
-                        float extraOS = Math.abs(overscrollTop) - mTotalDragDistance;
-                        float slingshotDist = mUsingCustomStart ? mSpinnerFinalOffset
-                                - mOriginalOffsetTop : mSpinnerFinalOffset;
-                        float tensionSlingshotPercent = Math.max(0,
-                                Math.min(extraOS, slingshotDist * 2) / slingshotDist);
-                        float tensionPercent = (float) ((tensionSlingshotPercent / 4) - Math.pow(
-                                (tensionSlingshotPercent / 4), 2)) * 2f;
-                        float extraMove = (slingshotDist) * tensionPercent * 2;
-
-                        // int targetY = mOriginalOffsetTop + (int) ((slingshotDist * dragPercent) + extraMove);
-                        int targetY;
-                        if (mDirection == SwipyRefreshLayoutDirection.TOP) {
-                            targetY = mOriginalOffsetTop + (int) ((slingshotDist * dragPercent) + extraMove);
-                        } else {
-                            targetY = mOriginalOffsetTop - (int) ((slingshotDist * dragPercent) + extraMove);
-                        }
-                        // where 1.0f is a full circle
-                        if (mCircleView.getVisibility() != View.VISIBLE) {
-                            mCircleView.setVisibility(View.VISIBLE);
-                        }
-                        if (!mScale) {
-                            ViewCompat.setScaleX(mCircleView, 1f);
-                            ViewCompat.setScaleY(mCircleView, 1f);
-                        }
-                        if (overscrollTop < mTotalDragDistance) {
-                            if (mScale) {
-                                setAnimationProgress(overscrollTop / mTotalDragDistance);
-                            }
-                            if (mProgress.getAlpha() > STARTING_PROGRESS_ALPHA
-                                    && !isAnimationRunning(mAlphaStartAnimation)) {
-                                // Animate the alpha
-                                startProgressAlphaStartAnimation();
-                            }
-                            float strokeStart = (float) (adjustedPercent * .8f);
-                            mProgress.setStartEndTrim(0f, Math.min(MAX_PROGRESS_ANGLE, strokeStart));
-                            mProgress.setArrowScale(Math.min(1f, adjustedPercent));
-                        } else {
-                            if (mProgress.getAlpha() < MAX_ALPHA
-                                    && !isAnimationRunning(mAlphaMaxAnimation)) {
-                                // Animate the alpha
-                                startProgressAlphaMaxAnimation();
-                            }
-                        }
-                        float rotation = (-0.25f + .4f * adjustedPercent + tensionPercent * 2) * .5f;
-                        mProgress.setProgressRotation(rotation);
-                        setTargetOffsetTopAndBottom(targetY - mCurrentTargetOffsetTop,
-                                true /* requires update */);
-                    }
-                    break;
-                }
-                case MotionEventCompat.ACTION_POINTER_DOWN: {
-                    final int index = MotionEventCompat.getActionIndex(ev);
-                    mActivePointerId = MotionEventCompat.getPointerId(ev, index);
-                    break;
-                }
-
-                case MotionEventCompat.ACTION_POINTER_UP:
-                    onSecondaryPointerUp(ev);
-                    break;
-
-                case MotionEvent.ACTION_UP:
-                case MotionEvent.ACTION_CANCEL: {
-                    if (mActivePointerId == INVALID_POINTER) {
-                        if (action == MotionEvent.ACTION_UP) {
-                        }
-                        return false;
-                    }
-                    final int pointerIndex = MotionEventCompat.findPointerIndex(ev, mActivePointerId);
-                    final float y = MotionEventCompat.getY(ev, pointerIndex);
-
-                    float overscrollTop;
-                    switch (mDirection) {
-                        case BOTTOM:
-                            overscrollTop = (mInitialMotionY - y) * DRAG_RATE;
-                            break;
-                        case TOP:
-                        default:
-                            overscrollTop = (y - mInitialMotionY) * DRAG_RATE;
-                            break;
-                    }
-                    mIsBeingDragged = false;
-                    if (overscrollTop > mTotalDragDistance) {
-                        setRefreshing(true, true /* notify */);
-                    } else {
-                        // cancel refresh
-                        mRefreshing = false;
-                        mProgress.setStartEndTrim(0f, 0f);
-                        AnimationListener listener = null;
-                        if (!mScale) {
-                            listener = new AnimationListener() {
-
-                                @Override
-                                public void onAnimationStart(Animation animation) {
-                                }
-
-                                @Override
-                                public void onAnimationEnd(Animation animation) {
-                                    if (!mScale) {
-                                        startScaleDownAnimation(null);
-                                    }
-                                }
-
-                                @Override
-                                public void onAnimationRepeat(Animation animation) {
-                                }
-
-                            };
-                        }
-                        animateOffsetToStartPosition(mCurrentTargetOffsetTop, listener);
-                        mProgress.showArrow(false);
-                    }
-                    mActivePointerId = INVALID_POINTER;
-                    return false;
-                }
-            }
-        } catch (Exception e) {
-            Log.e(TAG, "An exception occured during SwipyRefreshLayout onTouchEvent " + e.toString());
-        }
-
-        return true;
-    }
-
-    private void animateOffsetToCorrectPosition(int from, AnimationListener listener) {
-        mFrom = from;
-        mAnimateToCorrectPosition.reset();
-        mAnimateToCorrectPosition.setDuration(ANIMATE_TO_TRIGGER_DURATION);
-        mAnimateToCorrectPosition.setInterpolator(mDecelerateInterpolator);
-        if (listener != null) {
-            mCircleView.setAnimationListener(listener);
-        }
-        mCircleView.clearAnimation();
-        mCircleView.startAnimation(mAnimateToCorrectPosition);
-    }
-
-    private void animateOffsetToStartPosition(int from, AnimationListener listener) {
-        if (mScale) {
-            // Scale the item back down
-            startScaleDownReturnToStartAnimation(from, listener);
-        } else {
-            mFrom = from;
-            mAnimateToStartPosition.reset();
-            mAnimateToStartPosition.setDuration(ANIMATE_TO_START_DURATION);
-            mAnimateToStartPosition.setInterpolator(mDecelerateInterpolator);
-            if (listener != null) {
-                mCircleView.setAnimationListener(listener);
-            }
-            mCircleView.clearAnimation();
-            mCircleView.startAnimation(mAnimateToStartPosition);
-        }
-    }
-
-    private final Animation mAnimateToCorrectPosition = new Animation() {
-        @Override
-        public void applyTransformation(float interpolatedTime, Transformation t) {
-            int targetTop = 0;
-            int endTarget = 0;
-            if (!mUsingCustomStart) {
-                switch (mDirection) {
-                    case BOTTOM:
-                        endTarget = getMeasuredHeight() - (int) (mSpinnerFinalOffset);
-                        break;
-                    case TOP:
-                    default:
-                        endTarget = (int) (mSpinnerFinalOffset - Math.abs(mOriginalOffsetTop));
-                        break;
-                }
-            } else {
-                endTarget = (int) mSpinnerFinalOffset;
-            }
-            targetTop = (mFrom + (int) ((endTarget - mFrom) * interpolatedTime));
-            int offset = targetTop - mCircleView.getTop();
-            setTargetOffsetTopAndBottom(offset, false /* requires update */);
-        }
-    };
-
-    private void moveToStart(float interpolatedTime) {
-        int targetTop = 0;
-        targetTop = (mFrom + (int) ((mOriginalOffsetTop - mFrom) * interpolatedTime));
-        int offset = targetTop - mCircleView.getTop();
-        setTargetOffsetTopAndBottom(offset, false /* requires update */);
-    }
-
-    private final Animation mAnimateToStartPosition = new Animation() {
-        @Override
-        public void applyTransformation(float interpolatedTime, Transformation t) {
-            moveToStart(interpolatedTime);
-        }
-    };
-
-    private void startScaleDownReturnToStartAnimation(int from,
-                                                      AnimationListener listener) {
-        mFrom = from;
-        if (isAlphaUsedForScale()) {
-            mStartingScale = mProgress.getAlpha();
-        } else {
-            mStartingScale = ViewCompat.getScaleX(mCircleView);
-        }
-        mScaleDownToStartAnimation = new Animation() {
-            @Override
-            public void applyTransformation(float interpolatedTime, Transformation t) {
-                float targetScale = (mStartingScale + (-mStartingScale * interpolatedTime));
-                setAnimationProgress(targetScale);
-                moveToStart(interpolatedTime);
-            }
-        };
-        mScaleDownToStartAnimation.setDuration(SCALE_DOWN_DURATION);
-        if (listener != null) {
-            mCircleView.setAnimationListener(listener);
-        }
-        mCircleView.clearAnimation();
-        mCircleView.startAnimation(mScaleDownToStartAnimation);
-    }
-
-    private void setTargetOffsetTopAndBottom(int offset, boolean requiresUpdate) {
-        mCircleView.bringToFront();
-        mCircleView.offsetTopAndBottom(offset);
-
-//        switch (mDirection) {
-//            case BOTTOM:
-//                mCurrentTargetOffsetTop = getMeasuredHeight() - mCircleView.getMeasuredHeight();
-//                break;
-//            case TOP:
-//            default:
-//                mCurrentTargetOffsetTop  = mCircleView.getTop();
-//                break;
-//        }
-        mCurrentTargetOffsetTop = mCircleView.getTop();
-        if (requiresUpdate && android.os.Build.VERSION.SDK_INT < 11) {
-            invalidate();
-        }
-    }
-
-    private void onSecondaryPointerUp(MotionEvent ev) {
-        final int pointerIndex = MotionEventCompat.getActionIndex(ev);
-        final int pointerId = MotionEventCompat.getPointerId(ev, pointerIndex);
-        if (pointerId == mActivePointerId) {
-            // This was our active pointer going up. Choose a new
-            // active pointer and adjust accordingly.
-            final int newPointerIndex = pointerIndex == 0 ? 1 : 0;
-            mActivePointerId = MotionEventCompat.getPointerId(ev, newPointerIndex);
-        }
-    }
-
-    /**
-     * Classes that wish to be notified when the swipe gesture correctly
-     * triggers a refresh should implement this interface.
-     */
-    public interface OnRefreshListener {
-        public void onRefresh(SwipyRefreshLayoutDirection direction);
-    }
-
-    public SwipyRefreshLayoutDirection getDirection() {
-        return mBothDirection ? SwipyRefreshLayoutDirection.BOTH : mDirection;
-    }
-
-    public void setDirection(SwipyRefreshLayoutDirection direction) {
-        if (direction == SwipyRefreshLayoutDirection.BOTH) {
-            mBothDirection = true;
-        } else {
-            mBothDirection = false;
-            mDirection = direction;
-        }
-
-        switch (mDirection) {
-            case BOTTOM:
-                mCurrentTargetOffsetTop = mOriginalOffsetTop = getMeasuredHeight();
-                break;
-            case TOP:
-            default:
-                mCurrentTargetOffsetTop = mOriginalOffsetTop = -mCircleView.getMeasuredHeight();
-                break;
-        }
-    }
-
-    // only TOP or Bottom
-    private void setRawDirection(SwipyRefreshLayoutDirection direction) {
-        if (mDirection == direction) {
-            return;
-        }
-
-        mDirection = direction;
-        switch (mDirection) {
-            case BOTTOM:
-                mCurrentTargetOffsetTop = mOriginalOffsetTop = getMeasuredHeight();
-                break;
-            case TOP:
-            default:
-                mCurrentTargetOffsetTop = mOriginalOffsetTop = -mCircleView.getMeasuredHeight();
-                break;
-        }
-    }
-}
diff --git a/libs/SwipyRefreshLayout/src/main/java/com/orangegangsters/github/swipyrefreshlayout/library/SwipyRefreshLayoutDirection.java b/libs/SwipyRefreshLayout/src/main/java/com/orangegangsters/github/swipyrefreshlayout/library/SwipyRefreshLayoutDirection.java
deleted file mode 100644
index af5d6c2d..00000000
--- a/libs/SwipyRefreshLayout/src/main/java/com/orangegangsters/github/swipyrefreshlayout/library/SwipyRefreshLayoutDirection.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.orangegangsters.github.swipyrefreshlayout.library;
-
-/**
- * Created by oliviergoutay on 1/23/15.
- */
-public enum SwipyRefreshLayoutDirection {
-
-    TOP(0),
-    BOTTOM(1),
-    BOTH(2);
-
-    private int mValue;
-
-    SwipyRefreshLayoutDirection(int value) {
-        this.mValue = value;
-    }
-
-    public static SwipyRefreshLayoutDirection getFromInt(int value) {
-        for (SwipyRefreshLayoutDirection direction : SwipyRefreshLayoutDirection.values()) {
-            if (direction.mValue == value) {
-                return direction;
-            }
-        }
-        return BOTH;
-    }
-
-}
diff --git a/libs/SwipyRefreshLayout/src/main/res/values/attrs.xml b/libs/SwipyRefreshLayout/src/main/res/values/attrs.xml
deleted file mode 100644
index db0c1d32..00000000
--- a/libs/SwipyRefreshLayout/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <declare-styleable name="SwipyRefreshLayout">
-        <attr name="direction">
-            <enum name="top" value="0" />
-            <enum name="bottom" value="1" />
-            <enum name="both" value="2" />
-        </attr>
-    </declare-styleable>
-
-</resources>
\ No newline at end of file
diff --git a/libs/colorpicker/proguard-rules.pro b/libs/colorpicker/proguard-rules.pro
deleted file mode 100644
index f665b348..00000000
--- a/libs/colorpicker/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Developer/android-sdk-macosx/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/libs/emojicon/build.gradle b/libs/emojicon/build.gradle
index a9776be0..8673b750 100644
--- a/libs/emojicon/build.gradle
+++ b/libs/emojicon/build.gradle
@@ -12,7 +12,6 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
 }
diff --git a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java
index bc1d670d..5523314b 100644
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java
@@ -1406,6 +1406,7 @@ public final class EmojiconHandler {
     }
 
     public static final Map<Pattern, Integer> ANDROID_EMOTICONS = new HashMap<Pattern, Integer>();
+    private static final Pattern TIME_AND_SCORING_PATTERN = Pattern.compile("[0-9]{1,3}:[0-9]{1,3}");
 
     private static final Spannable.Factory spannableFactory = Spannable.Factory
             .getInstance();
@@ -1448,9 +1449,14 @@ public final class EmojiconHandler {
         boolean hasChanges = false;
 
         Matcher webUrlMatcher = Patterns.WEB_URL.matcher(spannable);
-        Set<Pair<Integer, Integer>> webUrls = new HashSet<Pair<Integer, Integer>>();
+        Set<Pair<Integer, Integer>> falsePositives = new HashSet<Pair<Integer, Integer>>();
         while (webUrlMatcher.find()) {
-            webUrls.add(Pair.create(webUrlMatcher.start(), webUrlMatcher.end()));
+            falsePositives.add(Pair.create(webUrlMatcher.start(), webUrlMatcher.end()));
+        }
+
+        Matcher timeAndScoringMatcher = TIME_AND_SCORING_PATTERN.matcher(spannable);
+        while (timeAndScoringMatcher.find()) {
+            falsePositives.add(Pair.create(timeAndScoringMatcher.start(), timeAndScoringMatcher.end()));
         }
 
         Map<Pattern, Integer> emoticons = ANDROID_EMOTICONS;
@@ -1469,10 +1475,10 @@ public final class EmojiconHandler {
                     }
                 }
                 if (set) {
-                    // check that found emojicon is not in an web url
-                    for (Pair<Integer, Integer> webUrl : webUrls) {
-                        if ((matcher.start() >= webUrl.first && matcher.start() <= webUrl.second)
-                                || (matcher.end() >= webUrl.first && matcher.end() <= webUrl.second)) {
+                    // check that found emojicon is not in an web url or in a time or in a scoring
+                    for (Pair<Integer, Integer> falsePositive : falsePositives) {
+                        if ((matcher.start() >= falsePositive.first && matcher.start() <= falsePositive.second)
+                                || (matcher.end() >= falsePositive.first && matcher.end() <= falsePositive.second)) {
                             set = false;
                             break;
                         }
diff --git a/libs/minidns/AndroidManifest.xml b/libs/minidns/AndroidManifest.xml
deleted file mode 100644
index 6c9477d9..00000000
--- a/libs/minidns/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.measite.minidns"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="9"
-        android:targetSdkVersion="19" />
-
-    <application/>
-
-</manifest>
diff --git a/libs/minidns/lint.xml b/libs/minidns/lint.xml
deleted file mode 100644
index ee0eead5..00000000
--- a/libs/minidns/lint.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-</lint>
\ No newline at end of file
diff --git a/libs/minidns/project.properties b/libs/minidns/project.properties
deleted file mode 100644
index 4ab12569..00000000
--- a/libs/minidns/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-19
diff --git a/libs/otr4j-0.21.jar b/libs/otr4j-0.21.jar
deleted file mode 100644
index 85bc69e6..00000000
--- a/libs/otr4j-0.21.jar
+++ /dev/null
diff --git a/libs/thedevstacklogcat/build.gradle b/libs/thedevstacklogcat/build.gradle
index 27db48ea..00fe2a0b 100644
--- a/libs/thedevstacklogcat/build.gradle
+++ b/libs/thedevstacklogcat/build.gradle
@@ -13,13 +13,10 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:22.2.1'
 }
diff --git a/libs/thedevstacklogcat/proguard-rules.pro b/libs/thedevstacklogcat/proguard-rules.pro
deleted file mode 100644
index 077398be..00000000
--- a/libs/thedevstacklogcat/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\Users\tzur\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/proguard-project.txt b/proguard-project.txt
deleted file mode 100644
index f2fe1559..00000000
--- a/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/proguard-rules.txt b/proguard-rules.txt
deleted file mode 100644
index f39d07c5..00000000
--- a/proguard-rules.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /home/sam/android-sdk-linux/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
--dontwarn javax.naming.**
-
--keep class * extends java.util.ListResourceBundle {
-    protected Object[][] getContents();
-}
-
--keepnames class * implements android.os.Parcelable {
-    public static final ** CREATOR;
-}
diff --git a/settings.gradle b/settings.gradle
index f2ffef35..56c11345 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,7 @@
-include ':libs:MemorizingTrustManager', ':libs:emojicon', ':libs:colorpicker', ':libs:SwipyRefreshLayout', ':libs:thedevstacklogcat'
+include ':libs:MemorizingTrustManager'
+include ':libs:emojicon'
+include ':libs:colorpicker'
+include ':libs:thedevstacklogcat'
 include ':libs:openpgp-api-lib'
 
 rootProject.name = 'Conversations'
diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
index 4a67aa3e..9c217e35 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
@@ -8,6 +8,8 @@ import android.preference.PreferenceManager;
 import java.io.File;
 
 import de.thedevstack.conversationsplus.utils.ImageUtil;
+import eu.siacs.conversations.utils.SerialSingleThreadExecutor;
+
 import eu.siacs.conversations.R;
 
 /**
@@ -19,6 +21,9 @@ public class ConversationsPlusApplication extends Application {
      */
     private static ConversationsPlusApplication instance;
 
+    private final SerialSingleThreadExecutor mFileAddingExecutor = new SerialSingleThreadExecutor();
+    private final SerialSingleThreadExecutor mDatabaseExecutor = new SerialSingleThreadExecutor();
+
     /**
      * Initializes the application and saves its instance.
      */
@@ -37,6 +42,14 @@ public class ConversationsPlusApplication extends Application {
         return ConversationsPlusApplication.instance;
     }
 
+    public static void executeFileAdding(Runnable r) {
+        getInstance().mFileAddingExecutor.execute(r);
+    }
+
+    public static void executeDatabaseOperation(Runnable r) {
+        getInstance().mDatabaseExecutor.execute(r);
+    }
+
     /**
      * Returns the application's context.
      * @return Context the application's context
diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
index b7b7fe47..17829998 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
@@ -14,6 +14,14 @@ public class ConversationsPlusPreferences extends Settings {
     private static ConversationsPlusPreferences instance;
     private final SharedPreferences sharedPreferences;
 
+    public static String imgTransferFolder() {
+        return getString("img_transfer_folder", getString("app_name", "Conversations+"));
+    }
+
+    public static String fileTransferFolder() {
+        return getString("file_transfer_folder", getString("app_name", "Conversations+"));
+    }
+
     public static UserDecision resizePicture() {
         return getEnumFromStringPref("resize_picture", UserDecision.ASK);
     }
diff --git a/src/main/java/de/thedevstack/conversationsplus/exceptions/FileCopyException.java b/src/main/java/de/thedevstack/conversationsplus/exceptions/FileCopyException.java
index 58363c0f..858b4563 100644
--- a/src/main/java/de/thedevstack/conversationsplus/exceptions/FileCopyException.java
+++ b/src/main/java/de/thedevstack/conversationsplus/exceptions/FileCopyException.java
@@ -1,14 +1,13 @@
 package de.thedevstack.conversationsplus.exceptions;
 
-public class FileCopyException extends Exception {
+public class FileCopyException extends UiException {
 	private static final long serialVersionUID = -1010013599132881427L;
-	private int resId;
 
-	public FileCopyException(int resId) {
-		this.resId = resId;
-	}
+    public FileCopyException(int resId) {
+        super(resId);
+    }
 
-	public int getResId() {
-		return resId;
-	}
+    public FileCopyException(int resId, Throwable e) {
+        super(resId, e);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/de/thedevstack/conversationsplus/exceptions/ImageResizeException.java b/src/main/java/de/thedevstack/conversationsplus/exceptions/ImageResizeException.java
new file mode 100644
index 00000000..b5786990
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/exceptions/ImageResizeException.java
@@ -0,0 +1,16 @@
+package de.thedevstack.conversationsplus.exceptions;
+
+/**
+ * Created by tzur on 15.12.2015.
+ */
+public class ImageResizeException extends UiException {
+    private static final long serialVersionUID = -1010013599112881427L;
+
+    public ImageResizeException(int resId) {
+        super(resId);
+    }
+
+    public ImageResizeException(int resId, Throwable e) {
+        super(resId, e);
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/exceptions/UiException.java b/src/main/java/de/thedevstack/conversationsplus/exceptions/UiException.java
new file mode 100644
index 00000000..b05c5025
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/exceptions/UiException.java
@@ -0,0 +1,22 @@
+package de.thedevstack.conversationsplus.exceptions;
+
+/**
+ * Exception to be shown in UI.
+ */
+public class UiException extends Exception {
+    private static final long serialVersionUID = -1010015239132881427L;
+    private int resId;
+
+    public UiException(int resId) {
+        this.resId = resId;
+    }
+
+    public UiException(int resId, Throwable e) {
+        super(e);
+        this.resId = resId;
+    }
+
+    public int getResId() {
+        return resId;
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
index b1b2298b..af875251 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
@@ -55,6 +55,7 @@ public class MessageDetailsDialog extends AbstractAlertDialog {
      */
     protected void displayFileInfo(View view, Message message) {
         if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE || message.getTransferable() != null) {
+            Logging.d("messagedetailsfile", "File is stored in path: " + message.getRelativeFilePath());
             view.findViewById(R.id.dlgMsgDetFileTable).setVisibility(View.VISIBLE);
             if (null != message.getFileParams()) {
                 Message.FileParams params = message.getFileParams();
@@ -140,7 +141,7 @@ public class MessageDetailsDialog extends AbstractAlertDialog {
         // Get own resource name -> What about msg written on other client?
         String me = conversation.getAccount().getJid().getResourcepart();
         // Get resource name of chat partner, if available
-        String other = (message.getCounterpart().isBareJid()) ? "" : message.getCounterpart().getResourcepart();
+        String other = (null == message.getCounterpart() || message.getCounterpart().isBareJid()) ? "" : message.getCounterpart().getResourcepart();
         Logging.d("MesageDialog", "Me: " + me + ", other: " + other);
         TextView sender = (TextView) view.findViewById(R.id.dlgMsgDetSender);
         TextView receipient = (TextView) view.findViewById(R.id.dlgMsgDetReceipient);
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
index 135d6faa..ac58e698 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
@@ -1,15 +1,29 @@
 package de.thedevstack.conversationsplus.ui.listeners;
 
 import android.app.PendingIntent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.widget.Toast;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.enums.UserDecision;
+import de.thedevstack.conversationsplus.exceptions.UiException;
+import de.thedevstack.conversationsplus.utils.FileHelper;
+import de.thedevstack.conversationsplus.utils.ImageUtil;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
+
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.persistance.FileBackend;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.ui.UiCallback;
 import eu.siacs.conversations.ui.XmppActivity;
@@ -81,13 +95,88 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener {
     @Override
     public void onYes() {
         this.showPrepareFileToast();
-        xmppConnectionService.attachImageToConversation(this.conversation, this.uri, this.callback);
+        final Message message;
+        final boolean forceEncryption = ConversationsPlusPreferences.forceEncryption();
+        if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
+            message = new Message(conversation, "", Message.ENCRYPTION_DECRYPTED);
+        } else {
+            message = new Message(conversation, "", conversation.getNextEncryption(forceEncryption));
+        }
+        message.setCounterpart(conversation.getNextCounterpart());
+        message.setType(Message.TYPE_IMAGE);
+        ConversationsPlusApplication.executeFileAdding(new Runnable() {
+
+            @Override
+            public void run() {
+                try {
+                    Bitmap resizedAndRotatedImage = ImageUtil.resizeAndRotateImage(uri);
+                    DownloadableFile file = FileBackend.compressImageAndCopyToPrivateStorage(message, resizedAndRotatedImage);
+                    String filePath = file.getAbsolutePath();
+                    long imageSize = file.getSize();
+                    int imageWidth = resizedAndRotatedImage.getWidth();
+                    int imageHeight = resizedAndRotatedImage.getHeight();
+                    MessageUtil.updateMessageWithImageDetails(message, filePath, imageSize, imageWidth, imageHeight);
+                    if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
+                        xmppConnectionService.getPgpEngine().encrypt(message, callback);
+                    } else {
+                        callback.success(message);
+                    }
+                } catch (final UiException e) {
+                    Logging.e("pictureresizesending", "Error while sending resized picture. " + e.getMessage());
+                    callback.error(e.getResId(), message);
+                }
+            }
+        });
     }
 
     @Override
     public void onNo() {
         this.showPrepareFileToast();
-        xmppConnectionService.attachImageToConversationWithoutResizing(this.conversation, this.uri, this.callback);
+        final Message message;
+        final boolean forceEncryption = ConversationsPlusPreferences.forceEncryption();
+        if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
+            message = new Message(conversation, "", Message.ENCRYPTION_DECRYPTED);
+        } else {
+            message = new Message(conversation, "", conversation.getNextEncryption(forceEncryption));
+        }
+        message.setCounterpart(conversation.getNextCounterpart());
+        message.setType(Message.TYPE_IMAGE);
+        ConversationsPlusApplication.executeFileAdding(new Runnable() {
+            @Override
+            public void run() {
+                InputStream is = null;
+                try {
+                    is = ConversationsPlusApplication.getInstance().getContentResolver().openInputStream(uri);
+                    long imageSize = is.available();
+                    BitmapFactory.Options options = new BitmapFactory.Options();
+                    options.inJustDecodeBounds = true;
+                    BitmapFactory.decodeStream(is, null, options);
+                    int imageHeight = options.outHeight;
+                    int imageWidth = options.outWidth;
+                    String filePath = FileHelper.getRealPathFromUri(uri);
+                    MessageUtil.updateMessageWithImageDetails(message, filePath, imageSize, imageWidth, imageHeight);
+                    if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
+                        xmppConnectionService.getPgpEngine().encrypt(message, callback);
+                    } else {
+                        callback.success(message);
+                    }
+                } catch (FileNotFoundException e) {
+                    Logging.e("picturesending", "File not found to send not resized. " + e.getMessage());
+                    callback.error(R.string.error_file_not_found, message);
+                } catch (IOException e) {
+                    Logging.e("picturesending", "Error while sending not resized picture. " + e.getMessage());
+                    callback.error(R.string.error_io_exception, message);
+                } finally {
+                    if (null != is) {
+                        try {
+                            is.close();
+                        } catch (IOException e) {
+                            Logging.w("picturesending", "Error while closing stream for sending not resized picture. " + e.getMessage());
+                        }
+                    }
+                }
+            }
+        });
     }
 
     @Override
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ImageUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/ImageUtil.java
index 204f56c4..f51ca7ea 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/ImageUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/ImageUtil.java
@@ -11,11 +11,16 @@ import android.util.LruCache;
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
 import de.thedevstack.android.logcat.Logging;
+import de.thedevstack.conversationsplus.exceptions.FileCopyException;
+import de.thedevstack.conversationsplus.exceptions.ImageResizeException;
 
+import eu.siacs.conversations.Config;
+import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.persistance.FileBackend;
 import eu.siacs.conversations.utils.ExifHelper;
@@ -24,6 +29,8 @@ import eu.siacs.conversations.utils.ExifHelper;
  * This util provides
  */
 public final class ImageUtil {
+
+    private static int IMAGE_SIZE = 1920;
     private static LruCache<String, Bitmap> BITMAP_CACHE;
 
     /**
@@ -106,6 +113,59 @@ public final class ImageUtil {
     }
 
     /**
+     * Resizes and rotates an image given by uri and returns the bitmap.
+     * @param image the uri of the image to be resized and rotated
+     * @return resized and rotated bitmap
+     * @throws ImageResizeException
+     */
+    public static Bitmap resizeAndRotateImage(Uri image) throws ImageResizeException {
+        return ImageUtil.resizeAndRotateImage(image, 0);
+    }
+
+    /**
+     * Resizes and rotates an image given by uri and returns the bitmap.
+     * @param image the uri of the image to be resized and rotated
+     * @return resized and rotated bitmap
+     * @throws ImageResizeException
+     */
+    private static Bitmap resizeAndRotateImage(Uri image, int sampleSize) throws ImageResizeException {
+        InputStream imageInputStream = null;
+        try {
+            imageInputStream = StreamUtil.openInputStreamFromContentResolver(image);
+            Bitmap originalBitmap;
+            BitmapFactory.Options options = new BitmapFactory.Options();
+            int inSampleSize = (int) Math.pow(2, sampleSize);
+            Logging.d(Config.LOGTAG, "reading bitmap with sample size " + inSampleSize);
+            options.inSampleSize = inSampleSize;
+            originalBitmap = BitmapFactory.decodeStream(imageInputStream, null, options);
+            imageInputStream.close();
+            if (originalBitmap == null) {
+                throw new ImageResizeException(R.string.error_not_an_image_file);
+            }
+            Bitmap scaledBitmap = ImageUtil.resize(originalBitmap, IMAGE_SIZE);
+            int rotation = ImageUtil.getRotation(image);
+            if (rotation > 0) {
+                scaledBitmap = ImageUtil.rotate(scaledBitmap, rotation);
+            }
+
+            return scaledBitmap;
+        } catch (FileNotFoundException e) {
+            throw new ImageResizeException(R.string.error_file_not_found);
+        } catch (IOException e) {
+            throw new ImageResizeException(R.string.error_io_exception);
+        } catch (OutOfMemoryError e) {
+            ++sampleSize;
+            if (sampleSize <= 3) {
+                return resizeAndRotateImage(image, sampleSize);
+            } else {
+                throw new ImageResizeException(R.string.error_out_of_memory);
+            }
+        } finally {
+            StreamUtil.close(imageInputStream);
+        }
+    }
+
+    /**
      * Returns the rotation from the exif information of an image identified with the given uri.
      * The orientation is retrieved by parsing the stream of the image.
      * FileNotFoundException is silently ignored.
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
new file mode 100644
index 00000000..9fedada6
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
@@ -0,0 +1,72 @@
+package de.thedevstack.conversationsplus.utils;
+
+import android.graphics.BitmapFactory;
+
+import java.net.URL;
+
+import eu.siacs.conversations.entities.DownloadableFile;
+import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.persistance.FileBackend;
+
+/**
+ * Created by tzur on 15.12.2015.
+ */
+public final class MessageUtil {
+    public static void updateMessageWithImageDetails(Message message, String filePath, long size, int imageWidth, int imageHeight) {
+        message.setRelativeFilePath(filePath);
+        MessageUtil.updateMessageBodyWithImageParams(message, size, imageWidth, imageHeight);
+    }
+
+    public static void updateFileParams(Message message) {
+        updateFileParams(message, null);
+    }
+
+    public static void updateFileParams(Message message, URL url) {
+        DownloadableFile file = FileBackend.getFile(message);
+        int imageWidth = -1;
+        int imageHeight = -1;
+        if (message.getType() == Message.TYPE_IMAGE || file.getMimeType().startsWith("image/")) {
+            BitmapFactory.Options options = new BitmapFactory.Options();
+            options.inJustDecodeBounds = true;
+            BitmapFactory.decodeFile(file.getAbsolutePath(), options);
+            imageHeight = options.outHeight;
+            imageWidth = options.outWidth;
+        }
+
+        MessageUtil.updateMessageBodyWithFileParams(message, url, file.getSize(), imageWidth, imageHeight);
+    }
+
+    private static void updateMessageBodyWithFileParams(Message message, URL url, long fileSize, int imageWidth, int imageHeight) {
+        message.setBody(MessageUtil.getMessageBodyWithImageParams(url, fileSize, imageWidth, imageHeight));
+    }
+
+    private static void updateMessageBodyWithImageParams(Message message, long size, int imageWidth, int imageHeight) {
+        MessageUtil.updateMessageBodyWithImageParams(message, null, size, imageWidth, imageHeight);
+    }
+
+    private static void updateMessageBodyWithImageParams(Message message, URL url, long size, int imageWidth, int imageHeight) {
+        message.setBody(MessageUtil.getMessageBodyWithImageParams(url, size, imageWidth, imageHeight));
+    }
+
+    private static String getMessageBodyWithImageParams(URL url, long size, int imageWidth, int imageHeight) {
+        StringBuilder sb = new StringBuilder();
+        if (null != url) {
+            sb.append(url.toString());
+            sb.append('|');
+        }
+        sb.append(size);
+        if (-1 < imageWidth) {
+            sb.append('|');
+            sb.append(imageWidth);
+        }
+        if (-1 < imageHeight) {
+            sb.append('|');
+            sb.append(imageHeight);
+        }
+        return sb.toString();
+    }
+
+    private MessageUtil() {
+        // Static helper class
+    }
+}
diff --git a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
index 15fe9f44..4d422801 100644
--- a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
+++ b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
@@ -14,6 +14,7 @@ import org.openintents.openpgp.util.OpenPgpApi;
 import org.openintents.openpgp.util.OpenPgpApi.IOpenPgpCallback;
 
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
@@ -103,7 +104,7 @@ public class PgpEngine {
 								OpenPgpApi.RESULT_CODE_ERROR)) {
 						case OpenPgpApi.RESULT_CODE_SUCCESS:
 							URL url = message.getFileParams().url;
-							FileBackend.updateFileParams(message, url);
+							MessageUtil.updateFileParams(message, url);
 							message.setEncryption(Message.ENCRYPTION_DECRYPTED);
 							PgpEngine.this.mXmppConnectionService
 									.updateMessage(message);
diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
index 5f0d3436..516d3141 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
@@ -17,6 +17,7 @@ import javax.net.ssl.SSLHandshakeException;
 
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
@@ -237,7 +238,7 @@ public class HttpDownloadConnection implements Transferable {
 
 		private void updateImageBounds() {
 			message.setType(Message.TYPE_FILE);
-			FileBackend.updateFileParams(message, mUrl);
+			MessageUtil.updateFileParams(message, mUrl);
 			mXmppConnectionService.updateMessage(message);
 		}
 
diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
index dc2c35d7..7d364eec 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
@@ -12,6 +12,7 @@ import java.net.URL;
 import javax.net.ssl.HttpsURLConnection;
 
 import de.thedevstack.android.logcat.Logging;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.utils.StreamUtil;
 
 import eu.siacs.conversations.Config;
@@ -165,7 +166,7 @@ public class HttpUploadConnection implements Transferable {
 					if (key != null) {
 						mGetUrl = new URL(mGetUrl.toString() + "#" + CryptoHelper.bytesToHex(key));
 					}
-					FileBackend.updateFileParams(message, mGetUrl);
+					MessageUtil.updateFileParams(message, mGetUrl);
 					message.setTransferable(null);
 					message.setCounterpart(message.getConversation().getJid().toBareJid());
 					if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 8e09131f..32de18e9 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -20,8 +20,8 @@ import android.webkit.MimeTypeMap;
 
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.exceptions.FileCopyException;
-import de.thedevstack.conversationsplus.utils.ImageUtil;
 import de.thedevstack.conversationsplus.utils.StreamUtil;
 
 import eu.siacs.conversations.Config;
@@ -32,8 +32,6 @@ import eu.siacs.conversations.entities.Message;
 
 public final class FileBackend {
 
-	private static int IMAGE_SIZE = 1920;
-
 	private static final SimpleDateFormat imageDateFormat = new SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.US);
 
 	public static DownloadableFile getFile(Message message) {
@@ -64,29 +62,35 @@ public final class FileBackend {
 				return new DownloadableFile(path);
 			} else {
 				if (Arrays.asList(Transferable.VALID_IMAGE_EXTENSIONS).contains(extension)) {
-					return new DownloadableFile(getConversationsFileDirectory() + path);
-				} else {
 					return new DownloadableFile(getConversationsImageDirectory() + path);
+				} else {
+					return new DownloadableFile(getConversationsFileDirectory() + path);
 				}
 			}
 		}
 	}
 
 	public static String getConversationsFileDirectory() {
-		return  Environment.getExternalStorageDirectory().getAbsolutePath()+"/Conversations/";
+		return  Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + ConversationsPlusPreferences.fileTransferFolder() + File.separator;
 	}
 
 	public static String getConversationsImageDirectory() {
-		return Environment.getExternalStoragePublicDirectory(
-                Environment.DIRECTORY_PICTURES).getAbsolutePath()
-			+ "/Conversations/";
+		return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath() + File.separator + ConversationsPlusPreferences.imgTransferFolder() + File.separator;
 	}
 
+    private static String getPrivateFileDirectoryPath() {
+        return ConversationsPlusApplication.getPrivateFilesDir().getAbsolutePath();
+    }
+
+    private static String getPrivateImageDirectoryPath() {
+        return FileBackend.getPrivateFileDirectoryPath() + File.separator + "Images" + File.separator;
+    }
+
 	public static DownloadableFile copyFileToPrivateStorage(Message message, Uri uri) throws FileCopyException {
 		Logging.d(Config.LOGTAG, "copy " + uri.toString() + " to private storage");
 		String mime = ConversationsPlusApplication.getInstance().getContentResolver().getType(uri);
 		String extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mime);
-		message.setRelativeFilePath(message.getUuid() + "." + extension);
+		message.setRelativeFilePath(FileBackend.getPrivateFileDirectoryPath() + message.getUuid() + "." + extension);
 		DownloadableFile file = getFile(message);
 		file.getParentFile().mkdirs();
 		OutputStream os = null;
@@ -114,68 +118,30 @@ public final class FileBackend {
 		return file;
 	}
 
-	public static DownloadableFile copyImageToPrivateStorage(Message message, Uri image)
-			throws FileCopyException {
-		return copyImageToPrivateStorage(message, image, 0);
-	}
-
-	private static DownloadableFile copyImageToPrivateStorage(Message message,
-			Uri image, int sampleSize) throws FileCopyException {
+	public static DownloadableFile compressImageAndCopyToPrivateStorage(Message message, Bitmap scaledBitmap) throws FileCopyException {
+        message.setRelativeFilePath(FileBackend.getPrivateImageDirectoryPath() + message.getUuid() + ".webp");
 		DownloadableFile file = getFile(message);
 		file.getParentFile().mkdirs();
-		InputStream is = null;
 		OutputStream os = null;
 		try {
 			file.createNewFile();
-			is = StreamUtil.openInputStreamFromContentResolver(image);
-			os = new FileOutputStream(file);
-
-			Bitmap originalBitmap;
-			BitmapFactory.Options options = new BitmapFactory.Options();
-			int inSampleSize = (int) Math.pow(2, sampleSize);
-			Logging.d(Config.LOGTAG, "reading bitmap with sample size " + inSampleSize);
-			options.inSampleSize = inSampleSize;
-			originalBitmap = BitmapFactory.decodeStream(is, null, options);
-			is.close();
-			if (originalBitmap == null) {
-				throw new FileCopyException(R.string.error_not_an_image_file);
-			}
-			Bitmap scaledBitmap = ImageUtil.resize(originalBitmap, IMAGE_SIZE);
-			int rotation = ImageUtil.getRotation(image);
-			if (rotation > 0) {
-				scaledBitmap = ImageUtil.rotate(scaledBitmap, rotation);
-			}
+            os = new FileOutputStream(file);
 
 			boolean success = scaledBitmap.compress(Bitmap.CompressFormat.WEBP, 75, os);
 			if (!success) {
 				throw new FileCopyException(R.string.error_compressing_image);
 			}
 			os.flush();
-			long size = file.getSize();
-			int width = scaledBitmap.getWidth();
-			int height = scaledBitmap.getHeight();
-			message.setBody(Long.toString(size) + '|' + width + '|' + height);
-			return file;
-		} catch (FileNotFoundException e) {
-			throw new FileCopyException(R.string.error_file_not_found);
-		} catch (IOException e) {
-			e.printStackTrace();
-			throw new FileCopyException(R.string.error_io_exception);
+        } catch (IOException e) {
+            throw new FileCopyException(R.string.error_io_exception, e);
 		} catch (SecurityException e) {
-			throw new FileCopyException(R.string.error_security_exception_during_image_copy);
-		} catch (OutOfMemoryError e) {
-			++sampleSize;
-			if (sampleSize <= 3) {
-				return copyImageToPrivateStorage(message, image, sampleSize);
-			} else {
-				throw new FileCopyException(R.string.error_out_of_memory);
-			}
-		} catch (NullPointerException e) {
+            throw new FileCopyException(R.string.error_security_exception_during_image_copy);
+        } catch (NullPointerException e) {
 			throw new FileCopyException(R.string.error_io_exception);
 		} finally {
 			StreamUtil.close(os);
-			StreamUtil.close(is);
 		}
+        return file;
 	}
 
     public static Uri getTakePhotoUri() {
@@ -196,33 +162,6 @@ public final class FileBackend {
 		return Uri.parse("file://" + file.getAbsolutePath());
 	}
 
-	public static void updateFileParams(Message message) {
-		updateFileParams(message,null);
-	}
-
-	public static void updateFileParams(Message message, URL url) {
-		DownloadableFile file = getFile(message);
-		if (message.getType() == Message.TYPE_IMAGE || file.getMimeType().startsWith("image/")) {
-			BitmapFactory.Options options = new BitmapFactory.Options();
-			options.inJustDecodeBounds = true;
-			BitmapFactory.decodeFile(file.getAbsolutePath(), options);
-			int imageHeight = options.outHeight;
-			int imageWidth = options.outWidth;
-			if (url == null) {
-				message.setBody(Long.toString(file.getSize()) + '|' + imageWidth + '|' + imageHeight);
-			} else {
-				message.setBody(url.toString()+"|"+Long.toString(file.getSize()) + '|' + imageWidth + '|' + imageHeight);
-			}
-		} else {
-			if (url != null) {
-				message.setBody(url.toString()+"|"+Long.toString(file.getSize()));
-			} else {
-				message.setBody(Long.toString(file.getSize()));
-			}
-		}
-
-	}
-
 	public static boolean isFileAvailable(Message message) {
 		return getFile(message).exists();
 	}
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 0a32755d..1ac792c7 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -54,10 +54,13 @@ import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.exceptions.FileCopyException;
+import de.thedevstack.conversationsplus.exceptions.UiException;
 import de.thedevstack.conversationsplus.utils.AvatarUtil;
 import de.thedevstack.conversationsplus.utils.FileHelper;
 import de.thedevstack.conversationsplus.utils.ImageUtil;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.tzur.conversations.Settings;
+
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.PgpEngine;
@@ -86,7 +89,6 @@ import eu.siacs.conversations.utils.ExceptionHelper;
 import eu.siacs.conversations.utils.OnPhoneContactsLoadedListener;
 import eu.siacs.conversations.utils.PRNGFixes;
 import eu.siacs.conversations.utils.PhoneHelper;
-import eu.siacs.conversations.utils.SerialSingleThreadExecutor;
 import eu.siacs.conversations.utils.Xmlns;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.OnBindListener;
@@ -110,6 +112,7 @@ import eu.siacs.conversations.xmpp.pep.Avatar;
 import eu.siacs.conversations.xmpp.stanzas.IqPacket;
 import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
 import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
+
 import me.leolin.shortcutbadger.ShortcutBadger;
 
 public class XmppConnectionService extends Service implements OnPhoneContactsLoadedListener {
@@ -130,9 +133,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}
 	};
 
-    private final SerialSingleThreadExecutor mFileAddingExecutor = new SerialSingleThreadExecutor();
-	private final SerialSingleThreadExecutor mDatabaseExecutor = new SerialSingleThreadExecutor();
-
 	private final IBinder mBinder = new XmppConnectionBinder();
 	private final List<Conversation> conversations = new CopyOnWriteArrayList<>();
 	private final FileObserver fileObserver = new FileObserver(
@@ -375,110 +375,33 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		message.setCounterpart(conversation.getNextCounterpart());
 		message.setType(Message.TYPE_FILE);
 		String path = FileHelper.getRealPathFromUri(uri);
-		if (path!=null) {
+		if (path != null) {
 			message.setRelativeFilePath(path);
-			FileBackend.updateFileParams(message);
+			MessageUtil.updateFileParams(message);
 			if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
 				getPgpEngine().encrypt(message, callback);
 			} else {
 				callback.success(message);
 			}
 		} else {
-			mFileAddingExecutor.execute(new Runnable() {
-				@Override
-				public void run() {
-					try {
-						FileBackend.copyFileToPrivateStorage(message, uri);
-						FileBackend.updateFileParams(message);
-						if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
-							getPgpEngine().encrypt(message, callback);
-						} else {
-							callback.success(message);
-						}
-					} catch (FileCopyException e) {
-						callback.error(e.getResId(), message);
-					}
-				}
-			});
-		}
-	}
-
-    public void attachImageToConversationWithoutResizing(final Conversation conversation, final Uri uri, final UiCallback<Message> callback) {
-        final Message message;
-        final boolean forceEncryption = ConversationsPlusPreferences.forceEncryption();
-        if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
-            message = new Message(conversation, "",
-                    Message.ENCRYPTION_DECRYPTED);
-        } else {
-            message = new Message(conversation, "",
-                    conversation.getNextEncryption(forceEncryption));
-        }
-        message.setCounterpart(conversation.getNextCounterpart());
-        message.setType(Message.TYPE_IMAGE);
-        mFileAddingExecutor.execute(new Runnable() {
-            @Override
-            public void run() {
-                InputStream is = null;
-                try {
-                    is = ConversationsPlusApplication.getInstance().getContentResolver().openInputStream(uri);
-                    long imageSize = is.available();
-                    BitmapFactory.Options options = new BitmapFactory.Options();
-                    options.inJustDecodeBounds = true;
-                    BitmapFactory.decodeStream(is, null, options);
-                    int imageHeight = options.outHeight;
-                    int imageWidth = options.outWidth;
-                    message.setRelativeFilePath(FileHelper.getRealPathFromUri(uri));
-                    message.setBody(Long.toString(imageSize) + '|' + imageWidth + '|' + imageHeight);
-                    callback.success(message);
-                } catch (FileNotFoundException e) {
-                    Logging.e("pictureresize", "File not found to send not resized. " + e.getMessage());
-                    callback.error(R.string.error_file_not_found, message);
-                } catch (IOException e) {
-                    Logging.e("pictureresize", "Error while sending not resized picture. " + e.getMessage());
-                    callback.error(R.string.error_io_exception, message);
-                } finally {
-                    if (null != is) {
-                        try {
-                            is.close();
-                        } catch (IOException e) {
-                            Logging.w("pictureresize", "Error while closing stream for sending not resized picture. " + e.getMessage());
+            ConversationsPlusApplication.executeFileAdding(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        FileBackend.copyFileToPrivateStorage(message, uri);
+                        MessageUtil.updateFileParams(message);
+                        if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
+                            getPgpEngine().encrypt(message, callback);
+                        } else {
+                            callback.success(message);
                         }
+                    } catch (FileCopyException e) {
+                        callback.error(e.getResId(), message);
                     }
                 }
-            }
-        });
-    }
-
-    public void attachImageToConversation(final Conversation conversation,
-                                          final Uri uri, final UiCallback<Message> callback) {
-        final Message message;
-        final boolean forceEncryption = ConversationsPlusPreferences.forceEncryption();
-        if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
-            message = new Message(conversation, "",
-                    Message.ENCRYPTION_DECRYPTED);
-        } else {
-            message = new Message(conversation, "",
-                    conversation.getNextEncryption(forceEncryption));
-        }
-        message.setCounterpart(conversation.getNextCounterpart());
-        message.setType(Message.TYPE_IMAGE);
-        mFileAddingExecutor.execute(new Runnable() {
-
-            @Override
-            public void run() {
-                try {
-                    FileBackend.copyImageToPrivateStorage(message, uri);
-                    if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
-                        getPgpEngine().encrypt(message, callback);
-                    } else {
-                        callback.success(message);
-                    }
-                } catch (final FileCopyException e) {
-                    callback.error(e.getResId(), message);
-                }
-            }
-        });
-    }
+            });
+		}
+	}
 
     public Conversation find(Bookmark bookmark) {
 		return find(bookmark.getAccount(), bookmark.getJid());
@@ -1019,7 +942,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					updateConversationUi();
 				}
 			};
-			mDatabaseExecutor.execute(runnable);
+            ConversationsPlusApplication.executeDatabaseOperation(runnable);
 		}
 	}
 
@@ -1123,7 +1046,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
                 }
             }
 		};
-		mDatabaseExecutor.execute(runnable);
+        ConversationsPlusApplication.executeDatabaseOperation(runnable);
 	}
 
 	public List<Account> getAccounts() {
@@ -2390,8 +2313,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				databaseBackend.writeRoster(account.getRoster());
 			}
 		};
-		mDatabaseExecutor.execute(runnable);
-
+        ConversationsPlusApplication.executeDatabaseOperation(runnable);
 	}
 
 	public List<String> getKnownHosts() {
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 731d49e4..f41c6791 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -14,6 +14,7 @@ import android.os.SystemClock;
 
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
@@ -93,7 +94,7 @@ public class JingleConnection implements Transferable {
 					JingleConnection.this.mXmppConnectionService
 							.getNotificationService().push(message);
 				}
-				FileBackend.updateFileParams(message);
+				MessageUtil.updateFileParams(message);
 				mXmppConnectionService.databaseBackend.createMessage(message);
 				mXmppConnectionService.markMessage(message,
 						Message.STATUS_RECEIVED);
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 29b2ec88..e6f6273e 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -505,4 +505,9 @@
   <string name="cplus_copied_to_clipboard">In Zwischenablage kopiert</string>
   <string name="pref_show_logcat_title">Zeige logcat Ausgabe</string>
   <string name="pref_show_logcat_summary">Zeigt die Ausgabe von logcat an. Hilfreich für die Fehlersuche.</string>
+  <string name="pref_file_transfer">Ordnername, um eingehnde Datein zu speichern</string>
+  <string name="pref_file_transfer_folder_summary">Unterordner des globalen Dateiordners, um eingehende Dateien zu speichern.</string>
+  <string name="pref_img_file_transfer">Ordnername, um eingehende Bilder zu speichern</string>
+  <string name="pref_img_file_transfer_summary">Unterordner des globalen Bilderordners, um eingehende Bilder zu speichern.</string>
+  <string name="pref_file_transfer_category">Dateiübertragung</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 40ff6707..c8a50a25 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -538,4 +538,9 @@
     <string name="pref_show_logcat_title">Show logcat output</string>
     <string name="pref_show_logcat_summary">Shows the output of logcat. This is useful for debugging.</string>
     <string name="cplus_bugreport_jabberid">c+bugs@conference.thedevstack.de</string>
+    <string name="pref_file_transfer">Folder to save incoming files</string>
+    <string name="pref_file_transfer_folder_summary">This is the subdirectory for incoming files.</string>
+    <string name="pref_img_file_transfer">Folder to save incoming pictures</string>
+    <string name="pref_img_file_transfer_summary">This is the subdirectory in the pictures directory for incoming files.</string>
+    <string name="pref_file_transfer_category">File Transfer</string>
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 20ceb634..26ab27bd 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -17,6 +17,26 @@
             android:summary="@string/pref_xmpp_resource_summary"
             android:title="@string/pref_xmpp_resource" />
 
+        <ListPreference
+            android:defaultValue="2"
+            android:entries="@array/confirm_strings"
+            android:entryValues="@array/confirm_values"
+            android:key="confirm_messages_list"
+            android:summary="@string/pref_confirm_messages_summary"
+            android:title="@string/pref_confirm_messages" />
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="chat_states"
+            android:summary="@string/pref_chat_states_summary"
+            android:title="@string/pref_chat_states" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="parse_emoticons"
+            android:summary="@string/pref_parse_emoticons_summary"
+            android:title="@string/pref_parse_emoticons"/>
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/pref_file_transfer_category">
         <PreferenceScreen
             android:summary="@string/pref_accept_files_summary"
             android:title="@string/pref_accept_files">
@@ -42,6 +62,16 @@
                 android:title="@string/pref_accept_files_download" />
 
         </PreferenceScreen>
+        <EditTextPreference
+            android:title="@string/pref_img_file_transfer"
+            android:summary="@string/pref_file_transfer_folder_summary"
+            android:key="file_transfer_folder"
+            android:defaultValue="Conversations+"/>
+        <EditTextPreference
+            android:title="@string/pref_file_transfer"
+            android:summary="@string/pref_img_file_transfer_summary"
+            android:key="img_transfer_folder"
+            android:defaultValue="Conversations+"/>
 
         <ListPreference
             android:defaultValue="ASK"
@@ -50,25 +80,6 @@
             android:key="resize_picture"
             android:summary="@string/pref_resize_picture_summary"
             android:title="@string/pref_resize_picture"/>
-
-        <ListPreference
-            android:defaultValue="2"
-            android:entries="@array/confirm_strings"
-            android:entryValues="@array/confirm_values"
-            android:key="confirm_messages_list"
-            android:summary="@string/pref_confirm_messages_summary"
-            android:title="@string/pref_confirm_messages" />
-
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="chat_states"
-            android:summary="@string/pref_chat_states_summary"
-            android:title="@string/pref_chat_states" />
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="parse_emoticons"
-            android:summary="@string/pref_parse_emoticons_summary"
-            android:title="@string/pref_parse_emoticons"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/pref_notification_settings" >
         <PreferenceScreen