Merge pull request #365 from enviroCar/develop

Develop

.gitignore

@@ -5,4 +5,4 @@ build/
 **/*.iml
 *.iml
 local.properties
-
+*/release/

CHANGELOG.md

@@ -0,0 +1,23 @@
+Updated the following libraries 
+  - Retrofit from 1.x to 2.5.0
+  - Acra from 4.x to 5.1.3
+  - Android Support Libraries
+    - Constraint Layouts
+    - Play Services Location
+  - Gson
+  - SQLBrite to 1.1.2
+  - findbugs to 3.0.2
+  - Apache Commons to 1.18
+
+
+Modified the SendLogFileActivity
+    - Changed the layout of the file
+    - Added checkbox list that users can select which will add tags to the subject and body of the email
+    - The email will now auto add the enviroCar version, the manufacturer and model of the phone,
+        the Android version as well as the API
+    - The car that was selected as well as the Bluetooth adapter will  be available in the email
+    - the checkbox list can easily be extended by just adding the options to an array available in
+        the strings.xml file. There are two types of arrays, one containing the text to be displayed
+        in the ListView and the other containing the tags that will be added in the email.
+    There are also separate arrays for tags to be added in the subject line and those to be added in the
+        body of the email.

LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     enviroCar app
-    Copyright (C) 2013 - 2015 the enviroCar community
+    Copyright (C) 2013 - 2019 the enviroCar community
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    enviroCar app Copyright (C) 2013 - 2015 the enviroCar community
+    enviroCar app Copyright (C) 2013 - 2019 the enviroCar community
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

LICENSE_HEADER

@@ -1,4 +1,4 @@
-Copyright (C) 2013 - 2015 the enviroCar community
+Copyright (C) 2013 - 2019 the enviroCar community
 
 This file is part of the enviroCar app.
 

android-obd-simulator/AndroidManifest.xml

@@ -17,7 +17,6 @@
       package="org.envirocar.obd"
       android:versionCode="1"
       android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="18" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
 
@@ -31,8 +30,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".DeviceListActivity"
-                  android:label="@string/select_device"
-                  android:configChanges="orientation|keyboardHidden" />
+        <!--<activity android:name=".DeviceListActivity"-->
+                  <!--android:label="@string/select_device"-->
+                  <!--android:configChanges="orientation|keyboardHidden" />-->
     </application>
 </manifest>

android-obd-simulator/build.gradle

@@ -1,12 +1,12 @@
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 dependencies {
-    compile fileTree(dir: 'libs', include: '*.jar')
+    implementation fileTree(dir: 'libs', include: '*.jar')
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     sourceSets {
         main {
@@ -20,7 +20,7 @@ android {
         }
 
         // Move the tests to tests/java, tests/res, etc...
-        instrumentTest.setRoot('tests')
+        androidTest.setRoot('tests')
 
         // Move the build types to build-types/<type>
         // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...

android-obd-simulator/res/layout/main.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 
-    Copyright (C) 2013 - 2015 the enviroCar community
+    Copyright (C) 2013 - 2019 the enviroCar community
 
     This file is part of the enviroCar app.
 

android-obd-simulator/res/layout/message.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 
-    Copyright (C) 2013 - 2015 the enviroCar community
+    Copyright (C) 2013 - 2019 the enviroCar community
 
     This file is part of the enviroCar app.
 

android-obd-simulator/res/menu/option_menu.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 
-    Copyright (C) 2013 - 2015 the enviroCar community
+    Copyright (C) 2013 - 2019 the enviroCar community
 
     This file is part of the enviroCar app.
 

android-obd-simulator/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 
-    Copyright (C) 2013 - 2015 the enviroCar community
+    Copyright (C) 2013 - 2019 the enviroCar community
 
     This file is part of the enviroCar app.
 
@@ -39,24 +39,14 @@
 
     <!--  BluetoothChat -->
     <string name="activate">Enable</string>
-    <string name="deactivate">Disable</string>
-    <string name="not_connected">You are not connected to a device</string>
     <string name="bt_not_enabled_leaving">Bluetooth was not enabled. Leaving Bluetooth Chat.</string>
     <string name="title_connecting">connecting...</string>
     <string name="title_connected_to">connected to <xliff:g id="device_name">%1$s</xliff:g></string>
     <string name="title_not_connected">not connected</string>
 
     <!--  DeviceListActivity -->
-    <string name="scanning">scanning for devices...</string>
     <string name="select_device">select a device to connect</string>
-    <string name="none_paired">No devices have been paired</string>
-    <string name="none_found">No devices found</string>
-    <string name="title_paired_devices">Paired Devices</string>
-    <string name="title_other_devices">Other Available Devices</string>
-    <string name="button_scan">Scan for devices</string>
 
     <!-- Options Menu -->
-    <string name="secure_connect">Connect a device - Secure</string>
-    <string name="insecure_connect">Connect a device - Insecure</string>
     <string name="discoverable">Make discoverable</string>
 </resources>

android-obd-simulator/src/org/envirocar/obd/OBDSimulator.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 - 2015 the enviroCar community
+ * Copyright (C) 2013 - 2019 the enviroCar community
  *
  * This file is part of the enviroCar app.
  *
@@ -128,12 +128,12 @@ private void setupChat() {
 
         // Initialize the array adapter for the conversation thread
         mConversationArrayAdapter = new ArrayAdapter<String>(this, R.layout.message);
-        mConversationView = (ListView) findViewById(R.id.in);
+        mConversationView = findViewById(R.id.in);
         mConversationView.setAdapter(mConversationArrayAdapter);
 
 
         // Initialize the send button with a listener that for click events
-        mSendButton = (Button) findViewById(R.id.button_send);
+        mSendButton = findViewById(R.id.button_send);
         mSendButton.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
                 // Send a message using content of the edit text widget

android-obd-simulator/src/org/envirocar/obd/SimulatorService.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 - 2015 the enviroCar community
+ * Copyright (C) 2013 - 2019 the enviroCar community
  *
  * This file is part of the enviroCar app.
  *