Prechádzať zdrojové kódy

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

Fabio Arnold 11 rokov pred
rodič
commit
bc5e52124c

+ 9 - 0
res/layout-land/fragment_statistics.xml

@@ -24,6 +24,15 @@
             android:id="@+id/plot_parent_layout"
             android:layout_weight="0.9">
 
+            <ProgressBar
+                android:id="@+id/progressBar1"
+                style="?android:attr/progressBarStyleLarge"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:visibility="gone"/>
+
             <!-- TITLE LAYOUT -->
             <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:orientation="vertical"

+ 4 - 1
src/de/tudarmstadt/informatik/hostage/persistence/ProfileManager.java

@@ -403,10 +403,13 @@ public class ProfileManager {
 		if(MainActivity.getInstance().getHostageService() != null){
 			if(MainActivity.getInstance().getHostageService().hasRunningListeners()){
 				List<String> protocolsToStart = profile.getActiveProtocols();
+				if(profile.mGhostActive){
+					protocolsToStart.add("GHOST");
+				}
 
 				for(Listener listener: MainActivity.getInstance().getHostageService().getListeners()){
 					if(listener.isRunning()){
-						if(protocolsToStart.contains(listener.getProtocolName())){
+						if(protocolsToStart.contains(listener.getProtocolName()) && !listener.getProtocolName().equals("GHOST")){
 							protocolsToStart.remove(listener.getProtocolName());
 						} else {
 							MainActivity.getInstance().getHostageService().stopListenerAllPorts(listener.getProtocolName());