Skip to content
Snippets Groups Projects
Commit 1f8e86c0 authored by akwizgran's avatar akwizgran
Browse files

Merge branch '62-roboguice-endless-error-loop' into 'master' 

improved the crash handler and refactored the manifest

Improved the CrashReportActivity by putting the activity within its own process, making it a single instance and making sure it won't show up on the recent app list. 

The old structure could create endless crash-loops and might not start the CrashReportActivity on process-related exception such as OutOfMemory because the process simply will not have the resources to do so. This problem is now fixed.

Concerning Roboguide: the problem is that every time a new task is started the xml file will be reloaded, at least with this branch there will not be an endless loop. By updating to Roboguice 3 the problem will be eliminated completely as that version has stopped using the xml file and reverted to manifest tags instead. It is getting very tempting to update.

Closes #67 

See merge request !22
parents 09774cb3 13de33c3
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
briar-android/AndroidManifest.xml
+ 5
− 22
View file @ 1f8e86c0
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
android:theme="@style/BriarTheme" android:theme="@style/BriarTheme"
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:logo="@drawable/logo"
android:allowBackup="false" > android:allowBackup="false" >
<service <service
android:name=".android.BriarService" android:name=".android.BriarService"
...@@ -36,8 +37,11 @@ ...@@ -36,8 +37,11 @@
</service> </service>
<activity <activity
android:name=".android.CrashReportActivity" android:name=".android.CrashReportActivity"
android:logo="@drawable/logo"
android:label="@string/crash_report_title" android:label="@string/crash_report_title"
android:taskAffinity="org.briarproject.android.CrashHandler"
android:excludeFromRecents="true"
android:launchMode="singleInstance"
android:process=":briar_error_handler"
android:exported="false" > android:exported="false" >
<intent-filter> <intent-filter>
<action android:name="org.briarproject.REPORT_CRASH" /> <action android:name="org.briarproject.REPORT_CRASH" />
...@@ -46,23 +50,19 @@ ...@@ -46,23 +50,19 @@
</activity> </activity>
<activity <activity
android:name=".android.DashboardActivity" android:name=".android.DashboardActivity"
android:logo="@drawable/logo"
android:label="@string/app_name" > android:label="@string/app_name" >
</activity> </activity>
<activity <activity
android:name=".android.ExpiredActivity" android:name=".android.ExpiredActivity"
android:logo="@drawable/logo"
android:label="@string/app_name" > android:label="@string/app_name" >
</activity> </activity>
<activity <activity
android:name=".android.PasswordActivity" android:name=".android.PasswordActivity"
android:logo="@drawable/logo"
android:label="@string/app_name" android:label="@string/app_name"
android:windowSoftInputMode="stateVisible" > android:windowSoftInputMode="stateVisible" >
</activity> </activity>
<activity <activity
android:name=".android.SettingsActivity" android:name=".android.SettingsActivity"
android:logo="@drawable/logo"
android:label="@string/settings_title" android:label="@string/settings_title"
android:parentActivityName=".android.DashboardActivity" > android:parentActivityName=".android.DashboardActivity" >
<meta-data <meta-data
...@@ -72,12 +72,10 @@ ...@@ -72,12 +72,10 @@
</activity> </activity>
<activity <activity
android:name=".android.SetupActivity" android:name=".android.SetupActivity"
android:logo="@drawable/logo"
android:label="@string/setup_title" > android:label="@string/setup_title" >
</activity> </activity>
<activity <activity
android:name=".android.SplashScreenActivity" android:name=".android.SplashScreenActivity"
android:logo="@drawable/logo"
android:label="@string/app_name" > android:label="@string/app_name" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
...@@ -86,12 +84,10 @@ ...@@ -86,12 +84,10 @@
</activity> </activity>
<activity <activity
android:name=".android.TestingActivity" android:name=".android.TestingActivity"
android:logo="@drawable/logo"
android:label="@string/app_name" > android:label="@string/app_name" >
</activity> </activity>
<activity <activity
android:name=".android.contact.ContactListActivity" android:name=".android.contact.ContactListActivity"
android:logo="@drawable/logo"
android:label="@string/contact_list_title" android:label="@string/contact_list_title"
android:parentActivityName=".android.DashboardActivity" > android:parentActivityName=".android.DashboardActivity" >
<meta-data <meta-data
...@@ -101,7 +97,6 @@ ...@@ -101,7 +97,6 @@
</activity> </activity>
<activity <activity
android:name=".android.contact.ConversationActivity" android:name=".android.contact.ConversationActivity"
android:logo="@drawable/logo"
android:label="@string/app_name" android:label="@string/app_name"
android:windowSoftInputMode="stateHidden" android:windowSoftInputMode="stateHidden"
android:parentActivityName=".android.contact.ContactListActivity" > android:parentActivityName=".android.contact.ContactListActivity" >
...@@ -112,7 +107,6 @@ ...@@ -112,7 +107,6 @@
</activity> </activity>
<activity <activity
android:name=".android.contact.ReadPrivateMessageActivity" android:name=".android.contact.ReadPrivateMessageActivity"
android:logo="@drawable/logo"
android:label="@string/app_name" android:label="@string/app_name"
android:parentActivityName=".android.contact.ContactListActivity" > android:parentActivityName=".android.contact.ContactListActivity" >
<meta-data <meta-data
...@@ -122,7 +116,6 @@ ...@@ -122,7 +116,6 @@
</activity> </activity>
<activity <activity
android:name=".android.contact.WritePrivateMessageActivity" android:name=".android.contact.WritePrivateMessageActivity"
android:logo="@drawable/logo"
android:label="@string/app_name" android:label="@string/app_name"
android:windowSoftInputMode="stateVisible" android:windowSoftInputMode="stateVisible"
android:parentActivityName=".android.contact.ContactListActivity" > android:parentActivityName=".android.contact.ContactListActivity" >
...@@ -133,7 +126,6 @@ ...@@ -133,7 +126,6 @@
</activity> </activity>
<activity <activity
android:name=".android.groups.AvailableGroupsActivity" android:name=".android.groups.AvailableGroupsActivity"
android:logo="@drawable/logo"
android:label="@string/available_forums_title" android:label="@string/available_forums_title"
android:parentActivityName=".android.groups.GroupListActivity" > android:parentActivityName=".android.groups.GroupListActivity" >
<meta-data <meta-data
...@@ -143,7 +135,6 @@ ...@@ -143,7 +135,6 @@
</activity> </activity>
<activity <activity
android:name=".android.groups.CreateGroupActivity" android:name=".android.groups.CreateGroupActivity"
android:logo="@drawable/logo"
android:label="@string/create_forum_title" android:label="@string/create_forum_title"
android:windowSoftInputMode="stateVisible" android:windowSoftInputMode="stateVisible"
android:parentActivityName=".android.groups.GroupListActivity" > android:parentActivityName=".android.groups.GroupListActivity" >
...@@ -154,7 +145,6 @@ ...@@ -154,7 +145,6 @@
</activity> </activity>
<activity <activity
android:name=".android.groups.GroupActivity" android:name=".android.groups.GroupActivity"
android:logo="@drawable/logo"
android:label="@string/app_name" android:label="@string/app_name"
android:parentActivityName=".android.groups.GroupListActivity" > android:parentActivityName=".android.groups.GroupListActivity" >
<meta-data <meta-data
...@@ -164,7 +154,6 @@ ...@@ -164,7 +154,6 @@
</activity> </activity>
<activity <activity
android:name=".android.groups.GroupListActivity" android:name=".android.groups.GroupListActivity"
android:logo="@drawable/logo"
android:label="@string/forums_title" android:label="@string/forums_title"
android:parentActivityName=".android.DashboardActivity" > android:parentActivityName=".android.DashboardActivity" >
<meta-data <meta-data
...@@ -174,7 +163,6 @@ ...@@ -174,7 +163,6 @@
</activity> </activity>
<activity <activity
android:name=".android.groups.ReadGroupPostActivity" android:name=".android.groups.ReadGroupPostActivity"
android:logo="@drawable/logo"
android:label="@string/app_name" android:label="@string/app_name"
android:parentActivityName=".android.groups.GroupListActivity" > android:parentActivityName=".android.groups.GroupListActivity" >
<meta-data <meta-data
...@@ -184,7 +172,6 @@ ...@@ -184,7 +172,6 @@
</activity> </activity>
<activity <activity
android:name=".android.groups.ShareGroupActivity" android:name=".android.groups.ShareGroupActivity"
android:logo="@drawable/logo"
android:label="@string/app_name" android:label="@string/app_name"
android:parentActivityName=".android.groups.GroupListActivity" > android:parentActivityName=".android.groups.GroupListActivity" >
<meta-data <meta-data
...@@ -194,7 +181,6 @@ ...@@ -194,7 +181,6 @@
</activity> </activity>
<activity <activity
android:name=".android.groups.WriteGroupPostActivity" android:name=".android.groups.WriteGroupPostActivity"
android:logo="@drawable/logo"
android:label="@string/app_name" android:label="@string/app_name"
android:windowSoftInputMode="stateVisible" android:windowSoftInputMode="stateVisible"
android:parentActivityName=".android.groups.GroupListActivity" > android:parentActivityName=".android.groups.GroupListActivity" >
...@@ -205,13 +191,11 @@ ...@@ -205,13 +191,11 @@
</activity> </activity>
<activity <activity
android:name=".android.identity.CreateIdentityActivity" android:name=".android.identity.CreateIdentityActivity"
android:logo="@drawable/logo"
android:label="@string/new_identity_title" android:label="@string/new_identity_title"
android:windowSoftInputMode="stateVisible" > android:windowSoftInputMode="stateVisible" >
</activity> </activity>
<activity <activity
android:name=".android.invitation.AddContactActivity" android:name=".android.invitation.AddContactActivity"
android:logo="@drawable/logo"
android:label="@string/add_contact_title" android:label="@string/add_contact_title"
android:parentActivityName=".android.contact.ContactListActivity" > android:parentActivityName=".android.contact.ContactListActivity" >
<meta-data <meta-data
...@@ -221,7 +205,6 @@ ...@@ -221,7 +205,6 @@
</activity> </activity>
<activity <activity
android:name=".android.StartupFailureActivity" android:name=".android.StartupFailureActivity"
android:logo="@drawable/logo"
android:label="@string/startup_failed_activity_title" > android:label="@string/startup_failed_activity_title" >
</activity> </activity>
</application> </application>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment