X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/390949b8323633b26d56b3a837e83941cbc24b4b..50d7b20bf6c495c5b4b666325bda92c85725374d:/AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 39d90852..86af0694 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -32,6 +32,8 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
 
     <uses-sdk
         android:minSdkVersion="8"
@@ -45,8 +47,7 @@
     <application
         android:icon="@drawable/icon"
         android:label="@string/app_name"
-        android:theme="@style/Theme.ownCloud"
-        android:uiOptions="splitActionBarWhenNarrow"> 
+        android:theme="@style/Theme.ownCloud"> 
         <activity
             android:name=".ui.activity.FileDisplayActivity"
             android:label="@string/app_name">
@@ -123,7 +124,7 @@
             android:theme="@style/Theme.ownCloud.noActionBar" >
         </activity>
 
-        <service android:name=".FileDownloader" >
+        <service android:name=".files.services.FileDownloader" >
         </service>
         <service android:name=".location.LocationUpdateService" >
             <intent-filter>
@@ -140,13 +141,23 @@
             </intent-filter>
         </receiver>
 
-        <activity
-            android:name=".ui.activity.FileDetailActivity"
-            android:theme="@style/Theme.ownCloud" >
-        </activity>
+        <activity android:name=".ui.activity.FileDetailActivity" />
         <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
         <activity android:name=".extensions.ExtensionsListActivity"></activity>
         <activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>
+        <service android:name=".files.services.FileUploader" >
+        </service>
+        <service android:name=".files.services.InstantUploadService" />
+        <receiver android:name=".files.PhotoTakenBroadcastReceiver">
+            <intent-filter>
+                <action android:name="com.android.camera.NEW_PICTURE" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+            </intent-filter>
+        </receiver>
+        <activity android:name="CrashlogSendActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file