Merge branch 'master' into release

Conflicts:
	Android/src/org/droidplanner/android/fragments/FlightActionsFragment.java

Author: arthurbenemann

.travis.yml

@@ -2,6 +2,7 @@ language: android
 android:
   components:
     - build-tools-19.1.0
+    - android-19
   licenses:
     - 'android-sdk-license-.+'
 

Android/build.gradle

@@ -1,4 +1,4 @@
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 repositories {
     mavenCentral()

Android/res/values-de/strings.xml

@@ -344,4 +344,34 @@
     <string name="telemetry_label">Telemetrie</string>
     <string name="flight_modes_label">Flugmodi</string>
     <string name="menu_info_bar">Infoleiste</string>
+    <string name="activity_title_map_provider_preferences">Karten-Provider Einstellungen</string>
+    <string name="app_settings">App-Einstellungen</string>
+    <string name="dlg_clear_mission_confirm">Alle Wegpunkte von der Karte löschen?</string>
+    <string name="dlg_clear_mission_title">Mission löschen</string>
+    <string name="draw_the_survey_region">Erhebungsregion zeichnen</string>
+    <string name="drawer_close">Navigationsleiste ausblenden</string>
+    <string name="drawer_open">Navigationsleiste anzeigen</string>
+    <string name="flight_data">Flugdaten</string>
+    <string name="ga_mode_details_close_panel">Panel geschlossen um</string>
+    <string name="ga_mode_details_open_panel">Panel geöffnet um</string>
+    <string name="guided_mode_warning">OK drücken, um Guided Modus zu starten. Um Position zu ändern, Karte drücken und halten.</string>
+    <string name="mode_hybrid">Hybrid erlaubt das Halten der Position (GPS) mit Reaktion auf Eingaben des Piloten.</string>
+    <string name="pref_live_upload">Live Upload aktivieren (Alpha-Test)</string>
+    <string name="pref_live_upload_summary">Live-Verfolgung der Drohne auf Droneshare</string>
+    <string name="pref_map_provider_settings_summary">Karten-Provider konfigurieren</string>
+    <string name="pref_map_provider_settings_title">Karten-Provider Einstellungen</string>
+    <string name="pref_maps_providers_summary">Welcher Karten-Provider verwendet werden soll.</string>
+    <string name="pref_maps_providers_title">Karten-Provider</string>
+    <string name="pref_maps_title">Karten</string>
+    <string name="pref_title_google_map">Google Map Einstellungen</string>
+    <string name="pref_title_language">Sprache</string>
+    <string name="pref_title_notifications">Benachrichtigungen</string>
+    <string name="pref_title_osm">Open Street Map Einstellungen</string>
+    <string name="pref_title_screen">Bildschirm</string>
+    <string name="pref_usage_statistics_summary">Mithelfen, DroidPlanner zu verbessern, indem Nutzungsstatistiken eingesendet werden.</string>
+    <string name="pref_usage_statistics_title">Nutzungsstatistiken senden</string>
+    <string name="spline_waypoint_toggle">Keil</string>
+    <string name="usage_statistics">Nutzungsstatistiken</string>
+    <string name="waypointType_SplineWaypoint">Keilwegpunkt</string>
+    <string name="expandable_listview_icon_desc">Erweiterbares Listenansichtsicon</string>
 </resources>

Android/res/values/preferences_keys.xml

@@ -28,4 +28,5 @@ This file is used to store the preferences keys so that it's accessible and modi
     <string name="pref_mavlink_version_key">pref_mavlink_version</string>
     <string name="pref_usage_statistics_key">pref_usage_statistics</string>
     <string name="pref_version_key">pref_version</string>
+    <string name="pref_keep_screen_bright_key">pref_keep_screen_bright</string>
 </resources>

Android/res/values/strings.xml

@@ -356,7 +356,6 @@
     <string name="expandable_listview_icon_desc">Expandable listview icon</string>
 
     <!-- Google Analytics -->
-    <string name="ga_mode_details_panel_category">Mode Details Panel</string>
     <string name="ga_mode_details_open_panel">Panel Open Time</string>
     <string name="ga_mode_details_close_panel">Panel Close Time</string>
 
@@ -368,9 +367,6 @@
     <string name="msg_connect_first">Please connect first</string>
     <string name="mode1_throttle_on_right_stick">Mode 1: Throttle on RIGHT stick</string>
     <string name="mode2_throttle_on_left_stick">Mode 2: Throttle on LEFT stick</string>
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-    <string name="title_activity_test">TestActivity</string>
-    <string name="hello_world">Hello world!</string>
     <string name="pref_map_provider_settings_summary">Configure the selected map provider</string>
     <string name="pref_map_provider_settings_title">Map Provider Preferences</string>
     <string name="pref_title_google_map">Google Map Preferences</string>

Android/res/xml/preferences.xml

@@ -28,7 +28,7 @@
                 android:title="@string/pref_title_screen" >
                 <CheckBoxPreference
                     android:defaultValue="true"
-                    android:key="pref_keep_screen_bright"
+                    android:key="@string/pref_keep_screen_bright_key"
                     android:summary="@string/pref_keep_screen_bright_summary"
                     android:title="@string/pref_keep_screen_bright" />
                 <CheckBoxPreference

Android/src/org/droidplanner/android/DroidPlannerApp.java

@@ -1,8 +1,7 @@
 package org.droidplanner.android;
 
-import org.droidplanner.BuildConfig;
-import org.droidplanner.R;
 import org.droidplanner.android.gcs.FollowMe;
+import org.droidplanner.android.utils.analytics.GAUtils;
 import org.droidplanner.core.bus.events.DroneConnectedEvent;
 import org.droidplanner.core.bus.events.DroneDisconnectedEvent;
 import org.droidplanner.android.proxy.mission.MissionProxy;
@@ -18,16 +17,11 @@
 import org.droidplanner.core.drone.DroneInterfaces.Clock;
 import org.droidplanner.core.drone.DroneInterfaces.DroneEventsType;
 import org.droidplanner.core.drone.DroneInterfaces.Handler;
-import org.droidplanner.core.drone.Preferences;
 
+import android.content.Context;
 import android.os.SystemClock;
 
 import com.MAVLink.Messages.MAVLinkMessage;
-import com.google.android.gms.analytics.GoogleAnalytics;
-import com.google.android.gms.analytics.Logger;
-import com.google.android.gms.analytics.Tracker;
-
-import java.util.concurrent.atomic.AtomicReference;
 
 import de.greenrobot.event.EventBus;
 
@@ -39,11 +33,6 @@ public class DroidPlannerApp extends ErrorReportApp implements MAVLinkStreams.Ma
     public MissionProxy missionProxy;
 	private MavLinkMsgHandler mavLinkMsgHandler;
 
-    /**
-     * Stores a reference to the google analytics app tracker.
-     */
-    private Tracker mAppTracker;
-
 	/**
 	 * Handles dispatching of status bar, and audible notification.
 	 */
@@ -53,7 +42,8 @@ public class DroidPlannerApp extends ErrorReportApp implements MAVLinkStreams.Ma
 	public void onCreate() {
 		super.onCreate();
 
-		mNotificationHandler = new NotificationHandler(getApplicationContext());
+        final Context context = getApplicationContext();
+		mNotificationHandler = new NotificationHandler(context);
 
 		MAVLinkClient MAVClient = new MAVLinkClient(this, this);
 		Clock clock = new Clock() {
@@ -75,17 +65,19 @@ public void postDelayed(Runnable thread, long timeout) {
 				handler.postDelayed(thread, timeout);
 			}
 		};
-		DroidplannerPrefs pref = new DroidplannerPrefs(getApplicationContext());
+
+		DroidplannerPrefs pref = new DroidplannerPrefs(context);
 		drone = new Drone(MAVClient, clock, handler, pref);
 		drone.events.addDroneListener(this);
 
         missionProxy = new MissionProxy(drone.mission);
 		mavLinkMsgHandler = new org.droidplanner.core.MAVLink.MavLinkMsgHandler(drone);
 
         followMe = new FollowMe(this, drone);
-        NetworkStateReceiver.register(getApplicationContext());
+        NetworkStateReceiver.register(context);
 
-        initGATracker(pref);
+        GAUtils.initGATracker(this);
+        GAUtils.startNewSession(context);
 	}
 
 	@Override
@@ -127,28 +119,4 @@ public void onDroneEvent(DroneEventsType event, Drone drone) {
                 break;
         }
     }
-
-    private void initGATracker(DroidplannerPrefs pref){
-        final GoogleAnalytics analytics = GoogleAnalytics.getInstance(this);
-        //Call is needed for now to allow dispatching of auto activity reports
-        // (http://stackoverflow.com/a/23256722/1088814)
-        analytics.enableAutoActivityReports(this);
-
-        analytics.setAppOptOut(!pref.isUsageStatisticsEnabled());
-
-        //If we're in debug mode, set log level to verbose.
-        if(BuildConfig.DEBUG){
-            analytics.getLogger().setLogLevel(Logger.LogLevel.VERBOSE);
-        }
-
-        mAppTracker = analytics.newTracker(R.xml.google_analytics_tracker);
-    }
-
-    /**
-     * @return handles to the google analytics tracker.
-     */
-    public Tracker getTracker(){
-        return mAppTracker;
-    }
-
 }

Android/src/org/droidplanner/android/activities/FlightActivity.java

@@ -7,6 +7,7 @@
 import org.droidplanner.android.fragments.TelemetryFragment;
 import org.droidplanner.android.fragments.helpers.FlightSlidingDrawerContent;
 import org.droidplanner.android.fragments.mode.FlightModePanel;
+import org.droidplanner.android.utils.analytics.GAUtils;
 import org.droidplanner.core.drone.Drone;
 import org.droidplanner.core.drone.DroneInterfaces.DroneEventsType;
 import org.droidplanner.core.drone.DroneInterfaces.OnDroneListener;
@@ -55,11 +56,10 @@ public void onDrawerClosed() {
                 updateMapPadding();
 
                 //Stop tracking how long this was opened for.
-                mTracker.send(new HitBuilders.TimingBuilder()
-                        .setCategory(getString(R.string.ga_mode_details_panel_category))
+                GAUtils.sendTiming(new HitBuilders.TimingBuilder()
+                        .setCategory(GAUtils.Category.FLIGHT_DATA_DETAILS_PANEL.toString())
                         .setVariable(getString(R.string.ga_mode_details_close_panel))
-                        .setValue(System.currentTimeMillis())
-                        .build());
+                        .setValue(System.currentTimeMillis()));
             }
         });
 
@@ -69,11 +69,10 @@ public void onDrawerOpened() {
                 updateMapPadding();
 
                 //Track how long this is opened for.
-                mTracker.send(new HitBuilders.TimingBuilder()
-                        .setCategory(getString(R.string.ga_mode_details_panel_category))
+                GAUtils.sendTiming(new HitBuilders.TimingBuilder()
+                        .setCategory(GAUtils.Category.FLIGHT_DATA_DETAILS_PANEL.toString())
                         .setVariable(getString(R.string.ga_mode_details_open_panel))
-                        .setValue(System.currentTimeMillis())
-                        .build());
+                        .setValue(System.currentTimeMillis()));
             }
         });
 
@@ -85,12 +84,10 @@ public void onDrawerOpened() {
 					.add(R.id.mapFragment, mapFragment).commit();
 		}
 
-		editorTools = fragmentManager
-				.findFragmentById(R.id.editorToolsFragment);
+		editorTools = fragmentManager.findFragmentById(R.id.editorToolsFragment);
 		if (editorTools == null) {
 			editorTools = new FlightActionsFragment();
-			fragmentManager.beginTransaction()
-					.add(R.id.editorToolsFragment, editorTools).commit();
+			fragmentManager.beginTransaction().add(R.id.editorToolsFragment, editorTools).commit();
 		}
 
 		/*

Android/src/org/droidplanner/android/activities/helpers/SuperUI.java

@@ -5,6 +5,7 @@
 import org.droidplanner.android.fragments.helpers.BTDeviceListFragment;
 import org.droidplanner.android.maps.providers.google_map.GoogleMapFragment;
 import org.droidplanner.android.utils.Constants;
+import org.droidplanner.android.utils.DroidplannerPrefs;
 import org.droidplanner.android.utils.Utils;
 import org.droidplanner.android.widgets.actionProviders.InfoBarActionProvider;
 import org.droidplanner.core.drone.Drone;
@@ -23,18 +24,17 @@
 
 import com.google.android.gms.analytics.Tracker;
 
-public abstract class SuperUI extends FragmentActivity implements
-		OnDroneListener {
+public abstract class SuperUI extends FragmentActivity implements OnDroneListener {
 	private ScreenOrientation screenOrientation = new ScreenOrientation(this);
 	private InfoBarActionProvider infoBar;
 	private GCSHeartbeat gcsHeartbeat;
 	public DroidPlannerApp app;
 	public Drone drone;
 
     /**
-     * Google analytics tracker used by the children activities.
+     * Handle to the app preferences.
      */
-    protected Tracker mTracker;
+    protected DroidplannerPrefs mAppPrefs;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -45,28 +45,26 @@ public void onCreate(Bundle savedInstanceState) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
+        app = (DroidPlannerApp) getApplication();
+        this.drone = app.drone;
+        gcsHeartbeat = new GCSHeartbeat(drone, 1);
+        mAppPrefs = new DroidplannerPrefs(getApplicationContext());
+
 		PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
 
 		/*
 		 * Used to supplant wake lock acquisition (previously in
 		 * org.droidplanner.android.service .MAVLinkService) as suggested by the
 		 * android android.os.PowerManager#newWakeLock documentation.
 		 */
-		if (PreferenceManager.getDefaultSharedPreferences(
-				getApplicationContext()).getBoolean("pref_keep_screen_bright", false)) {
+		if (mAppPrefs.keepScreenOn()) {
 			getWindow().addFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 		}
 
-		app = (DroidPlannerApp) getApplication();
-		this.drone = app.drone;
-
 		setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
 		screenOrientation.unlock();
 		Utils.updateUILanguage(getApplicationContext());
-		gcsHeartbeat = new GCSHeartbeat(drone, 1);
-
-        mTracker = app.getTracker();
 	}
 
 	@Override
@@ -192,10 +190,7 @@ public boolean onMenuItemSelected(int featureId, MenuItem item) {
 
 	protected void toggleDroneConnection() {
 		if (!drone.MavClient.isConnected()) {
-			final String connectionType = PreferenceManager
-					.getDefaultSharedPreferences(getApplicationContext())
-					.getString(Constants.PREF_CONNECTION_TYPE,
-							Constants.DEFAULT_CONNECTION_TYPE);
+			final String connectionType = mAppPrefs.getMavLinkConnectionType();
 
 			if (Utils.ConnectionType.BLUETOOTH.name().equals(connectionType)) {
 				// Launch a bluetooth device selection screen for the user

Android/src/org/droidplanner/android/communication/connection/MAVLinkConnection.java

@@ -5,11 +5,13 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.UnknownHostException;
+import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
 import org.droidplanner.android.communication.service.UploaderService;
 import org.droidplanner.android.utils.DroidplannerPrefs;
+import org.droidplanner.android.utils.analytics.GAUtils;
 import org.droidplanner.android.utils.file.FileStream;
 
 import android.content.Context;
@@ -75,10 +77,14 @@ public void run() {
 		try {
 			parser.stats.mavlinkResetStats();
 			openConnection();
-			
+
+            //Start a new ga analytics session. The new session will be tagged with the mavlink
+            // connection mechanism, as well as whether the user has an active droneshare account.
+            GAUtils.startNewSession(parentContext);
+
 			logFile = FileStream.getTLogFile();
 			logWriter = FileStream.openOutputStream(logFile);
-			logBuffer = ByteBuffer.allocate(Long.SIZE / Byte.SIZE);
+			logBuffer = ByteBuffer.allocate(4* Long.SIZE / Byte.SIZE);
 			logBuffer.order(ByteOrder.BIG_ENDIAN);
 
 			String login = prefs.getDroneshareLogin();
@@ -159,6 +165,8 @@ private void saveToLog(MAVLinkPacket receivedPacket) throws IOException {
 					uploader.filterMavlink(uploader.interfaceNum, bytes);
 			} catch (IOException e) {
 				Log.e(TAG, "Ignoring IO error in saveToLog: " + e);
+			}catch (BufferOverflowException e) {
+				Log.e(TAG, "Ignoring Buffer Overflow in saveToLog: " + e);
 			} catch (NullPointerException e) {
 				Log.e(TAG, "Ignoring NPE in " + e);
 				// There was a null pointer error for some users on