Completed update of local database and storage after a successful remote move

[pub/Android/ownCloud.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ba32f6c..1223b54 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,7 +3,7 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski

-  Copyright (C) 2012-2013 ownCloud Inc.
+  Copyright (C) 2012-2014 ownCloud Inc.

 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,


@@ -18,8 +18,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"

-    android:versionCode="104000"
-    android:versionName="1.4.0" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="10500800"
+    android:versionName="1.5.8" xmlns:android="http://schemas.android.com/apk/res/android">

 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />


@@ -38,30 +38,28 @@
     
     <uses-sdk
         android:minSdkVersion="8"
     
     <uses-sdk
         android:minSdkVersion="8"

-        android:targetSdkVersion="13" />
+        android:targetSdkVersion="19" />

 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
     </uses-permission>
 
     <application
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
     </uses-permission>
 
     <application

+        android:name=".MainApp"

         android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:theme="@style/Theme.ownCloud"> 
         <activity
             android:name=".ui.activity.FileDisplayActivity"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:theme="@style/Theme.ownCloud"> 
         <activity
             android:name=".ui.activity.FileDisplayActivity"

-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            >

             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

-

                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name=".ui.activity.UploadFilesActivity">
         </activity>
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name=".ui.activity.UploadFilesActivity">
         </activity>

-               <activity android:name=".ui.activity.InstantUploadActivity">
-        </activity>
-        <activity android:name=".ui.activity.FailedUploadActivity" android:theme="@android:style/Theme.Dialog" android:excludeFromRecents="true"/>
-        <activity android:name=".Uploader" >
+        <activity android:name=".ui.activity.Uploader" >

             <intent-filter>
                 <action android:name="android.intent.action.SEND" >
                 </action>
             <intent-filter>
                 <action android:name="android.intent.action.SEND" >
                 </action>


@@ -81,7 +79,8 @@
 
                 <data android:mimeType="*/*" >
                 </data>
 
                 <data android:mimeType="*/*" >
                 </data>

-            </intent-filter>
+
+                       </intent-filter>

         </activity>
         <activity
             android:name=".ui.activity.Preferences"
         </activity>
         <activity
             android:name=".ui.activity.Preferences"


@@ -90,11 +89,15 @@
         <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
         </activity>
         
         <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
         </activity>
         

-        <activity      android:name="com.owncloud.android.ui.preview.PreviewImageActivity" />
+        <activity      
+            android:name=".ui.preview.PreviewImageActivity" 
+            />

                        
                        

-        <activity      android:name="com.owncloud.android.ui.preview.PreviewVideoActivity"
-                                       android:label="@string/app_name"
-                                       android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+        <activity      
+            android:name=".ui.preview.PreviewVideoActivity"
+                       android:label="@string/app_name"
+                       android:theme="@style/Theme.ownCloud.Fullscreen" 
+                       >

                </activity>        
 
         <service
                </activity>        
 
         <service


@@ -110,7 +113,8 @@
         </service>
         <service
             android:name=".syncadapter.FileSyncService"
         </service>
         <service
             android:name=".syncadapter.FileSyncService"

-            android:exported="true" >
+            android:exported="true" 
+            >

             <intent-filter>
                 <action android:name="android.content.SyncAdapter" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.content.SyncAdapter" />
             </intent-filter>


@@ -122,7 +126,7 @@
 
         <provider
             android:name=".providers.FileContentProvider"
 
         <provider
             android:name=".providers.FileContentProvider"

-            android:authorities="org.owncloud"
+            android:authorities="@string/authority"

             android:enabled="true"
             android:exported="false"
             android:label="@string/sync_string_files"
             android:enabled="true"
             android:exported="false"
             android:label="@string/sync_string_files"


@@ -146,37 +150,45 @@
             </intent-filter>
         </activity>
 
             </intent-filter>
         </activity>
 

+        <service android:name=".services.OperationsService" />

         <service android:name=".files.services.FileDownloader" />
         <service android:name=".files.services.FileUploader" />
         <service android:name=".media.MediaService" />
         
         <service android:name=".files.services.FileDownloader" />
         <service android:name=".files.services.FileUploader" />
         <service android:name=".media.MediaService" />
         

-        <activity android:name=".ui.activity.FileDetailActivity" />

         <activity android:name=".ui.activity.PinCodeActivity" />
         <activity android:name=".ui.activity.PinCodeActivity" />

-        <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>

         <activity android:name=".ui.activity.ConflictsResolveActivity"/>
         <activity android:name=".ui.activity.GenericExplanationActivity"/>
         <activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity"/>
         
         <activity android:name=".ui.activity.LogHistoryActivity"/>
         
         <activity android:name=".ui.activity.ConflictsResolveActivity"/>
         <activity android:name=".ui.activity.GenericExplanationActivity"/>
         <activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity"/>
         
         <activity android:name=".ui.activity.LogHistoryActivity"/>
         

-        <receiver android:name=".files.InstantUploadBroadcastReceiver">\r
-            <intent-filter>\r
-                <action android:name="com.android.camera.NEW_PICTURE" />\r
-                <data android:mimeType="image/*" />\r
+        <receiver android:name=".files.InstantUploadBroadcastReceiver">
+            <intent-filter>
+                <!-- unofficially supported by many Android phones but not by HTC devices: -->
+                <action android:name="com.android.camera.NEW_PICTURE" />
+                <!-- officially supported since Android 4.0 (SDK 14, works even for HTC devices): --> 
+                <action android:name="android.hardware.action.NEW_PICTURE" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.hardware.action.NEW_VIDEO" />
+                <data android:mimeType="video/*" />

             </intent-filter>
             <intent-filter>
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>

-            </intent-filter>\r
-        </receiver>\r
-        <receiver android:name=".files.BootupBroadcastReceiver">\r
-            <intent-filter>\r
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>\r
-            </intent-filter>\r
-        </receiver>\r
-        <service android:name=".files.services.FileObserverService"/>\r
-        \r
-    </application>\r
-\r
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".files.BootupBroadcastReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+            </intent-filter>
+        </receiver>
+        <service android:name=".services.observer.FileObserverService"/>
+        
+        <activity 
+                       android:name=".ui.activity.MoveActivity"
+                       android:label="@string/app_name"/>
+        
+    </application>
+

 </manifest>
 </manifest>