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
675
Issues
675
List
Boards
Labels
Service Desk
Milestones
Merge Requests
11
Merge Requests
11
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
briar
briar
Commits
ea5a8622
Verified
Commit
ea5a8622
authored
Jun 18, 2019
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[android] Fix send button in ReportForm's action bar
parent
3f600980
Pipeline
#3596
passed with stage
in 9 minutes and 29 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
6 deletions
+14
-6
briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java
...g/briarproject/briar/android/reporting/CrashFragment.java
+1
-1
briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
...iarproject/briar/android/reporting/DevReportActivity.java
+10
-3
briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
...arproject/briar/android/reporting/ReportFormFragment.java
+3
-2
No files found.
briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java
View file @
ea5a8622
...
...
@@ -26,7 +26,7 @@ public class CrashFragment extends Fragment {
.
inflate
(
R
.
layout
.
fragment_crash
,
container
,
false
);
v
.
findViewById
(
R
.
id
.
acceptButton
).
setOnClickListener
(
view
->
getDevReportActivity
().
showReportForm
(
true
));
getDevReportActivity
().
displayFragment
(
true
));
v
.
findViewById
(
R
.
id
.
declineButton
).
setOnClickListener
(
view
->
getDevReportActivity
().
closeReport
());
...
...
briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
View file @
ea5a8622
...
...
@@ -75,7 +75,7 @@ public class DevReportActivity extends BaseCrashReportDialog {
R
.
string
.
crash_report_title
);
requireNonNull
(
getDelegate
().
getSupportActionBar
()).
setTitle
(
title
);
if
(
state
==
null
)
showReportForm
(
isFeedback
());
if
(
state
==
null
)
displayFragment
(
isFeedback
());
}
@Override
...
...
@@ -133,7 +133,7 @@ public class DevReportActivity extends BaseCrashReportDialog {
return
getException
()
instanceof
UserFeedback
;
}
void
showReportForm
(
boolean
showReportForm
)
{
void
displayFragment
(
boolean
showReportForm
)
{
Fragment
f
;
if
(
showReportForm
)
{
File
file
=
...
...
@@ -145,8 +145,15 @@ public class DevReportActivity extends BaseCrashReportDialog {
requireNonNull
(
getDelegate
().
getSupportActionBar
()).
hide
();
}
getSupportFragmentManager
().
beginTransaction
()
.
replace
(
R
.
id
.
fragmentContainer
,
f
)
.
replace
(
R
.
id
.
fragmentContainer
,
f
,
f
.
getTag
()
)
.
commit
();
}
@Override
public
void
invalidateOptionsMenu
()
{
super
.
invalidateOptionsMenu
();
getDelegate
().
invalidateOptionsMenu
();
}
void
closeReport
()
{
...
...
briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
View file @
ea5a8622
...
...
@@ -13,6 +13,7 @@ import android.view.ViewGroup;
import
android.widget.Button
;
import
android.widget.CheckBox
;
import
android.widget.CompoundButton
;
import
android.widget.CompoundButton.OnCheckedChangeListener
;
import
android.widget.EditText
;
import
android.widget.LinearLayout
;
import
android.widget.TextView
;
...
...
@@ -52,7 +53,7 @@ import static org.acra.ReportField.STACK_TRACE;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
public
class
ReportFormFragment
extends
Fragment
implements
CompoundButton
.
OnCheckedChangeListener
{
implements
OnCheckedChangeListener
{
private
static
final
Logger
LOG
=
getLogger
(
ReportFormFragment
.
class
.
getName
());
...
...
@@ -91,7 +92,7 @@ public class ReportFormFragment extends Fragment
}
@Override
public
void
onCreate
(
Bundle
savedInstanceState
)
{
public
void
onCreate
(
@Nullable
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
setHasOptionsMenu
(
true
);
}
...
...
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