refactor(*) : Fix bugs after release

Fix Heap size.
Optimise export to CSV function.
Add proguard rules.
Update Room instrumented tests.
Add new icon to export button.

app/proguard-rules.pro

@@ -24,4 +24,7 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 -keep class javax.** { *; }
--keep class org.** { *; }
+-keep class org.** { *; }
+-keepattributes EnclosingMethod
+-keepattributes InnerClasses
+#-dontoptimize

app/src/androidTest/java/science/apolline/RoomDatabaseTest.kt

@@ -48,7 +48,7 @@ class RoomDatabaseTest {
         val gson = Gson()
         val dataListObject = gson.fromJson(dataList, JsonObject::class.java)
         val positionInitObject = Position("GPS", 152.36, 142.36, "Train")
-        val sensor = Device("Arduino", "WedSep2614:23:28EST2017", positionInitObject, dataListObject )
+        val sensor =Device("ffffffff-c9cf-31db-0000-00006c125b14","Arduino",  "1422568543702900257", positionInitObject, dataListObject )
 
         sensorDao?.insertOne(sensor)
         val sensorTest = getValue(sensorDao?.getSensorById(sensor.id)!!)

app/src/main/AndroidManifest.xml

@@ -26,6 +26,7 @@
         android:icon="@drawable/logoandroidpng"
         android:label="@string/app_name"
         android:roundIcon="@drawable/logoandroidpng"
+        android:largeHeap="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <uses-library

app/src/main/java/science/apolline/models/Device.kt

@@ -34,7 +34,7 @@ data class Device(
     @SerializedName("device_id")
     @Expose
     @PrimaryKey(autoGenerate = true)
-    var id=0
+    var id: Long = 0
 
 
 

app/src/main/java/science/apolline/service/database/SensorDao.kt

@@ -21,8 +21,8 @@ interface SensorDao {
     @Query("SELECT count(*) FROM Device")
     fun getSensorCount(): Int
 
-    @Query("SELECT * FROM Device WHERE id=:id")
-    fun getSensorById(id: Int?): LiveData<Device>
+    @Query("SELECT * FROM Device WHERE id=:idDevice")
+    fun getSensorById(idDevice: Long): LiveData<Device>
 
     @Insert(onConflict = REPLACE)
     fun insertOne(device: Device)

app/src/main/java/science/apolline/utils/DataExport.kt

@@ -40,7 +40,7 @@ class DataExport {
         return headerArray.toTypedArray()
     }
 
-    fun toJson(context:Context) {
+    fun exportToJson(context:Context) {
 
         val folder = File(getExternalStorageDirectory().toString()+"/Apolline")
 
@@ -54,7 +54,7 @@ class DataExport {
             val sensorDao = AppDatabase.getInstance(context)
             val fw = FileWriter(filename)
             val dataList = sensorDao.dumpSensor()
-            Log.e("export",dataList.size.toString())
+            Log.e("exportToCsv",dataList.size.toString())
             val gson = GsonBuilder().setPrettyPrinting().create()
             val jsonFile = gson.toJson(dataList)
             fw.write(jsonFile)
@@ -64,47 +64,19 @@ class DataExport {
         }
     }
 
-    fun toCsv(context:Context) {
 
-        val folder = File(getExternalStorageDirectory().toString() + "/Apolline")
-        if (!folder.exists())
-            folder.mkdir()
-        val filename = folder.toString() + "/" + "data.csv"
-
-        doAsync {
-
-            val sensorDao = AppDatabase.getInstance(context)
-            val dataList = sensorDao.dumpSensor()
-            val entries: MutableList<Array<String>> = mutableListOf()
-            entries.add(toHeader(dataList[0].data))
-            dataList.forEach {
-                entries.add(it.toArray())
-            }
-
-            CSVWriter(FileWriter(filename)).use { writer -> writer.writeAll(entries) }
-            uiThread {
-                context.toast("data exported to CSV")
-            }
-        }
-    }
-
-    fun export(context:Context) {
+    fun exportToCsv(context:Context) {
 
         val folder = File(getExternalStorageDirectory().toString()+"/Apolline")
         if (!folder.exists())
             folder.mkdir()
         val filenameCSV = folder.toString() + "/" + "data.csv"
-        val filenameJSON = folder.toString() + "/" + "data.json"
 
         doAsync {
 
             val sensorDao = AppDatabase.getInstance(context)
-            val fw = FileWriter(filenameJSON)
             val dataList = sensorDao.dumpSensor()
-            Log.e("export",dataList.size.toString())
-            val gson = GsonBuilder().setPrettyPrinting().create()
-            val jsonFile = gson.toJson(dataList)
-            fw.write(jsonFile)
+            Log.e("exportToCsv",dataList.size.toString())
 
             val entries: MutableList<Array<String>> = mutableListOf()
             entries.add(toHeader(dataList[0].data))

app/src/main/java/science/apolline/view/Fragment/IOIOFragment.java

@@ -109,9 +109,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         save_fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-//                export.toJson(getActivity().getApplication());
-//                export.toCsv(getActivity().getApplication());
-                  export.export(getActivity().getApplication());
+//                exportToCsv.toJson(getActivity().getApplication());
+//                exportToCsv.toCsv(getActivity().getApplication());
+                  export.exportToCsv(getActivity().getApplication());
             }
         });
 //        mapFragment = (MapFragment) getFragmentManager().findFragmentById(R.id.fragment_ioio_map);

app/src/main/java/science/apolline/viewModel/SensorViewModel.kt

@@ -80,7 +80,7 @@ class SensorViewModel(application: Application) : AndroidViewModel(application),
         doAsync {
             if(isConnectingToInternet(getApplication())){
                 val requestBody: String = RequestParser.createRequestBody(device)
-                info(requestBody)
+//                info(requestBody)
                 val api : ApiService = ApiUtils.apiService
                 val postCall : Call<InfluxBody> = api.savePost(BuildConfig.INFLUXDB_DBNAME,BuildConfig.INFLUXDB_USR,BuildConfig.INFLUXDB_PWD,requestBody)
                 val postResponse: Response<InfluxBody>

app/src/main/res/layout/fragment_ioio.xml

@@ -15,7 +15,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_menu_save"
+        app:srcCompat="@drawable/ic_save_white_48dp"
         android:layout_gravity="bottom|end"/>
 
 </android.support.design.widget.CoordinatorLayout>