merged develop into master and fixed conflicts

android-obd-simulator/build.gradle

@@ -5,8 +5,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
 
     sourceSets {
         main {

build.gradle

@@ -39,18 +39,18 @@ ext {
     minSdkVersion = 16
     compileSdkVersion = 23
     targetSdkVersion = 23
-    buildToolsVersion = '23.0.1'
+    buildToolsVersion = '23.0.2'
     versionCode = 25
     versionName = "0.20.1"
 
     javaCompileVersion = JavaVersion.VERSION_1_8
 
     // Android dependencies.
-    supportV4 = 'com.android.support:support-v4:23.0.1'
-    supportV7 = 'com.android.support:appcompat-v7:23.0.1'
-    supportDesign = 'com.android.support:design:23.0.1'
-    supportCardview = 'com.android.support:cardview-v7:23.0.1'
-    supportRecyclerview = 'com.android.support:recyclerview-v7:23.0.1'
+    supportV4 = 'com.android.support:support-v4:23.1.1'
+    supportV7 = 'com.android.support:appcompat-v7:23.1.1'
+    supportDesign = 'com.android.support:design:23.1.1'
+    supportCardview = 'com.android.support:cardview-v7:23.1.1'
+    supportRecyclerview = 'com.android.support:recyclerview-v7:23.1.1'
 
     // Dependency injection, view injection, event bus...
     dagger = 'com.squareup.dagger:dagger:1.2.2'

org.envirocar.algorithm/.gitignore

@@ -0,0 +1 @@
+/build

org.envirocar.algorithm/build.gradle

@@ -0,0 +1,41 @@
+apply plugin: 'com.android.library'
+apply plugin: 'com.neenbedankt.android-apt'
+apply plugin: 'me.tatarka.retrolambda'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+
+    compileOptions {
+        sourceCompatibility rootProject.ext.javaCompileVersion
+        targetCompatibility rootProject.ext.javaCompileVersion
+    }
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode rootProject.ext.versionCode
+        versionName rootProject.ext.versionName
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    testCompile 'junit:junit:4.12'
+    androidTestCompile 'junit:junit:4.12'
+    compile supportV7
+
+    compile rootProject.ext.dagger
+    apt rootProject.ext.daggerCompiler
+
+    compile rootProject.ext.rxAndroid
+    compile rootProject.ext.rxJava
+
+    compile project(':org.envirocar.obd')
+}

org.envirocar.algorithm/proguard-rules.pro

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/matthes/opt/adt/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

org.envirocar.algorithm/src/androidTest/java/org/envirocar/algorithm/ApplicationTest.java

@@ -0,0 +1,13 @@
+package org.envirocar.algorithm;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}

org.envirocar.algorithm/src/main/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.envirocar.algorithm">
+
+    <application android:allowBackup="true" android:label="@string/app_name"
+        android:supportsRtl="true">
+
+    </application>
+
+</manifest>

org.envirocar.algorithm/src/main/java/org/envirocar/algorithm/AbstractMeasurementProvider.java

@@ -0,0 +1,27 @@
+package org.envirocar.algorithm;
+
+import org.envirocar.core.entity.Measurement;
+import org.envirocar.obd.commands.PID;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public abstract class AbstractMeasurementProvider implements MeasurementProvider {
+
+    private List<Position> positionBuffer = new ArrayList<>();
+
+    @Override
+    public synchronized void newPosition(Position pos) {
+        this.positionBuffer.add(pos);
+    }
+
+    public synchronized List<Position> getAndClearPositionBuffer() {
+        List<Position> result = Collections.unmodifiableList(positionBuffer);
+        positionBuffer = new ArrayList<>(result.size());
+        return result;
+    }
+
+}