Changed path for settings in shared preference and put it in strings.xml

res/values/strings.xml

@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">HosTaGe</string>
-    <string name="UUID">9fc4f490-659e-11e3-949a-0800200c9a66</string>
-    <string name="action_settings">Settings</string>
     <string name="action_about">About</string>
-    <string name="capital_on">OFF</string>
+    <string name="action_settings">Settings</string>
+    <string name="app_name">HosTaGe</string>
+    <string name="bssid">BSSID:</string>
+    <string name="cancel">Cancel</string>
     <string name="capital_off">ON</string>
-    <string name="status">Status</string>
-    <string name="paranoid">Paranoid Mode</string>
+    <string name="capital_on">OFF</string>
+    <string name="clear">Clear</string>
+    <string name="connections">Recorded connections:</string>
+    <string name="database">Database</string>
+    <string name="delete">Delete</string>
+    <string name="delete_dialog_title">Delete data sets by:</string>
     <string name="details">Connection info</string>
-    <string name="ssid">SSID:</string>
-    <string name="bssid">BSSID:</string>
-    <string name="internal_ip">Internal IP:</string>
+    <string name="dialog_clear_database">Clear all data?</string>
+    <string name="dialog_clear_database_date">Delete all data before:</string>
+    <string name="export_dialog_title">Choose Export Format</string>
     <string name="external_ip">External IP:</string>
+    <string name="firstAttack">First Attack:</string>
+    <string name="internal_ip">Internal IP:</string>
+    <string name="lastAttack">Last Attack:</string>
+    <string name="log_actions">Actions</string>
+    <string name="paranoid">Paranoid Mode</string>
+    <string name="playground">Playground</string>
     <string name="services">Services</string>
-    <string name="connections">Recorded connections:</string>
+    <string name="shared_preference_path">de.tudarmstadt.informatik.hostage.preferences</string>
+    <string name="ssid">SSID:</string>
     <string name="statistics">Statistics</string>
-    <string name="database">Database</string>    
-	<string name="log_actions">Actions</string>
-	<string name="firstAttack">First Attack:</string>
-	<string name="lastAttack">Last Attack:</string>
-	<string name="clear">Clear</string>
-	<string name="delete">Delete</string>
-	<string name="cancel">Cancel</string>
-	<string name="dialog_clear_database">Clear all data?</string>	
-	<string name="export_dialog_title">Choose Export Format</string>		
-	<string name="delete_dialog_title">Delete data sets by:</string>	
-	<string name="dialog_clear_database_date">Delete all data before:</string>
-	
-	<string name="playground">Playground</string>
-
+    <string name="status">Status</string>
+    <string name="UUID">9fc4f490-659e-11e3-949a-0800200c9a66</string>
+    
 </resources>

src/de/tudarmstadt/informatik/hostage/HoneyService.java

@@ -100,7 +100,10 @@ public class HoneyService extends Service {
 		registerNetReceiver();
 		updateConnectionInfo();
 		getLocationData();
-		if(getSharedPreferences("de.tudarmstadt.informatik.hostage.http", MODE_PRIVATE).getBoolean("useQotd", true) == true) {
+		
+		String sharedPreferencePath = getString(R.string.shared_preference_path);
+		boolean useQotd = getSharedPreferences(sharedPreferencePath , MODE_PRIVATE).getBoolean("useQotd", true);
+		if(useQotd) {
 			new QotdTask().execute(new String[] {});
 		}
 	}

src/de/tudarmstadt/informatik/hostage/protocol/SMB.java

@@ -8,8 +8,8 @@ import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.TimeZone;
 
-import android.content.SharedPreferences;
 import de.tudarmstadt.informatik.hostage.HoneyService;
+import de.tudarmstadt.informatik.hostage.R;
 import de.tudarmstadt.informatik.hostage.commons.HelperUtils;
 import de.tudarmstadt.informatik.hostage.wrapper.Packet;
 
@@ -199,8 +199,8 @@ public class SMB implements Protocol {
 		{"Unix", "Samba"}
 	};
 	private static String[] initServerVersion() {
-		SharedPreferences sharedPref = HoneyService.getContext().getSharedPreferences("de.tudarmstadt.informatik.hostage.profile", HoneyService.MODE_PRIVATE);
-		String profile = sharedPref.getString("profile", "");
+		String sharedPreferencePath = HoneyService.getContext().getString(R.string.shared_preference_path);
+		String profile = HoneyService.getContext().getSharedPreferences(sharedPreferencePath, HoneyService.MODE_PRIVATE).getString("profile", "");
 		System.out.println(profile);
 		if(profile.equals("Windows 7")) {
 			return possibleSmbVersions[0];