diff options
| author | steckbrief <steckbrief@chefmail.de> | 2019-07-07 21:21:12 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2019-07-07 21:21:12 +0200 |
| commit | 08244e218a3cd08bb1abd1be31776510eee5da6a (patch) | |
| tree | b73568cc711268eeaa1b7485c63ec53a2efcbd02 /src/main | |
| parent | 77fb7577ee2a637abf6ff151f3b87a273aff7877 (diff) | |
implements FS#282: In-App Logcat View; introduces piratx application implementation to access the appcontext in a static way
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/Config.java | 2 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 217f90d1e..fb75c6d69 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:required="false" /> <application - android:name="android.support.multidex.MultiDexApplication" + android:name="de.thedevstack.piratx.PiratXApplication" android:allowBackup="false" android:appCategory="social" android:icon="@drawable/ic_launcher" @@ -315,6 +315,10 @@ <activity android:name=".ui.ChannelDiscoveryActivity" android:label="@string/discover_channels" /> + <activity + android:name="de.thedevstack.piratx.ui.preferences.LogCatOutputActivity" + android:label="@string/piratx_title_activity_loginformation" + android:launchMode="singleTask" /> <service android:name=".services.ExportBackupService" /> <service android:name=".services.ImportBackupService" /> diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java index 7ead13955..0e2d2b4b5 100644 --- a/src/main/java/de/pixart/messenger/Config.java +++ b/src/main/java/de/pixart/messenger/Config.java @@ -40,7 +40,7 @@ public final class Config { } - public static final String LOGTAG = "Pix-Art_Messenger"; + public static final String LOGTAG = "thedevstack.piratx"; public static final Jid BUG_REPORTS = Jid.of("piratx+bugs@conference.thedevstack.de"); diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index d8dd6c89e..580889d8f 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -465,5 +465,8 @@ android:icon="?attr/ic_settings_about" android:summary="@string/pref_about_conversations_summary" android:title="@string/title_activity_about" /> + <de.thedevstack.piratx.ui.preferences.LogInformationPreference + android:summary="@string/pref_show_logcat_summary" + android:title="@string/pref_show_logcat_title"/> </PreferenceScreen> |