From 4bf2d2a3f92b71052efe689c79c9778af9f0d801 Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <s.gillicuddy@gmail.com>
Date: Tue, 25 Jun 2019 11:18:46 +0100
Subject: [PATCH 1/3] #1224 use correct fileProvider suffix

---
 .../kiwixmobile/error/ErrorActivity.java      | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/error/ErrorActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/error/ErrorActivity.java
index d51afe9f5..8e261c2c3 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/error/ErrorActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/error/ErrorActivity.java
@@ -11,15 +11,17 @@ import android.widget.CheckBox;
 import androidx.core.content.FileProvider;
 import butterknife.BindView;
 import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.List;
 import javax.inject.Inject;
 import org.kiwix.kiwixmobile.R;
 import org.kiwix.kiwixmobile.base.BaseActivity;
 import org.kiwix.kiwixmobile.data.ZimContentProvider;
 import org.kiwix.kiwixmobile.database.newdb.dao.NewBookDao;
-import org.kiwix.kiwixmobile.zim_manager.fileselect_view.adapter.BooksOnDiskListItem.BookOnDisk;
 import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity;
 import org.kiwix.kiwixmobile.splash.SplashActivity;
+import org.kiwix.kiwixmobile.zim_manager.fileselect_view.adapter.BooksOnDiskListItem.BookOnDisk;
 
 import static org.kiwix.kiwixmobile.utils.LanguageUtils.getCurrentLocale;
 
@@ -77,16 +79,19 @@ public class ErrorActivity extends BaseActivity {
       if (allowLogsCheckbox.isChecked()) {
         File appDirectory = new File(Environment.getExternalStorageDirectory() + "/Kiwix");
         File logFile = new File(appDirectory, "logcat.txt");
-        Uri path =
-            FileProvider.getUriForFile(this, getApplicationContext().getPackageName() + ".provider",
-                logFile);
-        emailIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        emailIntent.putExtra(Intent.EXTRA_STREAM, path);
+        if(logFile.exists()) {
+          Uri path =
+              FileProvider.getUriForFile(this,
+                  getApplicationContext().getPackageName() + ".fileprovider",
+                  logFile);
+          emailIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+          emailIntent.putExtra(Intent.EXTRA_STREAM, path);
+        }
       }
 
       if (allowCrashCheckbox.isChecked()) {
         body += "Exception Details:\n\n" +
-            exception.toString() +
+            toStackTraceString(exception) +
             "\n\n";
       }
 
@@ -138,8 +143,14 @@ public class ErrorActivity extends BaseActivity {
     restartButton.setOnClickListener(v -> restartApp());
   }
 
+  private String toStackTraceString(Throwable exception) {
+    StringWriter stringWriter = new StringWriter();
+    exception.printStackTrace(new PrintWriter(stringWriter));
+    return stringWriter.toString();
+  }
+
   void restartApp() {
-    Context context = ErrorActivity.this;
+    Context context = this;
     Intent intent = new Intent(context, SplashActivity.class);
     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
         | Intent.FLAG_ACTIVITY_CLEAR_TASK

From afb62ba9f1132901182010fa1912aa861f31b4f3 Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <s.gillicuddy@gmail.com>
Date: Tue, 25 Jun 2019 15:16:59 +0100
Subject: [PATCH 2/3] #1224 attempt to fix build

---
 .travis.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c903fbffe..d9ac325c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,13 +47,14 @@ android:
 licenses:
   - ".+"
 
+before_script:
+  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 100M
+  - emulator -avd test -no-audio -no-window &
+
 script:
   - ./gradlew lintKiwixDebug jacocoTestKiwixDebugUnitTestReport
-  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 100M
-  - emulator -avd test -no-window &
   - android-wait-for-emulator
-  - adb shell setprop dalvik.vm.dexopt-flags v=n,o=v
-  - adb shell input keyevent 82 & # unlock screen by pressing menu button
+  - adb shell input keyevent 82 &
   - adb -e logcat *:D > logcat.log &
   - ./gradlew createKiwixDebugCoverageReport
 

From 5635a50920ee2789c624c54b0016f3bf0b81a08c Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <s.gillicuddy@gmail.com>
Date: Tue, 25 Jun 2019 15:52:30 +0100
Subject: [PATCH 3/3] #1224 remove extraneous dash in .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d9ac325c3..8733dbc2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ env:
   global:
     - ANDROID_TARGET=android-22
     - ANDROID_ABI=armeabi-v7a
-    -
+
 if: type != push OR tag IS present
 
 before_install: