Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2

native/Makefile~

@@ -1,22 +0,0 @@
-arm: CC = arm-linux-androideabi-gcc
-x86: CC = i686-linux-android-gcc
-mips: CC = mipsel-linux-android-gcc
-CFLAGS = -Wall -g
-LDFLAGS = -llog
-SRC = p.c
-OBJ = $(SRC:.c=.o)
-EXE = p
-
-arm x86 mips: $(SRC) $(EXE)
-
-$(EXE): $(OBJ)
-	$(CC) -o $@ $^ $(LDFLAGS)
-
-%.o: %.c
-	$(CC) -o $@ -c $< $(CFLAGS)
-
-clean:
-	rm -f *.o $(EXE)
-
-install:
-	adb push p /data/local

src/de/tudarmstadt/informatik/hostage/ui2/activity/MainActivity.java

@@ -476,6 +476,8 @@ public class MainActivity extends Activity {
 	@Override
 	public void onBackPressed() {
 		if (getFragmentManager().getBackStackEntryCount() == 1) {
+			MainActivity.getInstance().getHostageService().stopListeners();
+			MainActivity.getInstance().stopAndUnbind();
 			finish();
 		} else {
 			super.onBackPressed();