From d4c3ffed58336575ddd89e3ad1e826d97816f582 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Sat, 23 Feb 2019 14:16:15 +0100
Subject: [PATCH] Fix export

---
 app/build.gradle                                            | 2 +-
 .../gouv/etalab/mastodon/activities/BaseMainActivity.java   | 6 +++++-
 .../main/java/fr/gouv/etalab/mastodon/sqlite/Sqlite.java    | 2 +-
 app/src/main/res/values/strings.xml                         | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8fae73974..685e69fb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -93,7 +93,7 @@ dependencies {
     implementation 'org.apache.poi:poi:3.16'
     implementation 'com.github.mabbas007:TagsEditText:1.0.5'
     implementation 'com.jaredrummler:material-spinner:1.3.1'
-    implementation 'com.github.stom79:SQLite2XL:1.0.5'
+    implementation 'com.github.stom79:SQLite2XL:1.2'
     implementation "com.tonyodev.fetch2:fetch2:2.3.6"
     playstoreImplementation "io.github.kobakei:ratethisapp:$ratethisappLibraryVersion"
 }
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
index 8806e3a19..40fe566f8 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
@@ -1437,6 +1437,9 @@ public abstract class BaseMainActivity extends BaseActivity
                                 SQLiteToExcel sqliteToExcel = new SQLiteToExcel(BaseMainActivity.this, DB_NAME);
                                 String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(new Date());
                                 final String fileName = "Mastalab_export_"+timeStamp+".xls";
+                                List<String> excludedValues = new ArrayList<>();
+                                excludedValues.add(Sqlite.TABLE_TRACKING_BLOCK);
+                                sqliteToExcel.setExcludeValuesFromTables(excludedValues);
                                 sqliteToExcel.exportAllTables(fileName, new SQLiteToExcel.ExportListener() {
                                     @Override
                                     public void onStart() {
@@ -1453,10 +1456,11 @@ public abstract class BaseMainActivity extends BaseActivity
                                         intent.setDataAndType(uri, "application/vnd.ms-excel");
                                         Helper.notify_user(getApplicationContext(), intent, notificationIdTmp, BitmapFactory.decodeResource(getResources(),
                                                 R.mipmap.ic_launcher),  Helper.NotifType.STORE, getString(R.string.save_over), getString(R.string.download_from, fileName));
-                                        Toasty.success(getApplicationContext(), getString(R.string.toast_saved),Toast.LENGTH_LONG).show();
+                                        Toasty.success(getApplicationContext(), getString(R.string.data_base_exported),Toast.LENGTH_LONG).show();
                                     }
                                     @Override
                                     public void onError(Exception e) {
+                                        e.printStackTrace();
                                         Toasty.error(getApplicationContext(), getString(R.string.data_export_error_simple),Toast.LENGTH_LONG).show();
                                     }
                                 });
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/Sqlite.java b/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/Sqlite.java
index 2458d7fbb..84bba2cab 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/Sqlite.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/Sqlite.java
@@ -65,7 +65,7 @@ public class Sqlite extends SQLiteOpenHelper {
     static final String TABLE_BOOST_SCHEDULE = "BOOST_SCHEDULE";
 
     //Table for blocking tracking domains
-    static final String TABLE_TRACKING_BLOCK = "TRACKING_BLOCK";
+    public static final String TABLE_TRACKING_BLOCK = "TRACKING_BLOCK";
 
     static final String COL_USER_ID = "USER_ID";
     static final String COL_USERNAME = "USERNAME";
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e470b77ff..d22773cad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -897,6 +897,7 @@
     <string name="calls_blocked">http calls blocked by the application</string>
     <string name="list_of_blocked_domains">List of blocked calls</string>
     <string name="submit">Submit</string>
+    <string name="data_base_exported">The data base has been exported!</string>
     <!-- end languages -->