Fixes Issue openfoodfacts#2069: optimized scanning and saving to data…

…base operations.
prashantkh19 · Jan 12, 2019 · cd551cf · cd551cf
1 parent b9c37ae
commit cd551cf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -33,6 +33,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:largeHeap="true"
         android:roundIcon="@mipmap/ic_launcher"
         android:theme="@style/AppTheme.NoActionBar">
 

diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/splash/SplashActivity.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/splash/SplashActivity.java
@@ -27,6 +27,7 @@
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.zip.ZipEntry;
@@ -49,7 +50,6 @@
 public class SplashActivity extends BaseActivity implements ISplashPresenter.View {
 
     private static final String TAG = "SplashActivity";
-    private static final int BUFFER_SIZE = 4096;
     @BindView(R.id.tagline)
     TextView tagline;
     @BindView(R.id.text_loading)
@@ -97,6 +97,8 @@ public void onCreate(Bundle savedInstanceState) {
                     .onPositive((dialog, which) -> doDownload())
                     .onNegative((dialog, which) -> presenter.refreshData())
                     .show();
+        } else {
+            presenter.refreshData();
         }
     }
 
@@ -328,6 +330,7 @@ protected Boolean doInBackground(Void... voids) {
             //parsing csv file
             try (CSVReader reader = new CSVReader(new FileReader(file.getAbsolutePath()), '\t')) {
                 List<String[]> records = reader.readAll();
+                List<OfflineProduct> list = new ArrayList<>();
                 Iterator<String[]> iterator = records.iterator();
                 // To skip header in the csv file
                 iterator.hasNext();
@@ -336,8 +339,12 @@ protected Boolean doInBackground(Void... voids) {
                 while (iterator.hasNext()) {
                     String[] record = iterator.next();
                     OfflineProduct offlineProduct = new OfflineProduct(record[1], record[3], record[0], record[2], record[4]);
-                    //saving to db
-                    mOfflineProductDao.insertOrReplace(offlineProduct);
+                    list.add(offlineProduct);
+                    if (count % 15000 == 0) {
+                        // saving to db
+                        mOfflineProductDao.insertOrReplaceInTx(list);
+                        list.clear();
+                    }
                     count++;
                     Log.d(TAG, "completed " + count + " / " + size);
                     long finalCount = count;
@@ -349,6 +356,8 @@ public void run() {
                     });
                     Log.d(TAG, "progress " + ((float) count / (float) size) * 100 + "% ");
                 }
+                Log.d(TAG, "done progress " + ((float) count / (float) size) * 100 + "% ");
+                mOfflineProductDao.insertOrReplaceInTx(list);
             } catch (IOException e) {
                 e.printStackTrace();
                 return false;

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -888,7 +888,7 @@
     <string name="download_offline_product">Do you want to download data to search product offline?</string>
     <string name="txtDownload">Download</string>
     <string name="txtProcessing">Processing Data...</string>
-    <string name="txtSaving">Saving to database (Progress</string>
+    <string name="txtSaving">Saving to database (Progress </string>
     <string name="txtConnectionFailed">Connection failed!</string>
     <string name="retry">Retry</string>
     <!-- Used for diets AddOn -->