last bugs from merge fixed

AndroidManifest.xml

@@ -19,9 +19,6 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
-<!--	<uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
--->
 	<uses-feature
         android:name="android.hardware.nfc"
         android:required="false" />
@@ -71,7 +68,7 @@
             android:theme="@android:style/Theme.Dialog" >
         </activity>
         <activity
-            android:name="de.tudarmstadt.informatik.hostage.sync.nfc.NFCSync"
+            android:name="de.tudarmstadt.informatik.hostage.sync.nfc.NFCSyncActivity"
             android:label="@string/gui_nfc"
             android:theme="@android:style/Theme.Dialog" >
             <intent-filter>
@@ -91,11 +88,6 @@
             android:name="de.tudarmstadt.informatik.hostage.logging.Logger"
             android:exported="false" >
         </service>
-        <service
-            android:name="de.tudarmstadt.informatik.hostage.sync.tracing.TracingSyncService"
-            android:exported="false" >
-        </service>
-
 	    <service
 		    android:name="de.tudarmstadt.informatik.hostage.logging.LogExport"
 	        android:exported="false">

build-types/debug/AndroidManifest.xml

@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.tudarmstadt.informatik.hostage">
-    <!-- android:versionCode="1"
-    android:versionName="1.0"
-    > -->
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="19" />
-
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
-	<uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-
-	<uses-feature
-        android:name="android.hardware.nfc"
-        android:required="false" />
-
-    <application
-		android:name=".HostageApplication"
-        android:allowBackup="true"
-        android:allowClearUserData="true"
-        android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_launcher"
-        android:installLocation="preferExternal"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme"
-        android:vmSafeMode="true" >
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_lib_version" />
-        <meta-data
-            android:name="com.google.android.maps.v2.API_KEY" />
-            <!--android:value="@string/google_maps_api_key_debug" -->
-
-        <activity
-            android:name="de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name"
-            android:screenOrientation="portrait" >
-           	<intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-        </activity>
-
-        <activity
-            android:name=".ui2.activity.ProfileEditActivity"
-            android:label="Edit Profile" >
-        </activity>
-
-        <activity
-            android:name="de.tudarmstadt.informatik.hostage.sync.tracing.TracingSyncActivity"
-            android:label="@string/gui_tracing"
-            android:theme="@android:style/Theme.Dialog" >
-        </activity>
-        <activity
-            android:name="de.tudarmstadt.informatik.hostage.sync.bluetooth.BluetoothSyncActivity"
-            android:label="@string/gui_bluetooth"
-            android:theme="@android:style/Theme.Dialog" >
-        </activity>
-        <activity
-            android:name="de.tudarmstadt.informatik.hostage.sync.nfc.NFCSync"
-            android:label="@string/gui_nfc"
-            android:theme="@android:style/Theme.Dialog" >
-            <intent-filter>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="application/de.tudarmstadt.informatik.hostage" />
-            </intent-filter>
-        </activity>
-
-        <service
-            android:name="de.tudarmstadt.informatik.hostage.Hostage"
-            android:exported="false" >
-        </service>
-        <service
-            android:name="de.tudarmstadt.informatik.hostage.logging.Logger"
-            android:exported="false" >
-        </service>
-        <service
-            android:name="de.tudarmstadt.informatik.hostage.sync.tracing.TracingSyncService"
-            android:exported="false" >
-        </service>
-
-	    <service
-		    android:name="de.tudarmstadt.informatik.hostage.logging.LogExport"
-	        android:exported="false">
-	    </service>
-
-	    <provider
-            android:name="de.tudarmstadt.informatik.hostage.provider.HostageContentProvider"
-            android:authorities="de.tudarmstadt.informatik.hostage.provider"
-            android:exported="false" >
-        </provider>
-    </application>
-
-</manifest>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:0.13.2'
     }
 }
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 repositories {
     mavenCentral()