diff options
Diffstat (limited to 'org.fox.ttrss')
-rw-r--r-- | org.fox.ttrss/build.gradle | 1 | ||||
-rw-r--r-- | org.fox.ttrss/org.fox.ttrss.iml | 1 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/AndroidManifest.xml | 7 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/java/org/fox/ttrss/GlobalState.java | 17 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/values-v11/style.xml | 2 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/values/strings.xml | 2 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/xml/preferences.xml | 5 |
7 files changed, 29 insertions, 6 deletions
diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index eae59b2a..dd635f19 100644 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -33,4 +33,5 @@ dependencies { compile 'com.google.code.gson:gson:2.3' compile 'com.android.support:appcompat-v7:21.0.3' compile 'com.shamanland:fab:0.0.5' + compile 'ch.acra:acra:4.5.0' } diff --git a/org.fox.ttrss/org.fox.ttrss.iml b/org.fox.ttrss/org.fox.ttrss.iml index f064c6a7..3e1df6ed 100644 --- a/org.fox.ttrss/org.fox.ttrss.iml +++ b/org.fox.ttrss/org.fox.ttrss.iml @@ -90,6 +90,7 @@ <orderEntry type="library" exported="" name="gson-2.3" level="project" /> <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" /> <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" /> + <orderEntry type="library" exported="" name="acra-4.5.0" level="project" /> <orderEntry type="library" exported="" name="universal-image-loader-1.9.3" level="project" /> <orderEntry type="library" exported="" name="dashclock-api-r1.1" level="project" /> <orderEntry type="library" exported="" name="fab-0.0.5" level="project" /> diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 1434c59e..c6eed360 100644 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -250,6 +250,13 @@ android:name=".ArticleImagesPagerActivity" android:label="Article Images" > </activity> + + <activity android:name="org.acra.CrashReportDialog" + android:theme="@style/DarkDialogTheme" + android:launchMode="singleInstance" + android:excludeFromRecents="true" + android:finishOnTaskLaunch="true" /> + </application> </manifest> diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GlobalState.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GlobalState.java index 6f81fc5d..de4ca5ed 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GlobalState.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GlobalState.java @@ -1,15 +1,20 @@ package org.fox.ttrss; -import java.util.ArrayList; +import android.app.Application; +import android.os.Bundle; +import android.os.Parcelable; +import org.acra.ACRA; +import org.acra.ReportingInteractionMode; +import org.acra.annotation.ReportsCrashes; import org.fox.ttrss.types.Article; import org.fox.ttrss.types.ArticleList; import org.fox.ttrss.types.Feed; -import android.app.Application; -import android.os.Bundle; -import android.os.Parcelable; - +import java.util.ArrayList; +@ReportsCrashes(formKey = "", mode = ReportingInteractionMode.DIALOG, + resDialogText = R.string.crash_dialog_text, + formUri = "http://tt-rss.org/acra/submit/") public class GlobalState extends Application { private static GlobalState m_singleton; @@ -28,6 +33,8 @@ public class GlobalState extends Application { @Override public final void onCreate() { super.onCreate(); + ACRA.init(this); + m_singleton = this; } diff --git a/org.fox.ttrss/src/main/res/values-v11/style.xml b/org.fox.ttrss/src/main/res/values-v11/style.xml index d09304cd..54a7530e 100644 --- a/org.fox.ttrss/src/main/res/values-v11/style.xml +++ b/org.fox.ttrss/src/main/res/values-v11/style.xml @@ -2,5 +2,5 @@ <style name="DarkDialogTheme" parent="android:Theme.Holo.Dialog"> </style> - + </resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index 9df0f0ec..1eb185ac 100644 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -264,4 +264,6 @@ <string name="headline_display_mode_no_images">No images</string> <string name="headline_display_mode_compact">Compact</string> <string name="version">Version: %1$s (%2$d)</string> + <string name="prefs_enable_crash_reporting">Report crashes to tt-rss.org</string> + <string name="crash_dialog_text">Unfortunately, Tiny Tiny RSS has stopped. Submit crash report to tt-rss.org?</string> </resources> diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index dc9216f9..ca2c9fe4 100644 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -187,6 +187,11 @@ android:defaultValue="false" android:key="transport_debugging" android:title="@string/transport_debugging" /> + <CheckBoxPreference + android:defaultValue="false" + android:key="enable_crash_reporting" + android:title="@string/prefs_enable_crash_reporting" /> + </PreferenceCategory> <Preference |