Merge branch 'master' of https://wulf.pfeiffer@git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostage.git

.gitignore

@@ -23,4 +23,11 @@ proguard/
 *.ipr
 *.iws
 .idea/
-/native
+
+# Ignore some folders
+target/
+build/
+.gradle/
+gen-external-apklibs/
+native/build
+native/build.o

.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

AndroidManifest.xml

@@ -5,7 +5,7 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="14"
         android:targetSdkVersion="19" />
 
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -13,10 +13,9 @@
     <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-feature
         android:name="android.hardware.nfc"
@@ -24,19 +23,36 @@
 
     <application
         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:theme="@style/AppTheme"
+        android:vmSafeMode="true" >
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version" />
+        <meta-data
+            android:name="com.google.android.maps.v2.API_KEY"
+            android:value="AIzaSyCqh4bb4aMzvDcpDfiqHyXoAWFTQ6iNxe8" />
+
         <activity
-            android:name="de.tudarmstadt.informatik.hostage.ui.MainActivity"
+            android:name="de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name" >
+            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="de.tudarmstadt.informatik.hostage.ui.MainActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name" >
+        </activity>
         <activity
             android:name="de.tudarmstadt.informatik.hostage.ui.ViewLog"
             android:label="@string/statistics" >
@@ -45,6 +61,10 @@
             android:name="de.tudarmstadt.informatik.hostage.ui.ViewLogTable"
             android:label="@string/database" >
         </activity>
+        <activity
+            android:name=".ui2.activity.ProfileEditActivity"
+            android:label="Edit Profile" >
+        </activity>
         <activity
             android:name="de.tudarmstadt.informatik.hostage.ui.SettingsActivity"
             android:label="@string/settings" >
@@ -58,14 +78,14 @@
             android:label="@string/gui_playground" >
         </activity>
         <activity
-            android:name="de.tudarmstadt.informatik.hostage.sync.BluetoothSync" 
-            android:theme="@android:style/Theme.Dialog"
-            android:label="@string/gui_bluetooth">
+            android:name="de.tudarmstadt.informatik.hostage.sync.BluetoothSync"
+            android:label="@string/gui_bluetooth"
+            android:theme="@android:style/Theme.Dialog" >
         </activity>
         <activity
             android:name="de.tudarmstadt.informatik.hostage.sync.NFCSync"
-            android:theme="@android:style/Theme.Dialog"
-            android:label="@string/gui_nfc" >
+            android:label="@string/gui_nfc"
+            android:theme="@android:style/Theme.Dialog" >
             <intent-filter>
                 <action android:name="android.nfc.action.NDEF_DISCOVERED" />
 
@@ -75,7 +95,9 @@
             </intent-filter>
         </activity>
 
-        <service android:name="de.tudarmstadt.informatik.hostage.Hostage" >
+        <service
+            android:name="de.tudarmstadt.informatik.hostage.Hostage"
+            android:exported="false" >
         </service>
         <service
             android:name="de.tudarmstadt.informatik.hostage.logging.Logger"
@@ -87,8 +109,6 @@
             android:authorities="de.tudarmstadt.informatik.hostage.provider"
             android:exported="false" >
         </provider>
-        
-
     </application>
 
 </manifest>

TODO

@@ -0,0 +1,10 @@
+√ [Overview]    Greeting animation only to show on application start, not on every fragment creation/recreating
+! [Overview]	Don’t play „no threat“ animation first before playing actual animation (quickly tell ThreatIndicator the threat state)
+! [Statistics]  Switch to records view on record click
+! [Back Button] * Fix scenario: Home View -> Threat Map -> Back Button -> Threat Map
+                * Fix scenario: Home View -> Connection details -> Records -> Back Button
+! [Record Overview] Display a message when there are no records (because of filtering)
+! [Overview]	Correct icon for active profile
+! [Profile Manager] Use new icon for assorted profiles
+! [Honey Service] Use nicer icon
+! [Statistics]  Numbers shouldn't be float numbers

assets/shaders/skinned.frag

@@ -0,0 +1,16 @@
+precision mediump float;
+
+uniform vec4 color;
+uniform sampler2D texture;
+
+varying vec3 vertexNormal;
+varying vec2 vertexTexCoord;
+
+void main() {
+	vec3 normal = normalize(vertexNormal);
+	float lambert = max(0.0, -normal.z);
+	float rim = 1.0 - lambert;
+	rim *= rim * rim;
+	vec4 texColor = texture2D(texture, vertexTexCoord);
+	gl_FragColor = rim + (0.4 + 0.4 * lambert) * texColor * color;
+}

assets/shaders/skinned.vert

@@ -0,0 +1,25 @@
+uniform mat4 mvp;
+uniform mat4 boneMatrices[16];
+
+attribute vec3 position;
+attribute vec3 normal;
+attribute vec2 texCoord;
+
+attribute vec4 boneIndices; // should be ivec4
+attribute vec3 boneWeights;
+
+varying vec3 vertexNormal;
+varying vec2 vertexTexCoord;
+
+void main() {
+	float fourthBoneWeight = 1.0 - boneWeights[0] - boneWeights[1] - boneWeights[2];
+
+	mat4 boneMatrix = boneWeights[0] * boneMatrices[int(boneIndices.x)];
+	boneMatrix += boneWeights[1] * boneMatrices[int(boneIndices.y)];
+	boneMatrix += boneWeights[2] * boneMatrices[int(boneIndices.z)];
+	boneMatrix += fourthBoneWeight * boneMatrices[int(boneIndices.w)];
+
+	vertexNormal = mat3(mvp) * mat3(boneMatrix) * normal;
+	vertexTexCoord = texCoord;
+	gl_Position = mvp * boneMatrix * vec4(position, 1.0);
+}

project.properties

@@ -12,3 +12,7 @@
 
 # Project target.
 target=android-19
+android.library=false
+
+
+android.library.reference.1=../google-play-services_lib

res/drawable-xhdpi/popup_background.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/popup_black"/>