mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-22 21:25:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

removing contacts from main app

Browse source
This commit is contained in:
Bartek Przybylski 2012-04-30 19:39:01 +02:00
parent 2d8300d834
commit 63c213cbea
3 changed files with 47 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
AndroidManifest.xml
View file

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-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: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.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" /> <uses-permission android:name="android.permission.USE_CREDENTIALS" />
@ -30,6 +31,11 @@
android:name=".ui.activity.FileDisplayActivity" android:name=".ui.activity.FileDisplayActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/Theme.ownCloud" > 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>
<activity android:name=".Uploader" > <activity android:name=".Uploader" >
<intent-filter> <intent-filter>
@ -53,8 +59,9 @@
</data> </data>
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".ui.activity.Preferences" <activity
android:theme="@style/Theme.ownCloud"> android:name=".ui.activity.Preferences"
android:theme="@style/Theme.ownCloud" >
</activity> </activity>
<activity android:name=".ui.activity.PreferencesNewSessionewSession" > <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
</activity> </activity>
@ -81,21 +88,6 @@
android:name="android.content.SyncAdapter" android:name="android.content.SyncAdapter"
android:resource="@xml/syncadapter_files" /> android:resource="@xml/syncadapter_files" />
</service> </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 <provider
android:name=".providers.FileContentProvider" android:name=".providers.FileContentProvider"
@ -114,33 +106,24 @@
<service android:name=".FileDownloader" > <service android:name=".FileDownloader" >
</service> </service>
<service android:name=".location.LocationUpdateService" >
<service android:name=".location.LocationUpdateService">
<intent-filter> <intent-filter>
<action android:name="eu.alefzero.owncloud.location.LocationUpdateService" /> <action android:name="eu.alefzero.owncloud.location.LocationUpdateService" />
</intent-filter> </intent-filter>
</service> </service>
<receiver android:name=".location.LocationServiceLauncherReciever"> <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" >
<intent-filter> <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> </intent-filter>
</receiver>
<activity
android:name=".ui.activity.FileDetailActivity"
android:theme="@style/Theme.ownCloud" >
</activity> </activity>
</application> </application>

7
src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
View file

@ -155,12 +155,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
@Override @Override
public void onBackPressed(){ public void onBackPressed(){
popPath(); if(mDirectories.getCount() == 1) {
if(mDirectories.getCount() == 0) { finish();
Intent intent = new Intent(this, LandingActivity.class);
startActivity(intent);
return; return;
} }
popPath();
((FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList)) ((FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList))
.onNavigateUp(); .onNavigateUp();
} }

17
src/eu/alefzero/webdav/WebdavEntry.java
View file

@ -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; package eu.alefzero.webdav;
import java.util.Date; import java.util.Date;