Merge branch 'master' into oauth_login

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 994efb7..3cb2578 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -120,7 +120,16 @@
         <activity\r
             android:name=".ui.activity.AuthenticatorActivity"\r
             android:exported="true"\r
-            android:theme="@style/Theme.ownCloud.noActionBar" >\r
+            android:theme="@style/Theme.ownCloud.noActionBar" \r
+            android:launchMode="singleTask">\r
+            <intent-filter>\r
+                <action android:name="android.intent.action.VIEW" />\r
+\r
+                <category android:name="android.intent.category.DEFAULT" />\r
+                <category android:name="android.intent.category.BROWSABLE" />\r
+\r
+                <data android:scheme="oauth-mobile-app" />\r
+            </intent-filter>\r
         </activity>\r
 \r
         <service android:name=".files.services.FileDownloader" >\r
@@ -137,7 +146,6 @@
         
         <service android:name=".files.services.FileUploader" >\r
         </service>
-        <service android:name=".files.services.InstantUploadService" />
         <receiver android:name=".files.InstantUploadBroadcastReceiver">\r
             <intent-filter>\r
                 <action android:name="com.android.camera.NEW_PICTURE" />\r
@@ -152,7 +160,11 @@
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>\r
             </intent-filter>\r
         </receiver>\r
-        <service android:name=".files.services.FileObserverService"/>
+        <service android:name=".files.services.FileObserverService"/>\r
+        \r
+        <service android:name=".authenticator.oauth2.services.OAuth2GetTokenService" >\r
+        </service>\r
+        
     </application>\r
 \r
 </manifest>