moving from eu.alefzero.eu to com.owncloud.android

AndroidManifest.xml

@@ -16,7 +16,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="eu.alefzero.owncloud"
+<manifest package="com.owncloud.android"
     android:versionCode="103000"
     android:versionName="1.3.0" xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -123,11 +123,6 @@
 
         <service android:name=".files.services.FileDownloader" >
         </service>
-        <service android:name=".location.LocationUpdateService" >
-            <intent-filter>
-                <action android:name="eu.alefzero.owncloud.location.LocationUpdateService" />
-            </intent-filter>
-        </service>
 
         <activity android:name=".ui.activity.FileDetailActivity" />
         <activity android:name=".ui.activity.PinCodeActivity" />

res/layout-land/account_setup.xml

@@ -17,7 +17,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:oc="http://schemas.android.com/apk/res/eu.alefzero.owncloud"
+    xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:focusable="true"
@@ -174,4 +174,4 @@
         </LinearLayout>
     </RelativeLayout>
 
-</LinearLayout>
+</LinearLayout>

res/layout-large-land/files.xml

@@ -32,7 +32,7 @@
             android:id="@+id/fileList"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            class="eu.alefzero.owncloud.ui.fragment.FileListFragment" >
+            class="com.owncloud.android.ui.fragment.FileListFragment" >
 
             <!-- Preview: layout=@layout/list_layout -->
         </fragment>
@@ -46,4 +46,4 @@
         <!-- Preview: layout=@layout/file_details_empty -->
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>

res/layout/account_setup.xml

@@ -17,7 +17,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:oc="http://schemas.android.com/apk/res/eu.alefzero.owncloud"
+    xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:focusable="true"
@@ -175,4 +175,4 @@
         </LinearLayout>
     </RelativeLayout>
 
-</LinearLayout>
+</LinearLayout>

res/layout/files.xml

@@ -27,9 +27,9 @@
         android:id="@+id/fileList"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        class="eu.alefzero.owncloud.ui.fragment.FileListFragment" >
+        class="com.owncloud.android.ui.fragment.FileListFragment" >
 
         <!-- Preview: layout=@layout/list_layout -->
     </fragment>
 
-</LinearLayout>
+</LinearLayout>

res/layout/pincodelock.xml

@@ -16,7 +16,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:oc="http://schemas.android.com/apk/res/eu.alefzero.owncloud"
+    xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:gravity="center_horizontal"
@@ -62,4 +62,4 @@
         android:text="@android:string/cancel"
         android:textColor="@android:color/black"
         android:id="@+id/cancel"/>
-</LinearLayout>
+</LinearLayout>

src/eu/alefzero/owncloud/AccountUtils.java → src/com/owncloud/android/AccountUtils.java

@@ -16,10 +16,10 @@
  *
  */
 
-package eu.alefzero.owncloud;
+package com.owncloud.android;
 
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.utils.OwnCloudVersion;
+import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.utils.OwnCloudVersion;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;

src/eu/alefzero/owncloud/CrashHandler.java → src/com/owncloud/android/CrashHandler.java

@@ -16,7 +16,7 @@
  *
  */
 
-package eu.alefzero.owncloud;
+package com.owncloud.android;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -29,7 +29,8 @@ import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.LinkedList;
 import java.util.List;
 
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
+import com.owncloud.android.authenticator.AccountAuthenticator;
+
 
 import android.accounts.Account;
 import android.accounts.AccountManager;

src/eu/alefzero/owncloud/CrashlogSendActivity.java → src/com/owncloud/android/CrashlogSendActivity.java

@@ -16,13 +16,11 @@
  *
  */
 
-package eu.alefzero.owncloud;
+package com.owncloud.android;
 
 import java.io.File;
-import java.io.IOException;
 
 import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.multipart.FilePart;
 import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
@@ -38,7 +36,7 @@ import android.util.Log;
 
 import com.actionbarsherlock.app.SherlockActivity;
 
-import eu.alefzero.webdav.FileRequestEntity;
+import com.owncloud.android.R;
 
 public class CrashlogSendActivity extends SherlockActivity implements OnClickListener, OnCancelListener {
     

src/eu/alefzero/owncloud/DisplayUtils.java → src/com/owncloud/android/DisplayUtils.java

@@ -16,7 +16,7 @@
  *
  */
 
-package eu.alefzero.owncloud;
+package com.owncloud.android;
 
 import java.util.Date;
 import java.util.HashMap;

src/eu/alefzero/owncloud/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 eu.alefzero.owncloud;
+package com.owncloud.android;
 
 /**
  * Represents a session to an ownCloud instance

src/eu/alefzero/owncloud/Uploader.java → src/com/owncloud/android/Uploader.java

@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package eu.alefzero.owncloud;
+package com.owncloud.android;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -25,6 +25,12 @@ import java.util.List;
 import java.util.Stack;
 import java.util.Vector;
 
+import com.owncloud.android.authenticator.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 android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.AlertDialog;
@@ -50,11 +56,7 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.SimpleAdapter;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.datamodel.DataStorageManager;
-import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
-import eu.alefzero.owncloud.datamodel.OCFile;
-import eu.alefzero.owncloud.files.services.FileUploader;
+import com.owncloud.android.R;
 import eu.alefzero.webdav.WebdavClient;
 
 /**

src/eu/alefzero/owncloud/authenticator/AccountAuthenticator.java → src/com/owncloud/android/authenticator/AccountAuthenticator.java

@@ -16,9 +16,10 @@
  *
  */
 
-package eu.alefzero.owncloud.authenticator;
+package com.owncloud.android.authenticator;
+
+import com.owncloud.android.ui.activity.AuthenticatorActivity;
 
-import eu.alefzero.owncloud.ui.activity.AuthenticatorActivity;
 import android.accounts.*;
 import android.content.Context;
 import android.content.Intent;
@@ -41,14 +42,14 @@ 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 eu.alefzero.owncloud.authenticator.KEY_OC_BASE_URL} and
-     * {@link eu.alefzero.owncloud.utils.OwnCloudVersion}
+     * {@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 eu.alefzero.owncloud.utils.OwnCloudVersion}
+     * {@link com.owncloud.android.utils.OwnCloudVersion}
      */
     public static final String KEY_OC_VERSION = "oc_version";
     /**

src/eu/alefzero/owncloud/authenticator/AccountAuthenticatorService.java → src/com/owncloud/android/authenticator/AccountAuthenticatorService.java

@@ -16,7 +16,7 @@
  *
  */
 
-package eu.alefzero.owncloud.authenticator;
+package com.owncloud.android.authenticator;
 
 import android.app.Service;
 import android.content.Intent;

src/eu/alefzero/owncloud/authenticator/AuthenticationRunnable.java → src/com/owncloud/android/authenticator/AuthenticationRunnable.java

@@ -16,7 +16,7 @@
  *
  */
 
-package eu.alefzero.owncloud.authenticator;
+package com.owncloud.android.authenticator;
 
 import java.net.URL;
 

src/eu/alefzero/owncloud/authenticator/ConnectionCheckerRunnable.java → src/com/owncloud/android/authenticator/ConnectionCheckerRunnable.java

@@ -16,7 +16,7 @@
  *
  */
 
-package eu.alefzero.owncloud.authenticator;
+package com.owncloud.android.authenticator;
 
 import java.net.ConnectException;
 import java.net.SocketTimeoutException;
@@ -29,9 +29,10 @@ import org.apache.commons.httpclient.methods.GetMethod;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.authenticator.OnConnectCheckListener.ResultType;
-import eu.alefzero.owncloud.utils.OwnCloudVersion;
+import com.owncloud.android.AccountUtils;
+import com.owncloud.android.authenticator.OnConnectCheckListener.ResultType;
+import com.owncloud.android.utils.OwnCloudVersion;
+
 import eu.alefzero.webdav.WebdavClient;
 import android.content.Context;
 import android.net.ConnectivityManager;

src/eu/alefzero/owncloud/authenticator/EasySSLSocketFactory.java → src/com/owncloud/android/authenticator/EasySSLSocketFactory.java

@@ -28,7 +28,7 @@
  *
  */
 
-package eu.alefzero.owncloud.authenticator;
+package com.owncloud.android.authenticator;
 
 import java.io.IOException;
 import java.net.InetAddress;

src/eu/alefzero/owncloud/authenticator/EasyX509TrustManager.java → src/com/owncloud/android/authenticator/EasyX509TrustManager.java

@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.authenticator;
+package com.owncloud.android.authenticator;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/eu/alefzero/owncloud/authenticator/OnAuthenticationResultListener.java → src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java

@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.authenticator;
+package com.owncloud.android.authenticator;
 
 public interface OnAuthenticationResultListener {
 

src/eu/alefzero/owncloud/authenticator/OnConnectCheckListener.java → src/com/owncloud/android/authenticator/OnConnectCheckListener.java

@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.authenticator;
+package com.owncloud.android.authenticator;
 
 public interface OnConnectCheckListener {
 

src/eu/alefzero/owncloud/datamodel/DataStorageManager.java → src/com/owncloud/android/datamodel/DataStorageManager.java

@@ -16,7 +16,7 @@
  *
  */
 
-package eu.alefzero.owncloud.datamodel;
+package com.owncloud.android.datamodel;
 
 import java.util.List;
 import java.util.Vector;

src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java → src/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -16,7 +16,7 @@
  *
  */
 
-package eu.alefzero.owncloud.datamodel;
+package com.owncloud.android.datamodel;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -25,9 +25,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
 
-import eu.alefzero.owncloud.db.ProviderMeta;
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
-import eu.alefzero.owncloud.files.services.FileDownloader;
+import com.owncloud.android.db.ProviderMeta;
+import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
+import com.owncloud.android.files.services.FileDownloader;
+
 import android.accounts.Account;
 import android.content.ContentProviderClient;
 import android.content.ContentProviderOperation;

src/eu/alefzero/owncloud/datamodel/OCFile.java → src/com/owncloud/android/datamodel/OCFile.java

@@ -16,13 +16,14 @@
  *
  */
 
-package eu.alefzero.owncloud.datamodel;
+package com.owncloud.android.datamodel;
 
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import eu.alefzero.owncloud.files.services.FileDownloader;
+import com.owncloud.android.files.services.FileDownloader;
+
 
 import android.net.Uri;
 import android.os.Parcel;

src/eu/alefzero/owncloud/db/DbHandler.java → src/com/owncloud/android/db/DbHandler.java

@@ -15,11 +15,12 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package eu.alefzero.owncloud.db;
+package com.owncloud.android.db;
 
 import java.util.Vector;
 
-import eu.alefzero.owncloud.OwnCloudSession;
+import com.owncloud.android.OwnCloudSession;
+
 
 import android.content.ContentValues;
 import android.content.Context;

src/eu/alefzero/owncloud/db/ProviderMeta.java → src/com/owncloud/android/db/ProviderMeta.java

@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package eu.alefzero.owncloud.db;
+package com.owncloud.android.db;
 
 import android.net.Uri;
 import android.provider.BaseColumns;

src/eu/alefzero/owncloud/extensions/ExtensionsAvailableActivity.java → src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java

@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.extensions;
+package com.owncloud.android.extensions;
 
 import android.os.Bundle;
 import android.support.v4.app.FragmentManager;

src/eu/alefzero/owncloud/extensions/ExtensionsAvailableDialog.java → src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java

@@ -1,6 +1,6 @@
-package eu.alefzero.owncloud.extensions;
+package com.owncloud.android.extensions;
 
-import eu.alefzero.owncloud.R;
+import com.owncloud.android.R;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;

src/eu/alefzero/owncloud/extensions/ExtensionsListActivity.java → src/com/owncloud/android/extensions/ExtensionsListActivity.java

@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.extensions;
+package com.owncloud.android.extensions;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -10,7 +10,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import eu.alefzero.owncloud.utils.OwnCloudVersion;
+import com.owncloud.android.utils.OwnCloudVersion;
+
 
 import android.R;
 import android.app.Activity;

src/eu/alefzero/owncloud/files/PhotoTakenBroadcastReceiver.java → src/com/owncloud/android/files/PhotoTakenBroadcastReceiver.java

@@ -16,15 +16,16 @@
  *
  */
 
-package eu.alefzero.owncloud.files;
+package com.owncloud.android.files;
 
 import java.io.File;
 
-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.db.DbHandler;
-import eu.alefzero.owncloud.files.services.InstantUploadService;
+import com.owncloud.android.AccountUtils;
+import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.db.DbHandler;
+import com.owncloud.android.files.services.InstantUploadService;
+
+import com.owncloud.android.R;
 import android.accounts.Account;
 import android.content.BroadcastReceiver;
 import android.content.Context;

src/eu/alefzero/owncloud/files/interfaces/OnDatatransferProgressListener.java → src/com/owncloud/android/files/interfaces/OnDatatransferProgressListener.java

@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.files.interfaces;
+package com.owncloud.android.files.interfaces;
 
 public interface OnDatatransferProgressListener {
     void transferProgress(long progressRate);

src/com/owncloud/android/files/managers/OCNotificationManager.java

@@ -0,0 +1,154 @@
+/* ownCloud Android client application
+ *   Copyright (C) 2012  Bartek Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.files.managers;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.widget.RemoteViews;
+
+import com.owncloud.android.R;
+
+public class OCNotificationManager {
+
+    enum NotificationType {
+        NOTIFICATION_SIMPLE,
+        NOTIFICATION_PROGRESS
+    }
+    
+    static public class NotificationData {
+        private String mText, mSubtitle;
+        private int mPercent;
+        private boolean mOngoing;
+
+        public NotificationData(String text, String subtitle, boolean ongoing) {
+            this(text, subtitle, -1, ongoing);
+        }
+        
+        public NotificationData(int percent, boolean ongoing) {
+            this(null, null, percent, ongoing);
+        }
+        
+        public NotificationData(String text, int percent, boolean ongoing) {
+            this(text, null, percent, ongoing);
+        }
+        
+        public NotificationData(String text, String subtitle, int percent, boolean ongoing) {
+            mText = text;
+            mPercent = percent;
+            mSubtitle = subtitle;
+            mOngoing = ongoing;
+        }
+        
+        public String getText() { return mText; }
+        public int getPercent() { return mPercent; }
+        public String getSubtitle() { return mSubtitle; }
+        public boolean getOngoing() { return mOngoing; }
+    }
+    
+    static private OCNotificationManager mInstance = null;
+
+    private class NotificationTypePair {
+        public Notification mNotificaiton;
+        public NotificationType mType;
+        public NotificationTypePair(Notification n, NotificationType type) {
+            mNotificaiton = n;
+            mType = type;
+        }
+    }
+    
+    private Context mContext;
+    private Map<Integer, NotificationTypePair> mNotificationMap;
+    private int mNotificationCounter;
+    NotificationManager mNM;
+    
+    static OCNotificationManager getInstance(Context context) {
+        if (mInstance == null)
+            mInstance = new OCNotificationManager(context);
+        return mInstance;
+    }
+    
+    OCNotificationManager(Context context) {
+        mContext = context;
+        mNotificationMap = new HashMap<Integer, NotificationTypePair>();
+        mNM = (NotificationManager)mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+        mNotificationCounter = 0;
+    }
+    
+    public int postNotification(NotificationType type, NotificationData data) {
+        mNotificationCounter++;
+        Notification notification = null;
+        
+        switch (type) {
+            case NOTIFICATION_SIMPLE:
+                notification = new Notification(R.drawable.icon, data.getText(), System.currentTimeMillis());
+                break;
+            case NOTIFICATION_PROGRESS:
+                notification = new Notification();
+                notification.contentView = new RemoteViews(mContext.getPackageName(), R.layout.progressbar_layout);
+                notification.contentView.setTextViewText(R.id.status_text,
+                                                         data.getText());
+                notification.contentView.setImageViewResource(R.id.status_icon,
+                                                              R.id.icon);
+                notification.contentView.setProgressBar(R.id.status_progress,
+                                                        100,
+                                                        data.getPercent(),
+                                                        false);
+                break;
+            default:
+                return -1;
+        }
+        if (data.getOngoing()) {
+            notification.flags |= notification.flags | Notification.FLAG_ONGOING_EVENT;
+        }
+        
+        mNotificationMap.put(mNotificationCounter, new NotificationTypePair(notification, type));
+        return mNotificationCounter;
+    }
+    
+    public boolean updateNotification(int notification_id, NotificationData data) {
+        if (!mNotificationMap.containsKey(notification_id)) {
+            return false;
+        }
+        NotificationTypePair pair = mNotificationMap.get(notification_id);
+        switch (pair.mType) {
+            case NOTIFICATION_PROGRESS:
+                pair.mNotificaiton.contentView.setProgressBar(R.id.status_text,
+                                                              100,
+                                                              data.getPercent(),
+                                                              false);
+                return true;
+            case NOTIFICATION_SIMPLE:
+                pair.mNotificaiton = new Notification(R.drawable.icon,
+                                                      data.getText(), System.currentTimeMillis());
+                mNM.notify(notification_id, pair.mNotificaiton);
+                return true;
+            default:
+                return false;
+        }
+    }
+    
+    public void discardNotification(int notification_id) {
+        mNM.cancel(notification_id);
+        mNotificationMap.remove(notification_id);
+    }
+}

src/eu/alefzero/owncloud/files/services/FileDownloader.java → src/com/owncloud/android/files/services/FileDownloader.java

@@ -1,10 +1,14 @@
-package eu.alefzero.owncloud.files.services;
+package com.owncloud.android.files.services;
 
 import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
+import com.owncloud.android.files.interfaces.OnDatatransferProgressListener;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Notification;
@@ -23,10 +27,7 @@ import android.os.Message;
 import android.os.Process;
 import android.util.Log;
 import android.widget.RemoteViews;
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
-import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener;
+import com.owncloud.android.R;
 import eu.alefzero.webdav.WebdavClient;
 
 public class FileDownloader extends Service implements OnDatatransferProgressListener {

src/eu/alefzero/owncloud/files/services/FileOperation.java → src/com/owncloud/android/files/services/FileOperation.java

@@ -15,14 +15,15 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package eu.alefzero.owncloud.files.services;
+package com.owncloud.android.files.services;
 
 import java.io.File;
 
+import com.owncloud.android.AccountUtils;
+import com.owncloud.android.datamodel.OCFile;
+
 import android.accounts.Account;
 import android.content.Context;
-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.datamodel.OCFile;
 import eu.alefzero.webdav.WebdavClient;
 
 public class FileOperation {

src/eu/alefzero/owncloud/files/services/FileUploader.java → src/com/owncloud/android/files/services/FileUploader.java

@@ -1,10 +1,14 @@
-package eu.alefzero.owncloud.files.services;
+package com.owncloud.android.files.services;
 
 import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.files.interfaces.OnDatatransferProgressListener;
+
 import android.accounts.Account;
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -20,10 +24,7 @@ import android.os.Process;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
 import android.widget.RemoteViews;
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
-import eu.alefzero.owncloud.datamodel.OCFile;
-import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener;
+import com.owncloud.android.R;
 import eu.alefzero.webdav.WebdavClient;
 
 public class FileUploader extends Service implements OnDatatransferProgressListener {
@@ -154,7 +155,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
         wc.setDataTransferProgressListener(this);
 
         /// create status notification to show the upload progress
-        mNotification = new Notification(eu.alefzero.owncloud.R.drawable.icon, getString(R.string.uploader_upload_in_progress_ticker), System.currentTimeMillis());
+        mNotification = new Notification(R.drawable.icon, getString(R.string.uploader_upload_in_progress_ticker), System.currentTimeMillis());
         mNotification.flags |= Notification.FLAG_ONGOING_EVENT;
         RemoteViews oldContentView = mNotification.contentView;
         mNotification.contentView = new RemoteViews(getApplicationContext().getPackageName(), R.layout.progressbar_layout);

src/eu/alefzero/owncloud/files/services/InstantUploadService.java → src/com/owncloud/android/files/services/InstantUploadService.java

@@ -16,7 +16,7 @@
  *
  */
 
-package eu.alefzero.owncloud.files.services;
+package com.owncloud.android.files.services;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -26,9 +26,10 @@ import java.util.List;
 import org.apache.commons.httpclient.HttpException;
 import org.apache.jackrabbit.webdav.client.methods.MkColMethod;
 
-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.utils.OwnCloudVersion;
+import com.owncloud.android.AccountUtils;
+import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.utils.OwnCloudVersion;
+
 import eu.alefzero.webdav.WebdavClient;
 
 import android.accounts.Account;

src/eu/alefzero/owncloud/files/services/OnUploadCompletedListener.java → src/com/owncloud/android/files/services/OnUploadCompletedListener.java

@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.files.services;
+package com.owncloud.android.files.services;
 
 public interface OnUploadCompletedListener extends Runnable {
 

src/eu/alefzero/owncloud/location/LocationServiceLauncherReciever.java → src/com/owncloud/android/location/LocationServiceLauncherReciever.java

@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package eu.alefzero.owncloud.location;
+package com.owncloud.android.location;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;

src/eu/alefzero/owncloud/location/LocationUpdateService.java → src/com/owncloud/android/location/LocationUpdateService.java

@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package eu.alefzero.owncloud.location;
+package com.owncloud.android.location;
 
 import android.app.IntentService;
 import android.content.Intent;
@@ -30,6 +30,8 @@ import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
 
+import com.owncloud.android.R;
+
 public class LocationUpdateService extends IntentService implements
         LocationListener {
 
@@ -56,7 +58,7 @@ public class LocationUpdateService extends IntentService implements
         // Notify user if there is no way to track the device
         if (mLocationProvider == null) {
             Toast.makeText(this,
-                    eu.alefzero.owncloud.R.string.location_no_provider,
+                    R.string.location_no_provider,
                     Toast.LENGTH_LONG);
             stopSelf();
             return;

src/eu/alefzero/owncloud/providers/FileContentProvider.java → src/com/owncloud/android/providers/FileContentProvider.java

@@ -16,12 +16,13 @@
  *
  */
 
-package eu.alefzero.owncloud.providers;
+package com.owncloud.android.providers;
 
 import java.util.HashMap;
 
-import eu.alefzero.owncloud.db.ProviderMeta;
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
+import com.owncloud.android.db.ProviderMeta;
+import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
+
 
 import android.content.ContentProvider;
 import android.content.ContentUris;

src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java → src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java

@@ -16,7 +16,7 @@
  *
  */
 
-package eu.alefzero.owncloud.syncadapter;
+package com.owncloud.android.syncadapter;
 
 import java.io.IOException;
 import java.net.UnknownHostException;
@@ -28,6 +28,9 @@ import org.apache.http.client.ClientProtocolException;
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
 import org.apache.http.protocol.HttpContext;
 
+import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.datamodel.DataStorageManager;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
@@ -36,8 +39,6 @@ import android.content.AbstractThreadedSyncAdapter;
 import android.content.ContentProviderClient;
 import android.content.Context;
 import android.net.Uri;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.datamodel.DataStorageManager;
 import eu.alefzero.webdav.WebdavClient;
 
 /**

src/eu/alefzero/owncloud/syncadapter/ContactSyncAdapter.java → src/com/owncloud/android/syncadapter/ContactSyncAdapter.java

@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.syncadapter;
+package com.owncloud.android.syncadapter;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -7,10 +7,11 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.ByteArrayEntity;
 
-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.db.ProviderMeta;
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
+import com.owncloud.android.AccountUtils;
+import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.db.ProviderMeta;
+import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;

src/eu/alefzero/owncloud/syncadapter/ContactSyncService.java → src/com/owncloud/android/syncadapter/ContactSyncService.java

@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.syncadapter;
+package com.owncloud.android.syncadapter;
 
 import android.app.Service;
 import android.content.Intent;

src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java → src/com/owncloud/android/syncadapter/FileSyncAdapter.java

@@ -16,7 +16,7 @@
  *
  */
 
-package eu.alefzero.owncloud.syncadapter;
+package com.owncloud.android.syncadapter;
 
 import java.io.IOException;
 import java.util.List;
@@ -26,6 +26,10 @@ import org.apache.jackrabbit.webdav.DavException;
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.files.services.FileDownloader;
+
 import android.accounts.Account;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
@@ -35,9 +39,6 @@ import android.content.Intent;
 import android.content.SyncResult;
 import android.os.Bundle;
 import android.util.Log;
-import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
-import eu.alefzero.owncloud.datamodel.OCFile;
-import eu.alefzero.owncloud.files.services.FileDownloader;
 import eu.alefzero.webdav.WebdavEntry;
 import eu.alefzero.webdav.WebdavUtils;
 

src/eu/alefzero/owncloud/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 eu.alefzero.owncloud.syncadapter;
+package com.owncloud.android.syncadapter;
 
 import android.app.Service;
 import android.content.Intent;

src/eu/alefzero/owncloud/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 eu.alefzero.owncloud.ui;
+package com.owncloud.android.ui;
 
 import android.graphics.drawable.Drawable;
 import android.view.View.OnClickListener;

src/eu/alefzero/owncloud/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 eu.alefzero.owncloud.ui;
+package com.owncloud.android.ui;
 
 import android.content.Context;
 import android.graphics.Rect;

src/eu/alefzero/owncloud/ui/FragmentListView.java → src/com/owncloud/android/ui/FragmentListView.java

@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.ui;
+package com.owncloud.android.ui;
 
 import com.actionbarsherlock.app.SherlockFragment;
 

src/eu/alefzero/owncloud/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 eu.alefzero.owncloud.ui;
+package com.owncloud.android.ui;
 
 import android.content.Context;
 
@@ -36,7 +36,7 @@ import android.view.ViewGroup;
 
 import java.util.ArrayList;
 
-import eu.alefzero.owncloud.R;
+import com.owncloud.android.R;
 
 /**
  * Popup window, shows action list as icon and text like the one in Gallery3D

src/eu/alefzero/owncloud/ui/activity/AccountSelectActivity.java → src/com/owncloud/android/ui/activity/AccountSelectActivity.java

@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.ui.activity;
+package com.owncloud.android.ui.activity;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -32,10 +32,10 @@ import com.actionbarsherlock.app.SherlockListActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
+import com.owncloud.android.AccountUtils;
+import com.owncloud.android.authenticator.AccountAuthenticator;
 
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.R;
+import com.owncloud.android.R;
 
 public class AccountSelectActivity extends SherlockListActivity implements
         AccountManagerCallback<Boolean> {
@@ -60,7 +60,7 @@ public class AccountSelectActivity extends SherlockListActivity implements
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getSherlock().getMenuInflater();
-        inflater.inflate(eu.alefzero.owncloud.R.menu.account_picker, menu);
+        inflater.inflate(R.menu.account_picker, menu);
         return true;
     }
 

src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java → src/com/owncloud/android/ui/activity/AuthenticatorActivity.java

@@ -16,12 +16,22 @@
  *
  */
 
-package eu.alefzero.owncloud.ui.activity;
+package com.owncloud.android.ui.activity;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLEncoder;
 
+import com.owncloud.android.AccountUtils;
+import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.authenticator.AuthenticationRunnable;
+import com.owncloud.android.authenticator.ConnectionCheckerRunnable;
+import com.owncloud.android.authenticator.OnAuthenticationResultListener;
+import com.owncloud.android.authenticator.OnConnectCheckListener;
+import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
+import com.owncloud.android.extensions.ExtensionsAvailableActivity;
+import com.owncloud.android.utils.OwnCloudVersion;
+
 import android.accounts.Account;
 import android.accounts.AccountAuthenticatorActivity;
 import android.accounts.AccountManager;
@@ -42,16 +52,7 @@ import android.view.View.OnFocusChangeListener;
 import android.view.Window;
 import android.widget.ImageView;
 import android.widget.TextView;
-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.authenticator.AuthenticationRunnable;
-import eu.alefzero.owncloud.authenticator.ConnectionCheckerRunnable;
-import eu.alefzero.owncloud.authenticator.OnAuthenticationResultListener;
-import eu.alefzero.owncloud.authenticator.OnConnectCheckListener;
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
-import eu.alefzero.owncloud.extensions.ExtensionsAvailableActivity;
-import eu.alefzero.owncloud.utils.OwnCloudVersion;
+import com.owncloud.android.R;
 
 /**
  * This Activity is used to add an ownCloud account to the App

src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java → src/com/owncloud/android/ui/activity/FileDetailActivity.java

@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package eu.alefzero.owncloud.ui.activity;
+package com.owncloud.android.ui.activity;
 
 import android.accounts.Account;
 import android.app.Dialog;
@@ -28,11 +28,11 @@ import android.support.v4.app.FragmentTransaction;
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.MenuItem;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.files.services.FileDownloader;
+import com.owncloud.android.ui.fragment.FileDetailFragment;
 
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.datamodel.OCFile;
-import eu.alefzero.owncloud.files.services.FileDownloader;
-import eu.alefzero.owncloud.ui.fragment.FileDetailFragment;
+import com.owncloud.android.R;
 
 /**
  * This activity displays the details of a file like its name, its size and so

src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java → src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -16,7 +16,7 @@
  *
  */
 
-package eu.alefzero.owncloud.ui.activity;
+package com.owncloud.android.ui.activity;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -60,19 +60,19 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
-
-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.CrashHandler;
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.datamodel.DataStorageManager;
-import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
-import eu.alefzero.owncloud.datamodel.OCFile;
-import eu.alefzero.owncloud.files.services.FileDownloader;
-import eu.alefzero.owncloud.files.services.FileUploader;
-import eu.alefzero.owncloud.syncadapter.FileSyncService;
-import eu.alefzero.owncloud.ui.fragment.FileDetailFragment;
-import eu.alefzero.owncloud.ui.fragment.FileListFragment;
+import com.owncloud.android.AccountUtils;
+import com.owncloud.android.CrashHandler;
+import com.owncloud.android.authenticator.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.FileDownloader;
+import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.syncadapter.FileSyncService;
+import com.owncloud.android.ui.fragment.FileDetailFragment;
+import com.owncloud.android.ui.fragment.FileListFragment;
+
+import com.owncloud.android.R;
 import eu.alefzero.webdav.WebdavClient;
 
 /**

src/eu/alefzero/owncloud/ui/activity/LandingActivity.java → src/com/owncloud/android/ui/activity/LandingActivity.java

@@ -15,9 +15,11 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package eu.alefzero.owncloud.ui.activity;
+package com.owncloud.android.ui.activity;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.ui.adapter.LandingScreenAdapter;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -32,9 +34,7 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.GridView;
 import android.widget.Toast;
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.ui.adapter.LandingScreenAdapter;
+import com.owncloud.android.R;
 
 /**
  * This activity is used as a landing page when the user first opens this app.

src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java → src/com/owncloud/android/ui/activity/PinCodeActivity.java

@@ -15,14 +15,13 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package eu.alefzero.owncloud.ui.activity;
+package com.owncloud.android.ui.activity;
 
 import java.util.Arrays;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 
-import eu.alefzero.owncloud.R;
-
+import com.owncloud.android.R;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;

src/eu/alefzero/owncloud/ui/activity/Preferences.java → src/com/owncloud/android/ui/activity/Preferences.java

@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package eu.alefzero.owncloud.ui.activity;
+package com.owncloud.android.ui.activity;
 
 import java.util.Vector;
 
@@ -36,12 +36,12 @@ import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockPreferenceActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
+import com.owncloud.android.AccountUtils;
+import com.owncloud.android.OwnCloudSession;
+import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.db.DbHandler;
 
-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.OwnCloudSession;
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.db.DbHandler;
+import com.owncloud.android.R;
 
 /**
  * An Activity that allows the user to change the application's settings.

src/eu/alefzero/owncloud/ui/activity/PreferencesNewSession.java → src/com/owncloud/android/ui/activity/PreferencesNewSession.java

@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.ui.activity;
+package com.owncloud.android.ui.activity;
 
 import android.accounts.AccountAuthenticatorActivity;
 import android.app.Activity;

src/eu/alefzero/owncloud/ui/adapter/FileListActionListAdapter.java → src/com/owncloud/android/ui/adapter/FileListActionListAdapter.java

@@ -16,13 +16,14 @@
  *
  */
 
-package eu.alefzero.owncloud.ui.adapter;
+package com.owncloud.android.ui.adapter;
 
 import java.io.File;
 
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
+import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
+
+import com.owncloud.android.R;
 import eu.alefzero.webdav.WebdavUtils;
 import android.accounts.Account;
 import android.accounts.AccountManager;

src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java → src/com/owncloud/android/ui/adapter/FileListListAdapter.java

@@ -15,17 +15,18 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package eu.alefzero.owncloud.ui.adapter;
+package com.owncloud.android.ui.adapter;
 
 import java.util.Vector;
 
-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.DisplayUtils;
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.datamodel.DataStorageManager;
-import eu.alefzero.owncloud.datamodel.OCFile;
-import eu.alefzero.owncloud.files.services.FileDownloader;
-import eu.alefzero.owncloud.files.services.FileUploader;
+import com.owncloud.android.AccountUtils;
+import com.owncloud.android.DisplayUtils;
+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.R;
 
 import android.accounts.Account;
 import android.content.Context;

src/eu/alefzero/owncloud/ui/adapter/LandingScreenAdapter.java → src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java

@@ -15,7 +15,11 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package eu.alefzero.owncloud.ui.adapter;
+package com.owncloud.android.ui.adapter;
+
+import com.owncloud.android.AccountUtils;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
+import com.owncloud.android.ui.activity.Preferences;
 
 import android.content.Context;
 import android.content.Intent;
@@ -25,10 +29,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;
-import eu.alefzero.owncloud.ui.activity.Preferences;
+import com.owncloud.android.R;
 
 /**
  * Populates the landing screen icons.

src/eu/alefzero/owncloud/ui/fragment/AuthenticatorAccountDetailsFragment.java → src/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java

@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.ui.fragment;
+package com.owncloud.android.ui.fragment;
 
 import com.actionbarsherlock.app.SherlockFragment;
 

src/eu/alefzero/owncloud/ui/fragment/AuthenticatorGetStartedFragment.java → src/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java

@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.ui.fragment;
+package com.owncloud.android.ui.fragment;
 
 import com.actionbarsherlock.app.SherlockFragment;
 

src/eu/alefzero/owncloud/ui/fragment/ConfirmationDialogFragment.java → src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java

@@ -1,4 +1,4 @@
-package eu.alefzero.owncloud.ui.fragment;
+package com.owncloud.android.ui.fragment;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -8,8 +8,6 @@ import android.util.Log;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 
-import eu.alefzero.owncloud.R;
-
 public class ConfirmationDialogFragment extends SherlockDialogFragment {
 
     public final static String ARG_CONF_RESOURCE_ID = "resource_id";

src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java → src/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package eu.alefzero.owncloud.ui.fragment;
+package com.owncloud.android.ui.fragment;
 
 import java.io.File;
 import java.io.IOException;
@@ -73,18 +73,18 @@ import android.widget.Toast;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.actionbarsherlock.app.SherlockFragment;
+import com.owncloud.android.AccountUtils;
+import com.owncloud.android.DisplayUtils;
+import com.owncloud.android.authenticator.AccountAuthenticator;
+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.FileUploader;
+import com.owncloud.android.ui.activity.FileDetailActivity;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
+import com.owncloud.android.utils.OwnCloudVersion;
 
-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.DisplayUtils;
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
-import eu.alefzero.owncloud.datamodel.OCFile;
-import eu.alefzero.owncloud.files.services.FileDownloader;
-import eu.alefzero.owncloud.files.services.FileUploader;
-import eu.alefzero.owncloud.ui.activity.FileDetailActivity;
-import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;
-import eu.alefzero.owncloud.utils.OwnCloudVersion;
+import com.owncloud.android.R;
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;
 

src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java → src/com/owncloud/android/ui/fragment/FileListFragment.java

@@ -15,10 +15,15 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package eu.alefzero.owncloud.ui.fragment;
+package com.owncloud.android.ui.fragment;
 
 import java.util.Vector;
 
+import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.ui.FragmentListView;
+import com.owncloud.android.ui.adapter.FileListListAdapter;
+
 import android.app.Activity;
 import android.os.Bundle;
 import android.util.Log;
@@ -26,11 +31,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.datamodel.DataStorageManager;
-import eu.alefzero.owncloud.datamodel.OCFile;
-import eu.alefzero.owncloud.ui.FragmentListView;
-import eu.alefzero.owncloud.ui.adapter.FileListListAdapter;
+import com.owncloud.android.R;
 
 /**
  * A Fragment that lists all files and folders in a given path.

src/eu/alefzero/owncloud/ui/fragment/LandingPageFragment.java → src/com/owncloud/android/ui/fragment/LandingPageFragment.java

@@ -15,18 +15,18 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package eu.alefzero.owncloud.ui.fragment;
+package com.owncloud.android.ui.fragment;
 
 import com.actionbarsherlock.app.SherlockFragment;
+import com.owncloud.android.ui.activity.LandingActivity;
+import com.owncloud.android.ui.adapter.LandingScreenAdapter;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.ui.activity.LandingActivity;
-import eu.alefzero.owncloud.ui.adapter.LandingScreenAdapter;
+import com.owncloud.android.R;
 
 /**
  * Used on the Landing page to display what Components of the ownCloud there

src/eu/alefzero/owncloud/utils/OwnCloudVersion.java → src/com/owncloud/android/utils/OwnCloudVersion.java

@@ -16,7 +16,7 @@
  *
  */
 
-package eu.alefzero.owncloud.utils;
+package com.owncloud.android.utils;
 
 public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
     public static final OwnCloudVersion owncloud_v1 = new OwnCloudVersion(

src/eu/alefzero/owncloud/widgets/ActionEditText.java → src/com/owncloud/android/widgets/ActionEditText.java

@@ -1,9 +1,9 @@
-package eu.alefzero.owncloud.widgets;
+package com.owncloud.android.widgets;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import eu.alefzero.owncloud.R;
+import com.owncloud.android.R;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;

src/eu/alefzero/webdav/FileRequestEntity.java

@@ -8,9 +8,10 @@ import java.io.OutputStream;
 
 import org.apache.commons.httpclient.methods.RequestEntity;
 
+import com.owncloud.android.files.interfaces.OnDatatransferProgressListener;
+
 import android.util.Log;
 
-import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener;
 
 /**
  * A RequestEntity that represents a File.

src/eu/alefzero/webdav/WebdavClient.java

@@ -41,16 +41,17 @@ import org.apache.jackrabbit.webdav.client.methods.DavMethod;
 import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;
 import org.apache.jackrabbit.webdav.client.methods.MkColMethod;
 
+import com.owncloud.android.AccountUtils;
+import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.authenticator.EasySSLSocketFactory;
+import com.owncloud.android.files.interfaces.OnDatatransferProgressListener;
+import com.owncloud.android.utils.OwnCloudVersion;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.Context;
 import android.net.Uri;
 import android.util.Log;
-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.authenticator.EasySSLSocketFactory;
-import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener;
-import eu.alefzero.owncloud.utils.OwnCloudVersion;
 
 public class WebdavClient extends HttpClient {
     private Uri mUri;