Update packageName

AndroidManifest.xml

@@ -17,7 +17,7 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
-<manifest package="de.mobilcom.debitel.cloud.android"
+<manifest package="com.owncloud.android"
     android:versionCode="104006"
     android:versionName="1.4.6" xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -153,8 +153,8 @@
         <service android:name=".media.MediaService" />
         
         <activity android:name=".ui.activity.PinCodeActivity" />
-        <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
-        <activity android:name=".extensions.ExtensionsListActivity"></activity>
+        <activity android:name="com.owncloud.android.extensions.ExtensionsAvailableActivity"></activity>
+        <activity android:name="com.owncloud.android.extensions.ExtensionsListActivity"></activity>
         <activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>
         <activity android:name=".ui.activity.ConflictsResolveActivity"/>
         <activity android:name=".ui.activity.GenericExplanationActivity"/>

oc_jb_workaround/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mobilcom.debitel.cloud.android.workaround.accounts"
+    package="com.owncloud.android.workaround.accounts"
     android:versionCode="0100008"
     android:versionName="1.0.8" >
 

oc_jb_workaround/src/de/mobilcom/debitel/cloud/android/workaround/accounts/AccountAuthenticatorService.java → oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java

@@ -16,7 +16,7 @@
  */
 
 
-package de.mobilcom.debitel.cloud.android.workaround.accounts;
+package com.owncloud.android.workaround.accounts;
 
 import android.accounts.AbstractAccountAuthenticator;
 import android.accounts.Account;
@@ -63,7 +63,7 @@ public class AccountAuthenticatorService extends Service {
                 String[] requiredFeatures, Bundle options)
                 throws NetworkErrorException {
         	//Log.e("WORKAROUND", "Yes, WORKAROUND takes the control here");
-            final Intent intent = new Intent("de.mobilcom.debitel.cloud.android.workaround.accounts.CREATE");
+            final Intent intent = new Intent("com.owncloud.android.workaround.accounts.CREATE");
             intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE,
                     response);
             intent.putExtra(KEY_AUTH_TOKEN_TYPE, authTokenType);

pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>de.mobilcom.debitel.cloud.android</groupId>
+    <groupId>com.owncloud.android</groupId>
     <artifactId>owncloud</artifactId>
     <version>1.3.21-SNAPSHOT</version>
     <packaging>apk</packaging>

res/layout-land/account_setup.xml

@@ -185,7 +185,7 @@
 						           
 	</LinearLayout>
        
-	<de.mobilcom.debitel.cloud.android.ui.CustomButton
+	<com.owncloud.android.ui.CustomButton
 		android:id="@id/buttonOK"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"

res/layout-v14/generic_explanation.xml

@@ -49,14 +49,14 @@
         android:orientation="horizontal" >
 
         <!-- 'OK' / 'CANCEL' BUTTONS CHANGE THEIR ORDER FROM ANDROID 4.0 ; THANKS, GOOGLE -->
-        <de.mobilcom.debitel.cloud.android.ui.CustomButton
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 
-		<de.mobilcom.debitel.cloud.android.ui.CustomButton
+		<com.owncloud.android.ui.CustomButton
 		    android:id="@+id/ok"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"

res/layout/account_setup.xml

@@ -166,7 +166,7 @@
             android:gravity="center_vertical"
             android:text="@string/auth_unauthorized" />
 
-        <de.mobilcom.debitel.cloud.android.ui.CustomButton
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/buttonOK"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

res/layout/extensions_available_dialog.xml

@@ -34,14 +34,14 @@
         android:layout_margin="5dp"
         android:weightSum="1.0" >
 
-        <de.mobilcom.debitel.cloud.android.ui.CustomButton
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/buttonNo"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:text="@string/common_no"
             android:layout_weight="0.5"/>
 
-        <de.mobilcom.debitel.cloud.android.ui.CustomButton
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/buttonYes"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"

res/layout/failed_upload_files.xml

@@ -63,7 +63,7 @@
                 android:text="@string/failed_upload_all_cb"
                 android:textSize="8sp" />
 
-            <de.mobilcom.debitel.cloud.android.ui.CustomButton
+            <com.owncloud.android.ui.CustomButton
                 android:id="@+id/failed_upload_retry_all_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -72,7 +72,7 @@
                 android:text="@string/failed_upload_headline_retryall_btn"
                 android:textSize="8sp" />
 
-            <de.mobilcom.debitel.cloud.android.ui.CustomButton
+            <com.owncloud.android.ui.CustomButton
                 android:id="@+id/failed_upload_delete_all_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

res/layout/failed_upload_message_view.xml

@@ -10,7 +10,7 @@
        android:layout_height="wrap_content"
        android:minWidth="100dp"/>
    
-   <de.mobilcom.debitel.cloud.android.ui.CustomButton
+   <com.owncloud.android.ui.CustomButton
     android:id="@+id/failed_uploadactivity_close_button"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"

res/layout/file_preview.xml

@@ -54,7 +54,7 @@
 	   	
    	</FrameLayout>
    	
-   	<de.mobilcom.debitel.cloud.android.media.MediaControlView 
+   	<com.owncloud.android.media.MediaControlView 
    	    android:id="@id/media_controller"
    	    android:layout_width="match_parent"
    	    android:layout_height="wrap_content"

res/layout/generic_explanation.xml

@@ -48,14 +48,14 @@
         android:gravity="center"
         android:orientation="horizontal" >
 
-		<de.mobilcom.debitel.cloud.android.ui.CustomButton
+		<com.owncloud.android.ui.CustomButton
 		    android:id="@+id/ok"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="1"
 		    android:text="@string/common_ok" />
 		
-        <de.mobilcom.debitel.cloud.android.ui.CustomButton
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

res/layout/list_fragment.xml

@@ -23,7 +23,7 @@
 	android:layout_weight="1"
 	android:orientation="vertical" >
 
-	<de.mobilcom.debitel.cloud.android.ui.ExtendedListView
+	<com.owncloud.android.ui.ExtendedListView
         android:id="@+id/list_root"
         android:layout_width="match_parent"
         android:layout_height="0dip"

res/layout/log_send_file.xml

@@ -24,7 +24,7 @@
          android:layout_height="wrap_content"
          android:gravity="bottom">
         
-     <de.mobilcom.debitel.cloud.android.ui.CustomButton
+     <com.owncloud.android.ui.CustomButton
             	android:id="@+id/deleteLogHistoryButton"
          		android:layout_width="match_parent"
      		   	android:layout_height="wrap_content"

res/layout/no_account_available.xml

@@ -39,7 +39,7 @@
             android:text="@string/main_wrn_accsetup"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <de.mobilcom.debitel.cloud.android.ui.CustomButton
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/setup_account"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

res/layout/pincodelock.xml

@@ -68,7 +68,7 @@
             style="@style/PassCodeStyle" />
     </LinearLayout>
 
-    <de.mobilcom.debitel.cloud.android.ui.CustomButton android:layout_width="wrap_content"
+    <com.owncloud.android.ui.CustomButton android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/common_cancel"
         android:textColor="@android:color/black"

res/layout/ssl_validator_layout.xml

@@ -408,21 +408,21 @@
         android:layout_height="wrap_content"
         android:gravity="center" >
 
-        <de.mobilcom.debitel.cloud.android.ui.CustomButton
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/cancel"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 
-        <de.mobilcom.debitel.cloud.android.ui.CustomButton
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/details_btn"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/ssl_validator_btn_details_see" />
 
-        <de.mobilcom.debitel.cloud.android.ui.CustomButton
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/ok"
             android:layout_width="0dp"
             android:layout_height="wrap_content"

res/layout/sso_dialog.xml

@@ -21,7 +21,7 @@
     android:layout_height="wrap_content"
     >
     
-    <de.mobilcom.debitel.cloud.android.ui.dialog.SsoWebView
+    <com.owncloud.android.ui.dialog.SsoWebView
     	android:layout_width="wrap_content"
     	android:layout_height="wrap_content"
         android:id="@+id/sso_webview"

res/layout/upload_files_layout.xml

@@ -28,20 +28,20 @@
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
-        class="de.mobilcom.debitel.cloud.android.ui.fragment.LocalFileListFragment" />
+        class="com.owncloud.android.ui.fragment.LocalFileListFragment" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="horizontal" >
-
        <de.mobilcom.debitel.cloud.android.ui.CustomButton
+
        <com.owncloud.android.ui.CustomButton
             android:id="@+id/upload_files_btn_cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
-
		<de.mobilcom.debitel.cloud.android.ui.CustomButton
+
		<com.owncloud.android.ui.CustomButton
 		    android:id="@+id/upload_files_btn_upload"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"

res/layout/uploader_layout.xml

@@ -33,7 +33,7 @@
 	</FrameLayout>
 	<LinearLayout android:id="@+id/linearLayout1"
 		android:layout_width="fill_parent" android:layout_alignParentBottom="true" android:layout_height="wrap_content" android:orientation="vertical">
-		<de.mobilcom.debitel.cloud.android.ui.CustomButton android:layout_gravity="bottom" android:layout_height="wrap_content"
+		<com.owncloud.android.ui.CustomButton android:layout_gravity="bottom" android:layout_height="wrap_content"
 			android:layout_width="fill_parent" android:id="@+id/uploader_choose_folder"
 			android:text="@string/uploader_btn_upload_text"/>
 	</LinearLayout>

res/raw-de/changelog.html

@@ -24,7 +24,7 @@
 		In dieser Version von Android existiert ein Bug, der nach jedem Neustart eine erneute Eingabe der ownCloud Login-Informationen nötig macht. Um das zu umgehen installieren Sie bitte diese kostenlose Hilfs-App: 
 	</p>
 	<p style="text-align:center">
-		<a href="http://play.google.com/store/apps/details?id=de.mobilcom.debitel.cloud.android.workaround.accounts">ownCloud Jelly Bean Workaround</a> 
+		<a href="http://play.google.com/store/apps/details?id=com.owncloud.android.workaround.accounts">ownCloud Jelly Bean Workaround</a> 
 	</p>
 	</body>
 </html>

res/raw-es/changelog.html

@@ -24,7 +24,7 @@
 		Para prevenir la pérdida de las credenciales de sus cuentas ownCloud en cada reinicio, por favor, instale esta app gratuita que evita el problema en Jelly Bean:	
 	</p>
 	<p style="text-align:center">
-		<a href="http://play.google.com/store/apps/details?id=de.mobilcom.debitel.cloud.android.workaround.accounts">ownCloud Jelly Bean Workaround</a>
+		<a href="http://play.google.com/store/apps/details?id=com.owncloud.android.workaround.accounts">ownCloud Jelly Bean Workaround</a>
 	</p>
 	</body>
 </html>

res/raw/changelog.html

@@ -24,7 +24,7 @@
 		To prevent losing your ownCloud account credentials on every reboot, please, install this free helper app to work around the bug in Jelly Bean:
 	</p>
 	<p style="text-align:center">
-		<a href="http://play.google.com/store/apps/details?id=de.mobilcom.debitel.cloud.android.workaround.accounts">ownCloud Jelly Bean Workaround</a> 
+		<a href="http://play.google.com/store/apps/details?id=com.owncloud.android.workaround.accounts">ownCloud Jelly Bean Workaround</a> 
 	</p>
 	</body>
 </html>

res/values/oauth2_configuration.xml

@@ -12,7 +12,7 @@
     <string name="oauth2_response_type">code</string>				<!-- depends on oauth2_grant_type -->
     
     <!-- values that should be pre-agreed between app and authorization server, but can be loaded without rebuilding the app -->
-    <string name="oauth2_client_id">de.mobilcom.debitel.cloud.android</string>	<!-- preferable that client decides this -->
+    <string name="oauth2_client_id">com.owncloud.android</string>	<!-- preferable that client decides this -->
     <string name="oauth2_client_secret"></string>					<!-- preferable that client decides this -->
     
 </resources>

res/values/setup.xml

@@ -39,7 +39,7 @@
     <string name="url_imprint">"https://webapi.md.de/about/imprint"</string>
     <string name="mail_recommend">"mailto:"</string>
     <string name="mail_feedback">"mailto:appservice@cloud.md.de"</string>
-    <!-- string name="url_app_download">"https://play.google.com/store/apps/details?id=de.mobilcom.debitel.cloud.android"</string -->
+    <!-- string name="url_app_download">"https://play.google.com/store/apps/details?id=com.owncloud.android"</string -->
 
 </resources>
 

src/de/mobilcom/debitel/cloud/android/DisplayUtils.java → src/com/owncloud/android/DisplayUtils.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android;
+package com.owncloud.android;
 
 import java.util.Arrays;
 import java.util.Date;

src/de/mobilcom/debitel/cloud/android/Log_OC.java → src/com/owncloud/android/Log_OC.java

@@ -1,4 +1,4 @@
-package de.mobilcom.debitel.cloud.android;
+package com.owncloud.android;
 
 import java.io.BufferedWriter;
 import java.io.File;

src/de/mobilcom/debitel/cloud/android/MainApp.java → src/com/owncloud/android/MainApp.java

@@ -14,7 +14,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package de.mobilcom.debitel.cloud.android;
+package com.owncloud.android;
 
 import android.app.Application;
 import android.content.Context;

src/de/mobilcom/debitel/cloud/android/OwnCloudSession.java → src/com/owncloud/android/OwnCloudSession.java

@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package de.mobilcom.debitel.cloud.android;
+package com.owncloud.android;
 
 /**
  * Represents a session to an ownCloud instance

src/de/mobilcom/debitel/cloud/android/Uploader.java → src/com/owncloud/android/Uploader.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android;
+package com.owncloud.android;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -26,6 +26,14 @@ import java.util.List;
 import java.util.Stack;
 import java.util.Vector;
 
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.ui.CustomButton;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.AlertDialog;
@@ -54,13 +62,6 @@ import android.widget.SimpleAdapter;
 import android.widget.Toast;
 
 
-import de.mobilcom.debitel.cloud.android.R;
-import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator;
-import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
-import de.mobilcom.debitel.cloud.android.ui.CustomButton;
 
 /**
  * This can be used to upload things to an ownCloud instance.

src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticator.java → src/com/owncloud/android/authentication/AccountAuthenticator.java

@@ -16,7 +16,11 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.authentication;
+package com.owncloud.android.authentication;
+
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
 
 import android.accounts.*;
 import android.content.Context;
@@ -26,9 +30,6 @@ import android.os.Handler;
 import android.widget.Toast;
 
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.MainApp;
-import de.mobilcom.debitel.cloud.android.R;
 
 
 /**
@@ -64,15 +65,15 @@ public class AccountAuthenticator extends AbstractAccountAuthenticator {
     /**
      * Value under this key should handle path to webdav php script. Will be
      * removed and usage should be replaced by combining
-     * {@link de.mobilcom.debitel.cloud.android.authentication.AuthenticatorActivity.KEY_OC_BASE_URL} and
-     * {@link de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion}
+     * {@link com.owncloud.android.authentication.AuthenticatorActivity.KEY_OC_BASE_URL} and
+     * {@link com.owncloud.android.utils.OwnCloudVersion}
      * 
      * @deprecated
      */
     public static final String KEY_OC_URL = "oc_url";
     /**
      * Version should be 3 numbers separated by dot so it can be parsed by
-     * {@link de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion}
+     * {@link com.owncloud.android.utils.OwnCloudVersion}
      */
     public static final String KEY_OC_VERSION = "oc_version";
     /**

src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticatorActivity.java → src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.mobilcom.debitel.cloud.android.authentication;
+package com.owncloud.android.authentication;
 
 import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;

src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticatorService.java → src/com/owncloud/android/authentication/AccountAuthenticatorService.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.authentication;
+package com.owncloud.android.authentication;
 
 import android.app.Service;
 import android.content.Intent;

src/de/mobilcom/debitel/cloud/android/authentication/AccountUtils.java → src/com/owncloud/android/authentication/AccountUtils.java

@@ -16,10 +16,10 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.authentication;
+package com.owncloud.android.authentication;
 
-import de.mobilcom.debitel.cloud.android.MainApp;
-import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.utils.OwnCloudVersion;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;

src/de/mobilcom/debitel/cloud/android/authentication/AuthenticatorActivity.java → src/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.authentication;
+package com.owncloud.android.authentication;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -51,24 +51,24 @@ import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;
+import com.owncloud.android.network.OwnCloudClientUtils;
+import com.owncloud.android.operations.ExistenceCheckOperation;
+import com.owncloud.android.operations.OAuth2GetAccessToken;
+import com.owncloud.android.operations.OnRemoteOperationListener;
+import com.owncloud.android.operations.OwnCloudServerCheckOperation;
+import com.owncloud.android.operations.RemoteOperation;
+import com.owncloud.android.operations.RemoteOperationResult;
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.ui.CustomButton;
+import com.owncloud.android.ui.dialog.SamlWebViewDialog;
+import com.owncloud.android.ui.dialog.SslValidatorDialog;
+import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
+import com.owncloud.android.utils.OwnCloudVersion;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.MainApp;
-import de.mobilcom.debitel.cloud.android.R;
-import de.mobilcom.debitel.cloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;
-import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils;
-import de.mobilcom.debitel.cloud.android.operations.ExistenceCheckOperation;
-import de.mobilcom.debitel.cloud.android.operations.OAuth2GetAccessToken;
-import de.mobilcom.debitel.cloud.android.operations.OnRemoteOperationListener;
-import de.mobilcom.debitel.cloud.android.operations.OwnCloudServerCheckOperation;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperation;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
-import de.mobilcom.debitel.cloud.android.ui.CustomButton;
-import de.mobilcom.debitel.cloud.android.ui.dialog.SamlWebViewDialog;
-import de.mobilcom.debitel.cloud.android.ui.dialog.SslValidatorDialog;
-import de.mobilcom.debitel.cloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
-import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion;
 
 import eu.alefzero.webdav.WebdavClient;
 

src/de/mobilcom/debitel/cloud/android/authentication/OAuth2Constants.java → src/com/owncloud/android/authentication/OAuth2Constants.java

@@ -15,7 +15,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.authentication;
+package com.owncloud.android.authentication;
 
 /** 
  * Constant values for OAuth 2 protocol.

src/de/mobilcom/debitel/cloud/android/authentication/SsoWebViewClient.java → src/com/owncloud/android/authentication/SsoWebViewClient.java

@@ -15,11 +15,12 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.authentication;
+package com.owncloud.android.authentication;
 
 import java.lang.ref.WeakReference;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
+import com.owncloud.android.Log_OC;
+
 
 import android.graphics.Bitmap;
 import android.os.Handler;

src/de/mobilcom/debitel/cloud/android/datamodel/DataStorageManager.java → src/com/owncloud/android/datamodel/DataStorageManager.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.datamodel;
+package com.owncloud.android.datamodel;
 
 import java.util.List;
 import java.util.Vector;

src/de/mobilcom/debitel/cloud/android/datamodel/FileDataStorageManager.java → src/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.datamodel;
+package com.owncloud.android.datamodel;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -25,10 +25,11 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.MainApp;
-import de.mobilcom.debitel.cloud.android.db.ProviderMeta.ProviderTableMeta;
-import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
+import com.owncloud.android.utils.FileStorageUtils;
+
 
 import android.accounts.Account;
 import android.content.ContentProviderClient;

src/de/mobilcom/debitel/cloud/android/datamodel/OCFile.java → src/com/owncloud/android/datamodel/OCFile.java

@@ -16,11 +16,12 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.datamodel;
+package com.owncloud.android.datamodel;
 
 import java.io.File;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
+import com.owncloud.android.Log_OC;
+
 
 import android.os.Parcel;
 import android.os.Parcelable;

src/de/mobilcom/debitel/cloud/android/db/DbHandler.java → src/com/owncloud/android/db/DbHandler.java

@@ -15,10 +15,10 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package de.mobilcom.debitel.cloud.android.db;
+package com.owncloud.android.db;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.MainApp;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 
 import android.content.ContentValues;
 import android.content.Context;

src/de/mobilcom/debitel/cloud/android/db/ProviderMeta.java → src/com/owncloud/android/db/ProviderMeta.java

@@ -15,9 +15,9 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package de.mobilcom.debitel.cloud.android.db;
+package com.owncloud.android.db;
 
-import de.mobilcom.debitel.cloud.android.MainApp;
+import com.owncloud.android.MainApp;
 
 import android.net.Uri;
 import android.provider.BaseColumns;

src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableActivity.java → src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.extensions;
+package com.owncloud.android.extensions;
 
 import android.os.Bundle;
 import android.support.v4.app.FragmentManager;

src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableDialog.java → src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java

@@ -16,11 +16,12 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.extensions;
+package com.owncloud.android.extensions;
+
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
+import com.owncloud.android.ui.CustomButton;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.R;
-import de.mobilcom.debitel.cloud.android.ui.CustomButton;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;

src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsListActivity.java → src/com/owncloud/android/extensions/ExtensionsListActivity.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.extensions;
+package com.owncloud.android.extensions;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -27,8 +27,9 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.utils.OwnCloudVersion;
+
 
 
 import android.R;

src/de/mobilcom/debitel/cloud/android/files/BootupBroadcastReceiver.java → src/com/owncloud/android/files/BootupBroadcastReceiver.java

@@ -16,10 +16,10 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.files;
+package com.owncloud.android.files;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.files.services.FileObserverService;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.files.services.FileObserverService;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

src/de/mobilcom/debitel/cloud/android/files/FileHandler.java → src/com/owncloud/android/files/FileHandler.java

@@ -15,9 +15,9 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.files;
+package com.owncloud.android.files;
 
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import com.owncloud.android.datamodel.OCFile;
 
 public interface FileHandler {
 

src/de/mobilcom/debitel/cloud/android/files/InstantUploadBroadcastReceiver.java → src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java

@@ -16,10 +16,17 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.files;
+package com.owncloud.android.files;
 
 import java.io.File;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.db.DbHandler;
+import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.utils.FileStorageUtils;
+
 
 import android.accounts.Account;
 import android.content.BroadcastReceiver;
@@ -33,12 +40,6 @@ import android.preference.PreferenceManager;
 import android.provider.MediaStore.Images.Media;
 import android.webkit.MimeTypeMap;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.MainApp;
-import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
-import de.mobilcom.debitel.cloud.android.db.DbHandler;
-import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
-import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
 

src/de/mobilcom/debitel/cloud/android/files/OwnCloudFileObserver.java → src/com/owncloud/android/files/OwnCloudFileObserver.java

@@ -16,17 +16,18 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.files;
+package com.owncloud.android.files;
 
 import java.io.File;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
-import de.mobilcom.debitel.cloud.android.operations.SynchronizeFileOperation;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
-import de.mobilcom.debitel.cloud.android.ui.activity.ConflictsResolveActivity;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.operations.RemoteOperationResult;
+import com.owncloud.android.operations.SynchronizeFileOperation;
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.ui.activity.ConflictsResolveActivity;
+
 
 
 import android.accounts.Account;

src/de/mobilcom/debitel/cloud/android/files/managers/OCNotificationManager.java → src/com/owncloud/android/files/managers/OCNotificationManager.java

@@ -16,17 +16,18 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.files.managers;
+package com.owncloud.android.files.managers;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import com.owncloud.android.R;
+
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.widget.RemoteViews;
 
-import de.mobilcom.debitel.cloud.android.R;
 
 public class OCNotificationManager {
 

src/de/mobilcom/debitel/cloud/android/files/services/FileDownloader.java → src/com/owncloud/android/files/services/FileDownloader.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.files.services;
+package com.owncloud.android.files.services;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,6 +28,21 @@ import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.AuthenticatorActivity;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.network.OwnCloudClientUtils;
+import com.owncloud.android.operations.DownloadFileOperation;
+import com.owncloud.android.operations.RemoteOperationResult;
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.ui.activity.FileActivity;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
+import com.owncloud.android.ui.preview.PreviewImageActivity;
+import com.owncloud.android.ui.preview.PreviewImageFragment;
+
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 
 
@@ -47,20 +62,6 @@ import android.os.Message;
 import android.os.Process;
 import android.widget.RemoteViews;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.MainApp;
-import de.mobilcom.debitel.cloud.android.R;
-import de.mobilcom.debitel.cloud.android.authentication.AuthenticatorActivity;
-import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils;
-import de.mobilcom.debitel.cloud.android.operations.DownloadFileOperation;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
-import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity;
-import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity;
-import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageActivity;
-import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageFragment;
 import eu.alefzero.webdav.WebdavClient;
 
 public class FileDownloader extends Service implements OnDatatransferProgressListener {

src/de/mobilcom/debitel/cloud/android/files/services/FileObserverService.java → src/com/owncloud/android/files/services/FileObserverService.java

@@ -16,19 +16,20 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.files.services;
+package com.owncloud.android.files.services;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.db.ProviderMeta.ProviderTableMeta;
-import de.mobilcom.debitel.cloud.android.files.OwnCloudFileObserver;
-import de.mobilcom.debitel.cloud.android.operations.SynchronizeFileOperation;
-import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
+import com.owncloud.android.files.OwnCloudFileObserver;
+import com.owncloud.android.operations.SynchronizeFileOperation;
+import com.owncloud.android.utils.FileStorageUtils;
+
 
 import android.accounts.Account;
 import android.accounts.AccountManager;

src/de/mobilcom/debitel/cloud/android/files/services/FileUploader.java → src/com/owncloud/android/files/services/FileUploader.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.files.services;
+package com.owncloud.android.files.services;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,6 +33,30 @@ import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AuthenticatorActivity;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.db.DbHandler;
+import com.owncloud.android.network.OwnCloudClientUtils;
+import com.owncloud.android.operations.ChunkedUploadFileOperation;
+import com.owncloud.android.operations.CreateFolderOperation;
+import com.owncloud.android.operations.ExistenceCheckOperation;
+import com.owncloud.android.operations.RemoteOperation;
+import com.owncloud.android.operations.RemoteOperationResult;
+import com.owncloud.android.operations.UploadFileOperation;
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.ui.activity.FailedUploadActivity;
+import com.owncloud.android.ui.activity.FileActivity;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
+import com.owncloud.android.ui.activity.InstantUploadActivity;
+import com.owncloud.android.ui.preview.PreviewImageActivity;
+import com.owncloud.android.ui.preview.PreviewImageFragment;
+import com.owncloud.android.utils.OwnCloudVersion;
+
 
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 import eu.alefzero.webdav.WebdavEntry;
@@ -57,29 +81,6 @@ import android.os.Process;
 import android.webkit.MimeTypeMap;
 import android.widget.RemoteViews;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.MainApp;
-import de.mobilcom.debitel.cloud.android.R;
-import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator;
-import de.mobilcom.debitel.cloud.android.authentication.AuthenticatorActivity;
-import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.db.DbHandler;
-import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils;
-import de.mobilcom.debitel.cloud.android.operations.ChunkedUploadFileOperation;
-import de.mobilcom.debitel.cloud.android.operations.CreateFolderOperation;
-import de.mobilcom.debitel.cloud.android.operations.ExistenceCheckOperation;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperation;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
-import de.mobilcom.debitel.cloud.android.operations.UploadFileOperation;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
-import de.mobilcom.debitel.cloud.android.ui.activity.FailedUploadActivity;
-import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity;
-import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity;
-import de.mobilcom.debitel.cloud.android.ui.activity.InstantUploadActivity;
-import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageActivity;
-import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageFragment;
-import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion;
 
 import eu.alefzero.webdav.WebdavClient;
 

src/de/mobilcom/debitel/cloud/android/files/services/OnUploadCompletedListener.java → src/com/owncloud/android/files/services/OnUploadCompletedListener.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.files.services;
+package com.owncloud.android.files.services;
 
 public interface OnUploadCompletedListener extends Runnable {
 

src/de/mobilcom/debitel/cloud/android/location/LocationServiceLauncherReciever.java → src/com/owncloud/android/location/LocationServiceLauncherReciever.java

@@ -15,9 +15,9 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package de.mobilcom.debitel.cloud.android.location;
+package com.owncloud.android.location;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
+import com.owncloud.android.Log_OC;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
@@ -35,7 +35,7 @@ public class LocationServiceLauncherReciever extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         Intent deviceTrackingIntent = new Intent();
         deviceTrackingIntent
-                .setAction("de.mobilcom.debitel.cloud.android.location.LocationUpdateService");
+                .setAction("com.owncloud.android.location.LocationUpdateService");
         SharedPreferences preferences = PreferenceManager
                 .getDefaultSharedPreferences(context);
         boolean trackDevice = preferences.getBoolean("enable_devicetracking",
@@ -58,7 +58,7 @@ public class LocationServiceLauncherReciever extends BroadcastReceiver {
     private void startOrStopDeviceTracking(Context context, boolean trackDevice) {
         Intent deviceTrackingIntent = new Intent();
         deviceTrackingIntent
-                .setAction("de.mobilcom.debitel.cloud.android.location.LocationUpdateService");
+                .setAction("com.owncloud.android.location.LocationUpdateService");
         if (!isDeviceTrackingServiceRunning(context) && trackDevice) {
             Log_OC.d(TAG, "Starting device tracker service");
             context.startService(deviceTrackingIntent);

src/de/mobilcom/debitel/cloud/android/location/LocationUpdateService.java → src/com/owncloud/android/location/LocationUpdateService.java

@@ -15,7 +15,10 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package de.mobilcom.debitel.cloud.android.location;
+package com.owncloud.android.location;
+
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
 
 import android.app.IntentService;
 import android.content.Intent;
@@ -29,8 +32,6 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.widget.Toast;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.R;
 
 public class LocationUpdateService extends IntentService implements
         LocationListener {

src/de/mobilcom/debitel/cloud/android/media/MediaControlView.java → src/com/owncloud/android/media/MediaControlView.java

@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package de.mobilcom.debitel.cloud.android.media;
+package com.owncloud.android.media;
 
 import android.content.Context;
 import android.media.MediaPlayer;
@@ -40,7 +40,8 @@ import android.widget.TextView;
 import java.util.Formatter;
 import java.util.Locale;
 
-import de.mobilcom.debitel.cloud.android.R;
+import com.owncloud.android.R;
+
 
 /**
  * View containing controls for a {@link MediaPlayer}. 

src/de/mobilcom/debitel/cloud/android/media/MediaService.java → src/com/owncloud/android/media/MediaService.java

@@ -15,7 +15,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.media;
+package com.owncloud.android.media;
 
 import android.accounts.Account;
 import android.app.Notification;
@@ -37,11 +37,12 @@ import android.widget.Toast;
 
 import java.io.IOException;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.R;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity;
-import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.ui.activity.FileActivity;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
+
 
 /**
  * Service that handles media playback, both audio and video. 
@@ -56,7 +57,7 @@ public class MediaService extends Service implements OnCompletionListener, OnPre
 
     private static final String TAG = MediaService.class.getSimpleName();
 
-    private static final String MY_PACKAGE = MediaService.class.getPackage() != null ? MediaService.class.getPackage().getName() : "de.mobilcom.debitel.cloud.android.media";
+    private static final String MY_PACKAGE = MediaService.class.getPackage() != null ? MediaService.class.getPackage().getName() : "com.owncloud.android.media";
     
     /// Intent actions that we are prepared to handle
     public static final String ACTION_PLAY_FILE = MY_PACKAGE + ".action.PLAY_FILE";

src/de/mobilcom/debitel/cloud/android/media/MediaServiceBinder.java → src/com/owncloud/android/media/MediaServiceBinder.java

@@ -15,12 +15,12 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.media;
+package com.owncloud.android.media;
 
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.media.MediaService.State;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.media.MediaService.State;
 
 import android.accounts.Account;
 import android.content.Intent;

src/de/mobilcom/debitel/cloud/android/network/AdvancedSslSocketFactory.java → src/com/owncloud/android/network/AdvancedSslSocketFactory.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.network;
+package com.owncloud.android.network;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -39,7 +39,8 @@ import org.apache.commons.httpclient.params.HttpConnectionParams;
 import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
 import org.apache.http.conn.ssl.X509HostnameVerifier;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
+import com.owncloud.android.Log_OC;
+
 
 /**
  * AdvancedSSLProtocolSocketFactory allows to create SSL {@link Socket}s with 

src/de/mobilcom/debitel/cloud/android/network/AdvancedX509TrustManager.java → src/com/owncloud/android/network/AdvancedX509TrustManager.java

@@ -15,7 +15,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.network;
+package com.owncloud.android.network;
 
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -31,7 +31,8 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
+import com.owncloud.android.Log_OC;
+
 
 /**
  * @author David A. Velasco

src/de/mobilcom/debitel/cloud/android/network/BearerAuthScheme.java → src/com/owncloud/android/network/BearerAuthScheme.java

@@ -15,7 +15,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.network;
+package com.owncloud.android.network;
 
 import java.util.Map;
 
@@ -27,7 +27,8 @@ import org.apache.commons.httpclient.auth.AuthenticationException;
 import org.apache.commons.httpclient.auth.InvalidCredentialsException;
 import org.apache.commons.httpclient.auth.MalformedChallengeException;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
+import com.owncloud.android.Log_OC;
+
 
 /**
  * Bearer authentication scheme as defined in RFC 6750.

src/de/mobilcom/debitel/cloud/android/network/BearerCredentials.java → src/com/owncloud/android/network/BearerCredentials.java

@@ -15,7 +15,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.network;
+package com.owncloud.android.network;
 
 import org.apache.commons.httpclient.Credentials;
 import org.apache.commons.httpclient.util.LangUtils;

src/de/mobilcom/debitel/cloud/android/network/CertificateCombinedException.java → src/com/owncloud/android/network/CertificateCombinedException.java

@@ -15,7 +15,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.network;
+package com.owncloud.android.network;
 
 import java.security.cert.CertPathValidatorException;
 import java.security.cert.CertificateException;

src/de/mobilcom/debitel/cloud/android/network/OwnCloudClientUtils.java → src/com/owncloud/android/network/OwnCloudClientUtils.java

@@ -14,7 +14,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package de.mobilcom.debitel.cloud.android.network;
+package com.owncloud.android.network;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -36,11 +36,12 @@ import org.apache.commons.httpclient.protocol.Protocol;
 import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
 import org.apache.http.conn.ssl.X509HostnameVerifier;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.MainApp;
-import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator;
-import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
-import de.mobilcom.debitel.cloud.android.authentication.AccountUtils.AccountNotFoundException;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
+
 
 import eu.alefzero.webdav.WebdavClient;
 

src/de/mobilcom/debitel/cloud/android/network/ProgressiveDataTransferer.java → src/com/owncloud/android/network/ProgressiveDataTransferer.java

@@ -15,7 +15,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.network;
+package com.owncloud.android.network;
 
 import java.util.Collection;
 

src/de/mobilcom/debitel/cloud/android/operations/ChunkedUploadFileOperation.java → src/com/owncloud/android/operations/ChunkedUploadFileOperation.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,9 +27,10 @@ import java.util.Random;
 import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.methods.PutMethod;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.network.ProgressiveDataTransferer;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.network.ProgressiveDataTransferer;
+
 
 import android.accounts.Account;
 

src/de/mobilcom/debitel/cloud/android/operations/CreateFolderOperation.java → src/com/owncloud/android/operations/CreateFolderOperation.java

@@ -15,16 +15,17 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 import java.io.File;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.client.methods.MkColMethod;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+
 
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;

src/de/mobilcom/debitel/cloud/android/operations/DownloadFileOperation.java → src/com/owncloud/android/operations/DownloadFileOperation.java

@@ -15,7 +15,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -32,11 +32,12 @@ import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.http.HttpStatus;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperation;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
-import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.operations.RemoteOperation;
+import com.owncloud.android.operations.RemoteOperationResult;
+import com.owncloud.android.utils.FileStorageUtils;
+
 
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 import eu.alefzero.webdav.WebdavClient;

src/de/mobilcom/debitel/cloud/android/operations/ExistenceCheckOperation.java → src/com/owncloud/android/operations/ExistenceCheckOperation.java

@@ -15,12 +15,13 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.HeadMethod;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
+import com.owncloud.android.Log_OC;
+
 
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;

src/de/mobilcom/debitel/cloud/android/operations/OAuth2GetAccessToken.java → src/com/owncloud/android/operations/OAuth2GetAccessToken.java

@@ -1,4 +1,4 @@
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -8,9 +8,10 @@ import org.apache.commons.httpclient.NameValuePair;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.authentication.OAuth2Constants;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.authentication.OAuth2Constants;
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+
 
 import eu.alefzero.webdav.WebdavClient;
 

src/de/mobilcom/debitel/cloud/android/operations/OnRemoteOperationListener.java → src/com/owncloud/android/operations/OnRemoteOperationListener.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 public interface OnRemoteOperationListener {
 

src/de/mobilcom/debitel/cloud/android/operations/OperationCancelledException.java → src/com/owncloud/android/operations/OperationCancelledException.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 public class OperationCancelledException extends Exception {
 

src/de/mobilcom/debitel/cloud/android/operations/OwnCloudServerCheckOperation.java → src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java

@@ -15,16 +15,17 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
-import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.utils.OwnCloudVersion;
+
 
 import eu.alefzero.webdav.WebdavClient;
 import android.content.Context;

src/de/mobilcom/debitel/cloud/android/operations/RemoteOperation.java → src/com/owncloud/android/operations/RemoteOperation.java

@@ -14,17 +14,18 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 import java.io.IOException;
 
 import org.apache.commons.httpclient.Credentials;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.MainApp;
-import de.mobilcom.debitel.cloud.android.network.BearerCredentials;
-import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.network.BearerCredentials;
+import com.owncloud.android.network.OwnCloudClientUtils;
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+
 
 import android.accounts.Account;
 import android.accounts.AccountManager;

src/de/mobilcom/debitel/cloud/android/operations/RemoteOperationResult.java → src/com/owncloud/android/operations/RemoteOperationResult.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -33,12 +33,13 @@ import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.DavException;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
+import com.owncloud.android.network.CertificateCombinedException;
+
 import android.accounts.Account;
 import android.accounts.AccountsException;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.authentication.AccountUtils.AccountNotFoundException;
-import de.mobilcom.debitel.cloud.android.network.CertificateCombinedException;
 
 /**
  * The result of a remote operation required to an ownCloud server.

src/de/mobilcom/debitel/cloud/android/operations/RemoveFileOperation.java → src/com/owncloud/android/operations/RemoveFileOperation.java

@@ -15,14 +15,15 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+
 
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;

src/de/mobilcom/debitel/cloud/android/operations/RenameFileOperation.java → src/com/owncloud/android/operations/RenameFileOperation.java

@@ -15,21 +15,22 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.jackrabbit.webdav.client.methods.DavMethodBase;
+
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.utils.FileStorageUtils;
 //import org.apache.jackrabbit.webdav.client.methods.MoveMethod;
 
 import android.accounts.Account;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
-import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;

src/de/mobilcom/debitel/cloud/android/operations/SynchronizeFileOperation.java → src/com/owncloud/android/operations/SynchronizeFileOperation.java

@@ -16,23 +16,24 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 import org.apache.http.HttpStatus;
 import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.files.services.FileDownloader;
+import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+
 import android.accounts.Account;
 import android.content.Context;
 import android.content.Intent;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.files.services.FileDownloader;
-import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
 
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavEntry;

src/de/mobilcom/debitel/cloud/android/operations/SynchronizeFolderOperation.java → src/com/owncloud/android/operations/SynchronizeFolderOperation.java

@@ -15,7 +15,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,14 +33,15 @@ import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.utils.FileStorageUtils;
+
 import android.accounts.Account;
 import android.content.Context;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
-import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavEntry;

src/de/mobilcom/debitel/cloud/android/operations/UpdateOCVersionOperation.java → src/com/owncloud/android/operations/UpdateOCVersionOperation.java

@@ -15,22 +15,23 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.utils.OwnCloudVersion;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.Context;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator;
-import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
-import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion;
 
 import eu.alefzero.webdav.WebdavClient;
 

src/de/mobilcom/debitel/cloud/android/operations/UploadFileOperation.java → src/com/owncloud/android/operations/UploadFileOperation.java

@@ -15,7 +15,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.operations;
+package com.owncloud.android.operations;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -32,16 +32,17 @@ import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.methods.RequestEntity;
 import org.apache.http.HttpStatus;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.network.ProgressiveDataTransferer;
+import com.owncloud.android.operations.RemoteOperation;
+import com.owncloud.android.operations.RemoteOperationResult;
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.utils.FileStorageUtils;
+
 import android.accounts.Account;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
-import de.mobilcom.debitel.cloud.android.network.ProgressiveDataTransferer;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperation;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
-import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 import eu.alefzero.webdav.FileRequestEntity;
 import eu.alefzero.webdav.OnDatatransferProgressListener;

src/de/mobilcom/debitel/cloud/android/providers/FileContentProvider.java → src/com/owncloud/android/providers/FileContentProvider.java

@@ -16,14 +16,15 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.providers;
+package com.owncloud.android.providers;
 
 import java.util.HashMap;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.R;
-import de.mobilcom.debitel.cloud.android.db.ProviderMeta;
-import de.mobilcom.debitel.cloud.android.db.ProviderMeta.ProviderTableMeta;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
+import com.owncloud.android.db.ProviderMeta;
+import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
+
 
 
 import android.content.ContentProvider;

src/de/mobilcom/debitel/cloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java → src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.syncadapter;
+package com.owncloud.android.syncadapter;
 
 import java.io.IOException;
 import java.util.Date;
@@ -27,10 +27,11 @@ import org.apache.http.client.ClientProtocolException;
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
 import org.apache.http.protocol.HttpContext;
 
-import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
-import de.mobilcom.debitel.cloud.android.authentication.AccountUtils.AccountNotFoundException;
-import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
-import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
+import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.network.OwnCloudClientUtils;
+
 
 import android.accounts.Account;
 import android.accounts.AccountManager;

src/de/mobilcom/debitel/cloud/android/syncadapter/ContactSyncAdapter.java → src/com/owncloud/android/syncadapter/ContactSyncAdapter.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.syncadapter;
+package com.owncloud.android.syncadapter;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -24,8 +24,9 @@ import java.io.IOException;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.ByteArrayEntity;
 
-import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator;
-import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
+import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountUtils;
+
 
 import android.accounts.Account;
 import android.accounts.AccountManager;

src/de/mobilcom/debitel/cloud/android/syncadapter/ContactSyncService.java → src/com/owncloud/android/syncadapter/ContactSyncService.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.syncadapter;
+package com.owncloud.android.syncadapter;
 
 import android.app.Service;
 import android.content.Intent;

src/de/mobilcom/debitel/cloud/android/syncadapter/FileSyncAdapter.java → src/com/owncloud/android/syncadapter/FileSyncAdapter.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.syncadapter;
+package com.owncloud.android.syncadapter;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -26,18 +26,19 @@ import java.util.Map;
 
 import org.apache.jackrabbit.webdav.DavException;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.MainApp;
-import de.mobilcom.debitel.cloud.android.R;
-import de.mobilcom.debitel.cloud.android.authentication.AuthenticatorActivity;
-import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
-import de.mobilcom.debitel.cloud.android.operations.SynchronizeFolderOperation;
-import de.mobilcom.debitel.cloud.android.operations.UpdateOCVersionOperation;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
-import de.mobilcom.debitel.cloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.AuthenticatorActivity;
+import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.operations.RemoteOperationResult;
+import com.owncloud.android.operations.SynchronizeFolderOperation;
+import com.owncloud.android.operations.UpdateOCVersionOperation;
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;
+
 
 import android.accounts.Account;
 import android.accounts.AccountsException;

src/de/mobilcom/debitel/cloud/android/syncadapter/FileSyncService.java → src/com/owncloud/android/syncadapter/FileSyncService.java

@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package de.mobilcom.debitel.cloud.android.syncadapter;
+package com.owncloud.android.syncadapter;
 
 import android.app.Service;
 import android.content.Intent;

src/de/mobilcom/debitel/cloud/android/ui/ActionItem.java → src/com/owncloud/android/ui/ActionItem.java

@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package de.mobilcom.debitel.cloud.android.ui;
+package com.owncloud.android.ui;
 
 import android.graphics.drawable.Drawable;
 import android.view.View.OnClickListener;

src/de/mobilcom/debitel/cloud/android/ui/CustomButton.java → src/com/owncloud/android/ui/CustomButton.java

@@ -1,6 +1,7 @@
-package de.mobilcom.debitel.cloud.android.ui;
+package com.owncloud.android.ui;
+
+import com.owncloud.android.R;
 
-import de.mobilcom.debitel.cloud.android.R;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.widget.Button;

src/de/mobilcom/debitel/cloud/android/ui/CustomPopup.java → src/com/owncloud/android/ui/CustomPopup.java

@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package de.mobilcom.debitel.cloud.android.ui;
+package com.owncloud.android.ui;
 
 import android.content.Context;
 import android.graphics.Rect;

src/de/mobilcom/debitel/cloud/android/ui/ExtendedListView.java → src/com/owncloud/android/ui/ExtendedListView.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.ui;
+package com.owncloud.android.ui;
 
 import android.content.Context;
 import android.graphics.Canvas;

src/de/mobilcom/debitel/cloud/android/ui/QuickAction.java → src/com/owncloud/android/ui/QuickAction.java

@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package de.mobilcom.debitel.cloud.android.ui;
+package com.owncloud.android.ui;
 
 import android.content.Context;
 
@@ -36,7 +36,8 @@ import android.view.ViewGroup;
 
 import java.util.ArrayList;
 
-import de.mobilcom.debitel.cloud.android.R;
+import com.owncloud.android.R;
+
 
 /**
  * Popup window, shows action list as icon and text like the one in Gallery3D

src/de/mobilcom/debitel/cloud/android/ui/activity/AccountSelectActivity.java → src/com/owncloud/android/ui/activity/AccountSelectActivity.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.ui.activity;
+package com.owncloud.android.ui.activity;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -47,13 +47,13 @@ import com.actionbarsherlock.app.SherlockListActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.authentication.AuthenticatorActivity;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.MainApp;
-import de.mobilcom.debitel.cloud.android.R;
-import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator;
-import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
-import de.mobilcom.debitel.cloud.android.authentication.AuthenticatorActivity;
 
 public class AccountSelectActivity extends SherlockListActivity implements
         AccountManagerCallback<Boolean> {

src/de/mobilcom/debitel/cloud/android/ui/activity/ConflictsResolveActivity.java → src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java

@@ -16,16 +16,16 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.ui.activity;
+package com.owncloud.android.ui.activity;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
-import de.mobilcom.debitel.cloud.android.ui.dialog.ConflictsResolveDialog;
-import de.mobilcom.debitel.cloud.android.ui.dialog.ConflictsResolveDialog.Decision;
-import de.mobilcom.debitel.cloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionMadeListener;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.ui.dialog.ConflictsResolveDialog;
+import com.owncloud.android.ui.dialog.ConflictsResolveDialog.Decision;
+import com.owncloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionMadeListener;
 
 import android.content.Intent;
 import android.os.Bundle;

src/de/mobilcom/debitel/cloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java → src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java

@@ -15,7 +15,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.ui.activity;
+package com.owncloud.android.ui.activity;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -38,14 +38,14 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.ui.CustomButton;
+import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
+import com.owncloud.android.utils.FileStorageUtils;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.R;
-import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.ui.CustomButton;
-import de.mobilcom.debitel.cloud.android.ui.dialog.IndeterminateProgressDialog;
-import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 
 /**

src/de/mobilcom/debitel/cloud/android/ui/activity/FailedUploadActivity.java → src/com/owncloud/android/ui/activity/FailedUploadActivity.java

@@ -15,7 +15,10 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.ui.activity;
+package com.owncloud.android.ui.activity;
+
+import com.owncloud.android.R;
+import com.owncloud.android.ui.CustomButton;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -23,8 +26,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
 
-import de.mobilcom.debitel.cloud.android.R;
-import de.mobilcom.debitel.cloud.android.ui.CustomButton;
 
 /**
  * This Activity is used to display a detail message for failed uploads

src/de/mobilcom/debitel/cloud/android/ui/activity/FileActivity.java → src/com/owncloud/android/ui/activity/FileActivity.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.ui.activity;
+package com.owncloud.android.ui.activity;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -29,12 +29,12 @@ import android.os.Bundle;
 import android.webkit.MimeTypeMap;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.datamodel.OCFile;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.MainApp;
-import de.mobilcom.debitel.cloud.android.R;
-import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
 
 import eu.alefzero.webdav.WebdavUtils;
 
@@ -45,9 +45,9 @@ import eu.alefzero.webdav.WebdavUtils;
  */
 public abstract class FileActivity extends SherlockFragmentActivity {
 
-    public static final String EXTRA_FILE = "de.mobilcom.debitel.cloud.android.ui.activity.FILE";
-    public static final String EXTRA_ACCOUNT = "de.mobilcom.debitel.cloud.android.ui.activity.ACCOUNT";
-    public static final String EXTRA_WAITING_TO_PREVIEW = "de.mobilcom.debitel.cloud.android.ui.activity.WAITING_TO_PREVIEW";
+    public static final String EXTRA_FILE = "com.owncloud.android.ui.activity.FILE";
+    public static final String EXTRA_ACCOUNT = "com.owncloud.android.ui.activity.ACCOUNT";
+    public static final String EXTRA_WAITING_TO_PREVIEW = "com.owncloud.android.ui.activity.WAITING_TO_PREVIEW";
     
     public static final String TAG = FileActivity.class.getSimpleName(); 
     

src/de/mobilcom/debitel/cloud/android/ui/activity/FileDisplayActivity.java → src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -16,7 +16,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.ui.activity;
+package com.owncloud.android.ui.activity;
 
 import java.io.File;
 
@@ -57,38 +57,38 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.files.services.FileDownloader;
+import com.owncloud.android.files.services.FileObserverService;
+import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
+import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
+import com.owncloud.android.operations.CreateFolderOperation;
+import com.owncloud.android.operations.OnRemoteOperationListener;
+import com.owncloud.android.operations.RemoteOperation;
+import com.owncloud.android.operations.RemoteOperationResult;
+import com.owncloud.android.operations.RemoveFileOperation;
+import com.owncloud.android.operations.RenameFileOperation;
+import com.owncloud.android.operations.SynchronizeFileOperation;
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.syncadapter.FileSyncService;
+import com.owncloud.android.ui.dialog.EditNameDialog;
+import com.owncloud.android.ui.dialog.LoadingDialog;
+import com.owncloud.android.ui.dialog.SslValidatorDialog;
+import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
+import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
+import com.owncloud.android.ui.fragment.FileDetailFragment;
+import com.owncloud.android.ui.fragment.FileFragment;
+import com.owncloud.android.ui.fragment.OCFileListFragment;
+import com.owncloud.android.ui.preview.PreviewImageActivity;
+import com.owncloud.android.ui.preview.PreviewMediaFragment;
+import com.owncloud.android.ui.preview.PreviewVideoActivity;
 
-import de.mobilcom.debitel.cloud.android.Log_OC;
-import de.mobilcom.debitel.cloud.android.MainApp;
-import de.mobilcom.debitel.cloud.android.R;
-import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
-import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
-import de.mobilcom.debitel.cloud.android.files.services.FileDownloader;
-import de.mobilcom.debitel.cloud.android.files.services.FileObserverService;
-import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
-import de.mobilcom.debitel.cloud.android.files.services.FileDownloader.FileDownloaderBinder;
-import de.mobilcom.debitel.cloud.android.files.services.FileUploader.FileUploaderBinder;
-import de.mobilcom.debitel.cloud.android.operations.CreateFolderOperation;
-import de.mobilcom.debitel.cloud.android.operations.OnRemoteOperationListener;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperation;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
-import de.mobilcom.debitel.cloud.android.operations.RemoveFileOperation;
-import de.mobilcom.debitel.cloud.android.operations.RenameFileOperation;
-import de.mobilcom.debitel.cloud.android.operations.SynchronizeFileOperation;
-import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
-import de.mobilcom.debitel.cloud.android.syncadapter.FileSyncService;
-import de.mobilcom.debitel.cloud.android.ui.dialog.EditNameDialog;
-import de.mobilcom.debitel.cloud.android.ui.dialog.LoadingDialog;
-import de.mobilcom.debitel.cloud.android.ui.dialog.SslValidatorDialog;
-import de.mobilcom.debitel.cloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
-import de.mobilcom.debitel.cloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
-import de.mobilcom.debitel.cloud.android.ui.fragment.FileDetailFragment;
-import de.mobilcom.debitel.cloud.android.ui.fragment.FileFragment;
-import de.mobilcom.debitel.cloud.android.ui.fragment.OCFileListFragment;
-import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageActivity;
-import de.mobilcom.debitel.cloud.android.ui.preview.PreviewMediaFragment;
-import de.mobilcom.debitel.cloud.android.ui.preview.PreviewVideoActivity;
 
 /**
  * Displays, what files the user has available in his ownCloud.
@@ -126,7 +126,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     
     private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
 
-    public static final String ACTION_DETAILS = "de.mobilcom.debitel.cloud.android.ui.activity.action.DETAILS";
+    public static final String ACTION_DETAILS = "com.owncloud.android.ui.activity.action.DETAILS";
 
     private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;
     private static final int ACTION_SELECT_MULTIPLE_FILES = 2;

src/de/mobilcom/debitel/cloud/android/ui/activity/GenericExplanationActivity.java → src/com/owncloud/android/ui/activity/GenericExplanationActivity.java

@@ -15,7 +15,7 @@
  *
  */
 
-package de.mobilcom.debitel.cloud.android.ui.activity;
+package com.owncloud.android.ui.activity;
 
 import java.util.ArrayList;
 
@@ -31,8 +31,8 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.owncloud.android.R;
 
-import de.mobilcom.debitel.cloud.android.R;
 
 /**
  * Activity showing a text message and, optionally, a couple list of single or paired text strings.