diff -r 89f1be755b8d -r 7caab0161cf9 AndroidManifest.xml
--- a/AndroidManifest.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/AndroidManifest.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -4,6 +4,35 @@
     android:versionCode="-1"
     android:versionName="0.2.0" >
 
+    <permission
+        android:name="com.beem.project.beem.BEEM_SERVICE"
+        android:description="@string/BeemServiceDescription"
+        android:label="BeemService"
+        android:permissionGroup="android.permission-group.NETWORK" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="com.beem.project.beem.BEEM_SERVICE" />
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+
+    <uses-sdk
+        android:minSdkVersion="7"
+        android:targetSdkVersion="8" />
+
+    <supports-screens
+        android:anyDensity="true"
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true" />
+
     <application
         android:name=".BeemApplication"
         android:icon="@drawable/beem_launcher_icon_silver"
@@ -32,6 +61,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.Settings"
+            android:exported="false"
             android:label="@string/edit_settings_name" >
             <intent-filter android:label="Beem Android Account" >
                 <action android:name="com.beem.project.beem.SETTINGS" />
@@ -44,6 +74,7 @@
         </activity>
         <activity
             android:name=".ui.Chat"
+            android:exported="false"
             android:label="@string/chat_name"
             android:launchMode="singleTop" >
             <intent-filter android:label="Beem Connection" >
@@ -69,6 +100,7 @@
         </activity>
         <activity
             android:name=".ui.MucChat"
+            android:exported="false"
             android:label="@string/chat_name"
             android:launchMode="singleTop" >
             <intent-filter android:label="Beem Connection" >
@@ -77,6 +109,7 @@
         </activity>
         <activity
             android:name=".ui.ChangeStatus"
+            android:exported="false"
             android:label="@string/ChangeStatusActTitle"
             android:launchMode="singleTask"
             android:windowSoftInputMode="stateHidden" >
@@ -91,6 +124,7 @@
         </activity>
         <activity
             android:name=".ui.AddContact"
+            android:exported="false"
             android:label="@string/AddCActTitle" >
             <intent-filter android:label="Create Contact" >
                 <action android:name="android.intent.action.INSERT" />
@@ -108,6 +142,7 @@
         </activity>
         <activity
             android:name=".ui.Subscription"
+            android:exported="false"
             android:label="@string/app_name" >
             <intent-filter android:label="Beem Connection" >
                 <action android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
@@ -118,6 +153,7 @@
             android:label="@string/create_account_name" />
         <activity
             android:name=".ui.ContactList"
+            android:exported="false"
             android:label="@string/contact_list_name"
             android:launchMode="singleTask" >
             <intent-filter android:label="Beem Connection" >
@@ -126,6 +162,7 @@
         </activity>
         <activity
             android:name=".ui.GroupList"
+            android:exported="false"
             android:label="GroupList" >
             <intent-filter android:label="Beem Connection" >
                 <action android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
@@ -133,6 +170,7 @@
         </activity>
         <activity
             android:name=".ui.PrivacyList"
+            android:exported="false"
             android:label="@string/privacy_list_name" >
             <intent-filter android:label="Beem Connection" >
                 <action android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
@@ -157,15 +195,17 @@
         <provider
             android:name=".providers.MessageProvider"
             android:authorities="com.beem.project.beem.providers.messageprovider"
+            android:exported="false"
             android:label="Message Provider" />
         <provider
             android:name=".providers.MUCsProvider"
             android:authorities="com.beem.project.beem.providers.mucsprovider"
+            android:exported="false"
             android:label="MUCs Provider" />
 
         <service
             android:name=".account.AuthenticatorService"
-            android:exported="true"
+            android:exported="false"
             android:process=":auth" >
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
@@ -177,7 +217,7 @@
         </service>
         <service
             android:name=".account.SyncAdapterService"
-            android:exported="true"
+            android:exported="false"
             android:process=":contacts" >
             <intent-filter>
                 <action android:name="android.content.SyncAdapter" />
@@ -211,33 +251,4 @@
         </service>
     </application>
 
-    <permission
-        android:name="com.beem.project.beem.BEEM_SERVICE"
-        android:description="@string/BeemServiceDescription"
-        android:label="BeemService"
-        android:permissionGroup="android.permission-group.NETWORK" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="com.beem.project.beem.BEEM_SERVICE" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-
-    <uses-sdk
-        android:minSdkVersion="7"
-        android:targetSdkVersion="8" />
-
-    <supports-screens
-        android:anyDensity="true"
-        android:largeScreens="true"
-        android:normalScreens="true"
-        android:smallScreens="true" />
-
 </manifest>
\ No newline at end of file