remove location service registration after booting

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b113f31..6eeed8f 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r

-    android:versionName="0.1.170B" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionName="0.1.171B" xmlns:android="http://schemas.android.com/apk/res/android">\r

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


@@ -129,15 +129,6 @@
             </intent-filter>\r
         </service>\r
 \r
             </intent-filter>\r
         </service>\r
 \r

-        <receiver android:name=".location.LocationServiceLauncherReciever" >\r
-            <intent-filter>\r
-                <action android:name="android.intent.action.BOOT_COMPLETED" />\r
-                <action android:name="eu.alefzero.owncloud.location.LocationLauncher" />\r
-\r
-                <category android:name="android.intent.category.HOME" />\r
-            </intent-filter>\r
-        </receiver>\r
-\r

         <activity android:name=".ui.activity.FileDetailActivity" />
         <activity android:name=".ui.activity.PinCodeActivity" />\r
         <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
         <activity android:name=".ui.activity.FileDetailActivity" />
         <activity android:name=".ui.activity.PinCodeActivity" />\r
         <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>

diff --git a/actionbarsherlock b/actionbarsherlock
index 8fcee10..9598f2b 160000 (submodule)
--- a/actionbarsherlock
+++ b/actionbarsherlock
@@ -1 +1 @@
-Subproject commit 8fcee10a340d54fb4acdbddcdc1746ad3f377eca
+Subproject commit 9598f2bb2ceed4a834cd5586a903f270ca4c0ccc