Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Julian Dehm
briar
Commits
cb30c388
Verified
Commit
cb30c388
authored
Oct 02, 2018
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Localize crash screen in language defined in settings
parent
c14ebe82
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
0 deletions
+17
-0
briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java
...org/briarproject/briar/android/activity/BaseActivity.java
+5
-0
briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
...iarproject/briar/android/reporting/DevReportActivity.java
+12
-0
No files found.
briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java
View file @
cb30c388
...
...
@@ -24,6 +24,7 @@ import org.briarproject.briar.android.controller.ActivityLifecycleController;
import
org.briarproject.briar.android.forum.ForumModule
;
import
org.briarproject.briar.android.fragment.BaseFragment
;
import
org.briarproject.briar.android.fragment.ScreenFilterDialogFragment
;
import
org.briarproject.briar.android.reporting.DevReportActivity
;
import
org.briarproject.briar.android.util.UiUtils
;
import
org.briarproject.briar.android.widget.TapSafeFrameLayout
;
import
org.briarproject.briar.android.widget.TapSafeFrameLayout.OnTapFilteredListener
;
...
...
@@ -42,6 +43,10 @@ import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
import
static
android
.
view
.
inputmethod
.
InputMethodManager
.
SHOW_IMPLICIT
;
import
static
org
.
briarproject
.
briar
.
android
.
TestingConstants
.
PREVENT_SCREENSHOTS
;
/**
* Warning: Some activities don't extend {@link BaseActivity}.
* E.g. {@link DevReportActivity}
*/
public
abstract
class
BaseActivity
extends
AppCompatActivity
implements
DestroyableContext
,
OnTapFilteredListener
{
...
...
briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
View file @
cb30c388
package
org.briarproject.briar.android.reporting
;
import
android.content.Context
;
import
android.content.res.Configuration
;
import
android.os.AsyncTask
;
import
android.os.Bundle
;
...
...
@@ -24,6 +25,7 @@ import org.acra.collector.CrashReportData;
import
org.acra.dialog.BaseCrashReportDialog
;
import
org.acra.file.CrashReportPersister
;
import
org.briarproject.briar.R
;
import
org.briarproject.briar.android.Localizer
;
import
org.briarproject.briar.android.util.UserFeedback
;
import
java.io.File
;
...
...
@@ -38,6 +40,7 @@ import static android.os.Build.VERSION.SDK_INT;
import
static
android
.
view
.
View
.
GONE
;
import
static
android
.
view
.
View
.
INVISIBLE
;
import
static
android
.
view
.
View
.
VISIBLE
;
import
static
android
.
view
.
WindowManager
.
LayoutParams
.
FLAG_SECURE
;
import
static
android
.
view
.
inputmethod
.
InputMethodManager
.
SHOW_FORCED
;
import
static
java
.
util
.
logging
.
Level
.
WARNING
;
import
static
org
.
acra
.
ACRAConstants
.
EXTRA_REPORT_FILE
;
...
...
@@ -47,6 +50,7 @@ import static org.acra.ReportField.APP_VERSION_NAME;
import
static
org
.
acra
.
ReportField
.
PACKAGE_NAME
;
import
static
org
.
acra
.
ReportField
.
REPORT_ID
;
import
static
org
.
acra
.
ReportField
.
STACK_TRACE
;
import
static
org
.
briarproject
.
briar
.
android
.
TestingConstants
.
PREVENT_SCREENSHOTS
;
public
class
DevReportActivity
extends
BaseCrashReportDialog
implements
CompoundButton
.
OnCheckedChangeListener
{
...
...
@@ -107,6 +111,8 @@ public class DevReportActivity extends BaseCrashReportDialog
public
void
init
(
Bundle
state
)
{
super
.
init
(
state
);
if
(
PREVENT_SCREENSHOTS
)
getWindow
().
addFlags
(
FLAG_SECURE
);
getDelegate
().
setContentView
(
R
.
layout
.
activity_dev_report
);
Toolbar
tb
=
findViewById
(
R
.
id
.
toolbar
);
...
...
@@ -166,6 +172,12 @@ public class DevReportActivity extends BaseCrashReportDialog
requestReport
.
setVisibility
(
VISIBLE
);
}
@Override
protected
void
attachBaseContext
(
Context
base
)
{
super
.
attachBaseContext
(
Localizer
.
getInstance
().
setLocale
(
base
));
}
@Override
public
void
onPostCreate
(
Bundle
state
)
{
super
.
onPostCreate
(
state
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment