kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-08 06:42:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

#1224 use correct fileProvider suffix

Browse Source
This commit is contained in:
Sean Mac Gillicuddy 2019-06-25 11:18:46 +01:00
parent f1dcc82103
commit 4bf2d2a3f9
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/org/kiwix/kiwixmobile/error/ErrorActivity.java
View File

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