removing contacts from main app

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d709d1e..60e9a7c 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<manifest package="eu.alefzero.owncloud"\r
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"\r
+    package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
-    android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionName="1.0" >\r
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
@@ -30,6 +31,11 @@
             android:name=".ui.activity.FileDisplayActivity"\r
             android:label="@string/app_name"\r
             android:theme="@style/Theme.ownCloud" >\r
+            <intent-filter>\r
+                <action android:name="android.intent.action.MAIN" />\r
+\r
+                <category android:name="android.intent.category.LAUNCHER" />\r
+            </intent-filter>\r
         </activity>\r
         <activity android:name=".Uploader" >\r
             <intent-filter>\r
@@ -53,8 +59,9 @@
                 </data>\r
             </intent-filter>\r
         </activity>\r
-        <activity android:name=".ui.activity.Preferences" \r
-            android:theme="@style/Theme.ownCloud">\r
+        <activity\r
+            android:name=".ui.activity.Preferences"\r
+            android:theme="@style/Theme.ownCloud" >\r
         </activity>\r
         <activity android:name=".ui.activity.PreferencesNewSessionewSession" >\r
         </activity>\r
@@ -81,21 +88,6 @@
                 android:name="android.content.SyncAdapter"\r
                 android:resource="@xml/syncadapter_files" />\r
         </service>\r
-        <service\r
-            android:name=".syncadapter.ContactSyncService"\r
-            android:exported="true"\r
-            android:process=":contacts" >\r
-            <intent-filter>\r
-                <action android:name="android.content.SyncAdapter" />\r
-            </intent-filter>\r
-\r
-            <meta-data\r
-                android:name="android.content.SyncAdapter"\r
-                android:resource="@xml/syncadapter_contacts" />\r
-            <meta-data\r
-                android:name="android.provider.CONTACTS_STRUCTURE"\r
-                android:resource="@xml/contacts" />\r
-        </service>\r
 \r
         <provider\r
             android:name=".providers.FileContentProvider"\r
@@ -114,33 +106,24 @@
 \r
         <service android:name=".FileDownloader" >\r
         </service>\r
-        \r
-        <service android:name=".location.LocationUpdateService">\r
+        <service android:name=".location.LocationUpdateService" >\r
             <intent-filter>\r
-                               <action android:name="eu.alefzero.owncloud.location.LocationUpdateService" />\r
-                       </intent-filter>\r
+                <action android:name="eu.alefzero.owncloud.location.LocationUpdateService" />\r
+            </intent-filter>\r
         </service>\r
-        \r
-        <receiver android:name=".location.LocationServiceLauncherReciever">\r
-                       <intent-filter>\r
-                               <action android:name="android.intent.action.BOOT_COMPLETED" />\r
-                               <action android:name="eu.alefzero.owncloud.location.LocationLauncher" />\r
-                               <category android:name="android.intent.category.HOME" />\r
-                       </intent-filter>\r
-               </receiver>\r
-\r
-        <activity android:name=".ui.activity.FileDetailActivity" \r
-            android:theme="@style/Theme.ownCloud">\r
-        </activity>\r
-        <activity\r
-            android:name=".ui.activity.LandingActivity"\r
-            android:label="@string/app_name"\r
-            android:theme="@style/Theme.ownCloud" >\r
+\r
+        <receiver android:name=".location.LocationServiceLauncherReciever" >\r
             <intent-filter>\r
-                <action android:name="android.intent.action.MAIN" />\r
+                <action android:name="android.intent.action.BOOT_COMPLETED" />\r
+                <action android:name="eu.alefzero.owncloud.location.LocationLauncher" />\r
 \r
-                <category android:name="android.intent.category.LAUNCHER" />\r
+                <category android:name="android.intent.category.HOME" />\r
             </intent-filter>\r
+        </receiver>\r
+\r
+        <activity\r
+            android:name=".ui.activity.FileDetailActivity"\r
+            android:theme="@style/Theme.ownCloud" >\r
         </activity>\r
     </application>\r
 \r

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 5ae763c..a543777 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -155,12 +155,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
        \r
        @Override\r
        public void onBackPressed(){\r
-               popPath();\r
-               if(mDirectories.getCount() == 0) {\r
-                       Intent intent = new Intent(this, LandingActivity.class);\r
-                       startActivity(intent);\r
+               if(mDirectories.getCount() == 1) {\r
+                 finish();\r
                        return;\r
                }\r
+               popPath();\r
                ((FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList))\r
                                .onNavigateUp();\r
        }\r

diff --git a/src/eu/alefzero/webdav/WebdavEntry.java b/src/eu/alefzero/webdav/WebdavEntry.java
index 2c7f378..c2e9712 100644 (file)
--- a/src/eu/alefzero/webdav/WebdavEntry.java
+++ b/src/eu/alefzero/webdav/WebdavEntry.java
@@ -1,3 +1,20 @@
+/* ownCloud Android client application
+ *   Copyright (C) 2012  ownCloud
+ *
+ *   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 eu.alefzero.webdav;
 
 import java.util.Date;