From: masensio <masensio@solidgear.es>
Date: Thu, 19 Feb 2015 11:54:59 +0000 (+0100)
Subject: Merge branch 'develop' into cancel_transfer_for_deleted_users
X-Git-Tag: oc-android-1.7.1_signed^2~40^2~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/cb175f29949dbac17a3870a71ecff60df5c9bdc4?ds=inline;hp=--cc

Merge branch 'develop' into cancel_transfer_for_deleted_users

Conflicts:
	AndroidManifest.xml
---

cb175f29949dbac17a3870a71ecff60df5c9bdc4
diff --cc AndroidManifest.xml
index b520d092,780875b7..f0d1e9dc
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -3,7 -3,7 +3,7 @@@
    ownCloud Android client application
  
    Copyright (C) 2012  Bartek Przybylski
--  Copyright (C) 2012-2014 ownCloud Inc.
++  Copyright (C) 2012-2015 ownCloud Inc.
  
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License version 2,
@@@ -86,7 -86,7 +86,6 @@@
              android:name=".ui.activity.Preferences"
              android:theme="@style/Theme.ownCloud" >
          </activity>
-         
 -
          <activity	
              android:name=".ui.preview.PreviewImageActivity" 
              />
diff --cc src/com/owncloud/android/files/services/FileUploader.java
index 3ce1aace,6f77a9c1..ef8bda45
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@@ -172,8 -171,23 +172,23 @@@ public class FileUploader extends Servi
      }
  
      /**
+      * Service clean up
+      */
+     @Override
+     public void onDestroy() {
+         Log_OC.v(TAG, "Destroying service" );
+         mBinder = null;
+         mServiceHandler = null;
+         mServiceLooper.quit();
+         mServiceLooper = null;
+         mNotificationManager = null;
+         super.onDestroy();
+     }
+ 
+ 
+     /**
       * Entry point to add one or several files to the queue of uploads.
 -     * 
 +     *
       * New uploads are added calling to startService(), resulting in a call to
       * this method. This ensures the service will keep on working although the
       * caller activity goes away.