Updatedfor Tracing

AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.tudarmstadt.informatik.hostage"
+    xmlns:tools="http://schemas.android.com/tools"
     android:versionCode="3"
     android:versionName="1.1" >
 
@@ -46,13 +47,13 @@
         android:installLocation="preferExternal"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
-        android:vmSafeMode="true" >
+        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" />
+            android:value="@string/google_maps_api_key" />
 
         <activity
             android:name=".ui.activity.MainActivity"

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
 }
 apply plugin: 'com.android.application'
@@ -37,8 +37,8 @@ android {
     buildToolsVersion "19.1.0"
 
     defaultConfig {
-        versionCode 2
-        versionName "3.0"
+        versionCode 3
+        versionName "1.1"
         minSdkVersion 14
         targetSdkVersion 19
     }
@@ -84,6 +84,7 @@ android {
         debug {
             debuggable true
             jniDebuggable true
+            resValue "string", "google_maps_api_key", "AIzaSyCqh4bb4aMzvDcpDfiqHyXoAWFTQ6iNxe8"
         }
 
         if (doSigningForRelease) {
@@ -91,6 +92,7 @@ android {
                 debuggable false
                 jniDebuggable false
                 signingConfig signingConfigs.release
+                resValue "string", "google_maps_api_key", "AIzaSyCqh4bb4aMzvDcpDfiqHyXoAWFTQ6iNxe8"
             }
         }
     }

res/xml/settings_preferences.xml

@@ -45,7 +45,7 @@
 
 		<EditTextPreference
 				android:key="pref_upload_server"
-				android:defaultValue="https://ssi.cased.de"
+				android:defaultValue="https://www.tracingmonitor.org"
 				android:title="@string/pref_upload_server" />
 
         <EditTextPreference

src/de/tudarmstadt/informatik/hostage/commons/HelperUtils.java

@@ -274,7 +274,7 @@ public final class HelperUtils {
 			// Create HttpPost
 			httppost = new HttpPost(PreferenceManager
 					.getDefaultSharedPreferences(context).getString(
-							"pref_upload", "https://ssi.cased.de"));
+							"pref_upload", "https://www.tracingmonitor.org"));
 
 			// Create JSON String of Record
 			StringEntity se = new StringEntity(record.toString(TraCINgFormatter.getInstance()));

src/de/tudarmstadt/informatik/hostage/sync/android/SyncAdapter.java

@@ -66,7 +66,7 @@ public class SyncAdapter extends AbstractThreadedSyncAdapter {
 
         long lastSyncTime = pref.getLong("LAST_SYNC_TIME", 0);
 
-        String serverAddress = pref.getString("pref_upload_server", "https://ssi.cased.de"); //"https://192.168.1.118:9999"
+        String serverAddress = pref.getString("pref_upload_server", "https://www.tracingmonitor.org"); //"https://192.168.1.118:9999"
 
         Log.i(TAG, "Connecting to " + serverAddress);
         LogFilter filter = new LogFilter();

src/de/tudarmstadt/informatik/hostage/sync/android/SyncUtils.java

@@ -264,7 +264,9 @@ public class SyncUtils {
 
     public static SyncData getSyncDataFromTracing(Context context, Synchronizer synchronizer, long fromTime){
         SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(context);
-        String serverAddress = pref.getString("pref_upload_server", "https://ssi.cased.de");
+        String serverAddress = pref.getString("pref_upload_server", "https://www.tracingmonitor.org");
+        //String serverAddress = pref.getString("pref_upload_server", "https://ssi.cased.de");
+
 
         HttpPost httppost;
         try {
@@ -496,7 +498,8 @@ public class SyncUtils {
 
     public static JSONArray retrieveNewAttacks(Context context, boolean fromPosition){
         SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(context);
-        String serverAddress = pref.getString("pref_download_server", "http://ssi.cased.de/api");
+        String serverAddress = pref.getString("pref_download_server", "https://www.tracingmonitor.org");
+        //String serverAddress = pref.getString("pref_download_server", "http://ssi.cased.de/api");
         long lastDownloadTime = pref.getLong("pref_download_last_time", 0);
 
         Calendar calendar = GregorianCalendar.getInstance();

src/de/tudarmstadt/informatik/hostage/sync/tracing/TracingSyncService.java

@@ -124,7 +124,7 @@ public class TracingSyncService extends IntentService {
 
 
         // Then upload to tracing
-        String serverAddress = pref.getString("pref_upload_server", "https://ssi.cased.de"); //"https://192.168.1.118:9999"
+        String serverAddress = pref.getString("pref_upload_server", "http://www.tracingmonitor.org"); //"https://192.168.1.118:9999"
 
         LogFilter filter = new LogFilter();
         filter.setAboveTimestamp(lastSyncTime);