arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-05-08 18:08:53 +00:00
Code Issues Releases Wiki Activity

Use string resource for logging file provider authority; vcard4android update

Browse Source
This commit is contained in:
Ricki Hirner 2016-10-17 23:56:45 +02:00
parent 8e5ca5a72d
commit ae8bf4d49e
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -187,7 +187,7 @@
</activity> </activity>
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="android.support.v4.content.FileProvider"
android:authorities="at.bitfire.davdroid.log" android:authorities="@string/authority_log_provider"
android:grantUriPermissions="true" android:grantUriPermissions="true"
android:exported="false"> android:exported="false">
<meta-data <meta-data

6
app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.java
View File

@ -84,19 +84,19 @@ public class DebugInfoActivity extends AppCompatActivity implements LoaderManage
Intent sendIntent = new Intent(); Intent sendIntent = new Intent();
sendIntent.setAction(Intent.ACTION_SEND); sendIntent.setAction(Intent.ACTION_SEND);
sendIntent.setType("text/plain"); sendIntent.setType("text/plain");
sendIntent.putExtra(Intent.EXTRA_SUBJECT, "DAVdroid " + BuildConfig.VERSION_NAME + " debug info"); sendIntent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.app_name) + " " + BuildConfig.VERSION_NAME + " debug info");
try { try {
File debugInfoDir = new File(getCacheDir(), "debug-info"); File debugInfoDir = new File(getCacheDir(), "debug-info");
debugInfoDir.mkdir(); debugInfoDir.mkdir();
reportFile = new File(debugInfoDir, "davdroid-debug.txt"); reportFile = new File(debugInfoDir, "debug.txt");
App.log.fine("Writing debug info to " + reportFile.getAbsolutePath()); App.log.fine("Writing debug info to " + reportFile.getAbsolutePath());
FileWriter writer = new FileWriter(reportFile); FileWriter writer = new FileWriter(reportFile);
writer.write(report); writer.write(report);
writer.close(); writer.close();
sendIntent.putExtra(Intent.EXTRA_STREAM, FileProvider.getUriForFile(this, "at.bitfire.davdroid.log", reportFile)); sendIntent.putExtra(Intent.EXTRA_STREAM, FileProvider.getUriForFile(this, getString(R.string.authority_log_provider), reportFile));
startActivity(Intent.createChooser(sendIntent, null)); startActivity(Intent.createChooser(sendIntent, null));
} catch (IOException e) { } catch (IOException e) {

1
app/src/main/res/values/strings.xml
View File

@ -233,6 +233,7 @@
<string name="exception_show_details">Show details</string> <string name="exception_show_details">Show details</string>
<!-- sync errors and DebugInfoActivity --> <!-- sync errors and DebugInfoActivity -->
<string name="authority_log_provider">at.bitfire.davdroid.log</string>
<string name="debug_info_title">Debug info</string> <string name="debug_info_title">Debug info</string>
<string name="sync_error_permissions">DAVdroid permissions</string> <string name="sync_error_permissions">DAVdroid permissions</string>
<string name="sync_error_permissions_text">Additional permissions required</string> <string name="sync_error_permissions_text">Additional permissions required</string>

2
vcard4android

@ -1 +1 @@
Subproject commit 37a8021a5dbd88c0f5ca0d6109c515e8726b00ca Subproject commit bf48e81013e4941d111b302547b298ac58c9c151