From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Mon, 30 Apr 2012 17:39:01 +0000 (+0200)
Subject: removing contacts from main app
X-Git-Tag: oc-android-1.4.3~435
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/63c213cbea5177061793fd19ad6143384982b335?ds=inline;hp=-c

removing contacts from main app
---

63c213cbea5177061793fd19ad6143384982b335
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d709d1e2..60e9a7c0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="eu.alefzero.owncloud"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.alefzero.owncloud"
     android:versionCode="1"
-    android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionName="1.0" >
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
@@ -30,6 +31,11 @@
             android:name=".ui.activity.FileDisplayActivity"
             android:label="@string/app_name"
             android:theme="@style/Theme.ownCloud" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
         <activity android:name=".Uploader" >
             <intent-filter>
@@ -53,8 +59,9 @@
                 </data>
             </intent-filter>
         </activity>
-        <activity android:name=".ui.activity.Preferences" 
-            android:theme="@style/Theme.ownCloud">
+        <activity
+            android:name=".ui.activity.Preferences"
+            android:theme="@style/Theme.ownCloud" >
         </activity>
         <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
         </activity>
@@ -81,21 +88,6 @@
                 android:name="android.content.SyncAdapter"
                 android:resource="@xml/syncadapter_files" />
         </service>
-        <service
-            android:name=".syncadapter.ContactSyncService"
-            android:exported="true"
-            android:process=":contacts" >
-            <intent-filter>
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.content.SyncAdapter"
-                android:resource="@xml/syncadapter_contacts" />
-            <meta-data
-                android:name="android.provider.CONTACTS_STRUCTURE"
-                android:resource="@xml/contacts" />
-        </service>
 
         <provider
             android:name=".providers.FileContentProvider"
@@ -114,33 +106,24 @@
 
         <service android:name=".FileDownloader" >
         </service>
-        
-        <service android:name=".location.LocationUpdateService">
+        <service android:name=".location.LocationUpdateService" >
             <intent-filter>
-				<action android:name="eu.alefzero.owncloud.location.LocationUpdateService" />
-			</intent-filter>
+                <action android:name="eu.alefzero.owncloud.location.LocationUpdateService" />
+            </intent-filter>
         </service>
-        
-        <receiver android:name=".location.LocationServiceLauncherReciever">
-			<intent-filter>
-				<action android:name="android.intent.action.BOOT_COMPLETED" />
-				<action android:name="eu.alefzero.owncloud.location.LocationLauncher" />
-				<category android:name="android.intent.category.HOME" />
-			</intent-filter>
-		</receiver>
-
-        <activity android:name=".ui.activity.FileDetailActivity" 
-            android:theme="@style/Theme.ownCloud">
-        </activity>
-        <activity
-            android:name=".ui.activity.LandingActivity"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.ownCloud" >
+
+        <receiver android:name=".location.LocationServiceLauncherReciever" >
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="eu.alefzero.owncloud.location.LocationLauncher" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.HOME" />
             </intent-filter>
+        </receiver>
+
+        <activity
+            android:name=".ui.activity.FileDetailActivity"
+            android:theme="@style/Theme.ownCloud" >
         </activity>
     </application>
 
diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 5ae763cc..a5437773 100644
--- 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
 	
 	@Override
 	public void onBackPressed(){
-		popPath();
-		if(mDirectories.getCount() == 0) {
-			Intent intent = new Intent(this, LandingActivity.class);
-			startActivity(intent);
+		if(mDirectories.getCount() == 1) {
+		  finish();
 			return;
 		}
+		popPath();
 		((FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList))
 				.onNavigateUp();
 	}
diff --git a/src/eu/alefzero/webdav/WebdavEntry.java b/src/eu/alefzero/webdav/WebdavEntry.java
index 2c7f378b..c2e9712f 100644
--- 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;