Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Thomas
Fedilab
Commits
9ebbe6d5
Commit
9ebbe6d5
authored
May 16, 2020
by
Thomas
Browse files
Merge remote-tracking branch 'origin/develop' into develop
parents
dd26a6ae
0923eada
Pipeline
#302045
passed with stage
in 5 minutes and 7 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
View file @
9ebbe6d5
...
...
@@ -1330,8 +1330,13 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
return
true
;
case
R
.
id
.
action_block
:
builderInner
=
new
AlertDialog
.
Builder
(
ShowAccountActivity
.
this
,
style
);
builderInner
.
setTitle
(
stringArrayConf
[
1
]);
doActionAccount
=
API
.
StatusAction
.
BLOCK
;
if
(
relationship
.
isBlocking
())
{
builderInner
.
setTitle
(
stringArrayConf
[
5
]);
doActionAccount
=
API
.
StatusAction
.
UNBLOCK
;
}
else
{
builderInner
.
setTitle
(
stringArrayConf
[
1
]);
doActionAccount
=
API
.
StatusAction
.
BLOCK
;
}
break
;
case
R
.
id
.
action_block_instance
:
builderInner
=
new
AlertDialog
.
Builder
(
ShowAccountActivity
.
this
,
style
);
...
...
app/src/main/res/values/strings.xml
View file @
9ebbe6d5
...
...
@@ -115,6 +115,7 @@
<item>
Report this toot?
</item>
<item>
Block this domain?
</item>
<item>
Unmute this account?
</item>
<item>
Unblock this account?
</item>
</string-array>
<string-array
name=
"action_notification"
>
...
...
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