Compare commits
merge into: notfire:master
notfire:master
notfire:rewrite
notfire:merge-upstream
notfire:upstream/fix-translations-crash
notfire:upstream/null-hashtags-derefence
notfire:main
notfire:mastodon-android
notfire:refactor/previewless_media_grid
notfire:revert-804-main
notfire:m3-merger
notfire:feature/camera-compose-shortcut
notfire:feature/calckey-support
notfire:documentation/readme-revamp
notfire:feature/finefindus/settings-redesign
notfire:feature/remote-followers
notfire:feature/local-timelines
notfire:feature/filters_for_real
notfire:feature/maybe_polling_notifications
notfire:feature/direct_message_tab
notfire:upstream-release
notfire:feature/filters
notfire:bugfix/buttons_cutting_out_in_notification_tab
notfire:bugfix/#29
notfire:bugfix/#34
notfire:feature/fix_#34
notfire:feature/long_press_discover
notfire:feature/show_changelog_button
notfire:feature/publish_button_improvements
notfire:feature/private_notes
notfire:feature/hide_dividers_in_the_main_timeline
notfire:development_of_the_nord_theme
notfire:develop
notfire:7269444a31
notfire:2.3.0+fork.108.moshinda.luke/luke
notfire:2.3.0+fork.108.moshinda
notfire:v2.9.1
notfire:v2.9.0
notfire:v2.8.0
notfire:v2.7.3
notfire:v2.7.2
notfire:v2.7.1
notfire:v2.7.0
notfire:2.3.0+fork.107.moshinda
notfire:2.3.0+fork.106.moshinda
notfire:v2.6.1
notfire:v2.6.0
notfire:v2.5.6
notfire:v2.5.5
notfire:v2.5.3
notfire:v2.5.2
notfire:v2.5.1
notfire:2.3.0+fork.105.moshinda
notfire:v2.5.0
notfire:v2.4.1
notfire:v2.4.0
notfire:v2.3.0
notfire:2.1.4+fork.104.moshinda
notfire:2.1.4+fork.103.moshinda
notfire:v2.2.4
notfire:v2.2.3
notfire:v2.2.2
notfire:v2.1.6+fork.110
notfire:v2.1.6+fork.109
notfire:v2.2.1
notfire:v2.1.6+fork.108
notfire:v2.2.0
notfire:v2.1.6+fork.107
notfire:v2.1.6+fork.106
notfire:v2.1.6+fork.105
notfire:v2.1.6+fork.104
notfire:v2.1.6+fork.103
notfire:v2.1.6+fork.102
notfire:v2.1.6+fork.101
notfire:v2.1.6
notfire:v2.1.5
notfire:v2.1.4+fork.100
notfire:2.1.4+fork.102.moshinda
notfire:v2.1.4
notfire:v2.1.3
notfire:v2.1.2
notfire:v2.1.1
notfire:v2.1.0
notfire:v2.0.4
notfire:v2.0.3+fork.99
notfire:v2.0.3+fork.98
notfire:v2.0.3
notfire:v2.0.2
notfire:v2.0.1+fork.97
notfire:v2.0.1+fork.96
notfire:v2.0.1
notfire:v2.0.0
notfire:1.2.3+fork.101.moshinda
notfire:v1.2.3+fork.94
notfire:v1.2.3+fork.93
notfire:v1.2.3+fork.92
notfire:v1.2.3+fork.91
notfire:v1.2.3+fork.90
notfire:v1.2.3+fork.89
notfire:v1.2.3+fork.87
notfire:v1.2.3+fork.86
notfire:v1.2.3+fork.85
notfire:v1.2.3+fork.84
notfire:v1.2.3
notfire:1.3.0+fork.100.moshinda
notfire:v1.2.2
notfire:v1.2.1
notfire:v1.2.0+fork.83
notfire:v1.2.0+fork.82
notfire:v1.2.0+fork.81
notfire:v1.2.0+fork.80
notfire:v1.2.0+fork.79
notfire:v1.2.0+fork.78
notfire:1.2.0+fork.99.moshinda
notfire:1.2.0+fork.98.moshinda
notfire:1.2.0+fork.97.moshinda
notfire:1.2.0+fork.96.moshinda
notfire:1.2.0+fork.95.moshinda
notfire:v1.2.0+fork.77
notfire:1.2.0+fork.94.moshinda
notfire:v1.2.0
notfire:v1.1.5+fork.76
notfire:1.1.4+fork.93.moshinda
notfire:1.1.4+fork.92.moshinda
notfire:v1.1.5+fork.75
notfire:1.1.4+fork.91.moshinda
notfire:1.1.4+fork.90.moshinda
notfire:1.1.4+fork.89.moshinda
notfire:1.1.4+fork.88.moshinda
notfire:v1.1.5+fork.74
notfire:v1.1.5+fork.73
notfire:v1.1.5+fork.71
notfire:v1.1.5+fork.70
notfire:1.1.4+fork.87.moshinda
notfire:v1.1.5+fork.69
notfire:v1.1.5+fork.68
notfire:v1.1.5+fork.67
notfire:1.1.4+fork.86.moshinda
notfire:v1.1.5+fork.66
notfire:1.1.4+fork.85.moshinda
notfire:1.1.4+fork.84.moshinda
notfire:1.1.4+fork.83.moshinda
notfire:1.1.4+fork.82.moshinda
notfire:v1.1.5+fork.65
notfire:v1.1.5+fork.64
notfire:1.1.4+fork.81.moshinda
notfire:1.1.4+fork.80.moshinda
notfire:1.1.4+fork.79.moshinda
notfire:1.1.4+fork.78.moshinda
notfire:1.1.4+fork.77.moshinda
notfire:1.1.4+fork.76.moshinda
notfire:v1.1.5+fork.63
notfire:1.1.4+fork.75.moshinda
notfire:1.1.4+fork.74.moshinda
notfire:1.1.4+fork.73.moshinda
notfire:1.1.4+fork.72.moshinda
notfire:v1.1.5+fork.62
notfire:1.1.4+fork.71.moshinda
notfire:1.1.4+fork.70.moshinda
notfire:1.1.4+fork.69.moshinda
notfire:1.1.4+fork.68.moshinda
notfire:1.1.4+fork.67.moshinda
notfire:v1.1.5+fork.61
notfire:v1.1.5+fork.60
notfire:1.1.4+fork.66.moshinda
notfire:1.1.4+fork.65.moshinda
notfire:1.1.4+fork.64.moshinda
notfire:v1.1.4+fork.59
notfire:1.1.4+fork.63.moshinda
notfire:1.1.4+fork.62.moshinda
notfire:1.1.4+fork.61.moshinda
notfire:1.1.4+fork.60.moshinda
notfire:v1.1.4+fork.58
notfire:1.1.4+fork.59.moshinda
notfire:v1.1.4+fork.57
notfire:1.1.4+fork.58.moshinda
notfire:v1.1.4+fork.56
notfire:1.1.4+fork.57.moshinda
notfire:1.1.4+fork.56.moshinda
notfire:1.1.4+fork.55.moshinda
notfire:1.1.4+fork.54.moshinda
notfire:v1.1.4
notfire:v1.1.4+fork.55
notfire:v1.1.4+fork.51
notfire:v1.1.4+fork.50
notfire:v1.1.4+fork.49
notfire:v1.1.4+fork.48
notfire:v1.1.4+fork.47
notfire:v1.1.4+fork.46
notfire:v1.1.4+fork.45
notfire:v1.1.4+fork.44
notfire:v1.1.4+fork.43
notfire:v1.1.4+fork.42
notfire:v1.1.4+fork.41
notfire:v1.1.4+fork.40
notfire:v1.1.4+fork.39
notfire:v1.1.4+fork.38
notfire:v1.1.4+fork.37
notfire:v1.1.4+fork.36
notfire:v1.1.4+fork.35
notfire:v1.1.4+fork.34
notfire:v1.1.4+fork.33
notfire:v1.1.4+fork.32
notfire:v1.1.4+fork.31
notfire:v1.1.4+fork.30
notfire:v1.1.4+fork.29
notfire:v1.1.4+fork.28
notfire:v1.1.4+fork.27
notfire:v1.1.4+fork.26
notfire:v1.1.4+fork.25
notfire:v1.1.3+fork.24
notfire:v1.1.3+fork.23
notfire:v1.1.3+fork.22
notfire:v1.1.3+fork.21
notfire:v1.1.3+fork.20
notfire:v1.1.3
notfire:v1.1.2
notfire:v1.1.1+fork.19
notfire:v1.1.1+fork.18
notfire:v1.1.1+fork.17
notfire:v1.1.1+fork.16
notfire:v1.1.1+fork.15
notfire:v1.1.1+fork.14
notfire:v1.1.1+fork.13
notfire:v1.1.1+fork.12
notfire:v1.1.1+fork.11
notfire:v1.1.1-dev+fork.10
notfire:v1.1.1-dev+fork.9
notfire:v1.1.1-dev+fork.8
notfire:v1.1.1-dev+fork.7
notfire:v1.1.1-dev+fork.6
notfire:v1.1.1-dev+fork.1
notfire:v1.1.1
notfire:v1.1.0-dev+fork.1.0
notfire:v1.1.0
notfire:v1.0.4-dev+fork.1.1
notfire:v1.0.3
notfire:v1.0.2
notfire:v1.0.1
notfire:v1.0
...
pull from: notfire:revert-804-main
notfire:master
notfire:rewrite
notfire:merge-upstream
notfire:upstream/fix-translations-crash
notfire:upstream/null-hashtags-derefence
notfire:main
notfire:mastodon-android
notfire:refactor/previewless_media_grid
notfire:revert-804-main
notfire:m3-merger
notfire:feature/camera-compose-shortcut
notfire:feature/calckey-support
notfire:documentation/readme-revamp
notfire:feature/finefindus/settings-redesign
notfire:feature/remote-followers
notfire:feature/local-timelines
notfire:feature/filters_for_real
notfire:feature/maybe_polling_notifications
notfire:feature/direct_message_tab
notfire:upstream-release
notfire:feature/filters
notfire:bugfix/buttons_cutting_out_in_notification_tab
notfire:bugfix/#29
notfire:bugfix/#34
notfire:feature/fix_#34
notfire:feature/long_press_discover
notfire:feature/show_changelog_button
notfire:feature/publish_button_improvements
notfire:feature/private_notes
notfire:feature/hide_dividers_in_the_main_timeline
notfire:development_of_the_nord_theme
notfire:develop
notfire:7269444a31
notfire:2.3.0+fork.108.moshinda.luke/luke
notfire:2.3.0+fork.108.moshinda
notfire:v2.9.1
notfire:v2.9.0
notfire:v2.8.0
notfire:v2.7.3
notfire:v2.7.2
notfire:v2.7.1
notfire:v2.7.0
notfire:2.3.0+fork.107.moshinda
notfire:2.3.0+fork.106.moshinda
notfire:v2.6.1
notfire:v2.6.0
notfire:v2.5.6
notfire:v2.5.5
notfire:v2.5.3
notfire:v2.5.2
notfire:v2.5.1
notfire:2.3.0+fork.105.moshinda
notfire:v2.5.0
notfire:v2.4.1
notfire:v2.4.0
notfire:v2.3.0
notfire:2.1.4+fork.104.moshinda
notfire:2.1.4+fork.103.moshinda
notfire:v2.2.4
notfire:v2.2.3
notfire:v2.2.2
notfire:v2.1.6+fork.110
notfire:v2.1.6+fork.109
notfire:v2.2.1
notfire:v2.1.6+fork.108
notfire:v2.2.0
notfire:v2.1.6+fork.107
notfire:v2.1.6+fork.106
notfire:v2.1.6+fork.105
notfire:v2.1.6+fork.104
notfire:v2.1.6+fork.103
notfire:v2.1.6+fork.102
notfire:v2.1.6+fork.101
notfire:v2.1.6
notfire:v2.1.5
notfire:v2.1.4+fork.100
notfire:2.1.4+fork.102.moshinda
notfire:v2.1.4
notfire:v2.1.3
notfire:v2.1.2
notfire:v2.1.1
notfire:v2.1.0
notfire:v2.0.4
notfire:v2.0.3+fork.99
notfire:v2.0.3+fork.98
notfire:v2.0.3
notfire:v2.0.2
notfire:v2.0.1+fork.97
notfire:v2.0.1+fork.96
notfire:v2.0.1
notfire:v2.0.0
notfire:1.2.3+fork.101.moshinda
notfire:v1.2.3+fork.94
notfire:v1.2.3+fork.93
notfire:v1.2.3+fork.92
notfire:v1.2.3+fork.91
notfire:v1.2.3+fork.90
notfire:v1.2.3+fork.89
notfire:v1.2.3+fork.87
notfire:v1.2.3+fork.86
notfire:v1.2.3+fork.85
notfire:v1.2.3+fork.84
notfire:v1.2.3
notfire:1.3.0+fork.100.moshinda
notfire:v1.2.2
notfire:v1.2.1
notfire:v1.2.0+fork.83
notfire:v1.2.0+fork.82
notfire:v1.2.0+fork.81
notfire:v1.2.0+fork.80
notfire:v1.2.0+fork.79
notfire:v1.2.0+fork.78
notfire:1.2.0+fork.99.moshinda
notfire:1.2.0+fork.98.moshinda
notfire:1.2.0+fork.97.moshinda
notfire:1.2.0+fork.96.moshinda
notfire:1.2.0+fork.95.moshinda
notfire:v1.2.0+fork.77
notfire:1.2.0+fork.94.moshinda
notfire:v1.2.0
notfire:v1.1.5+fork.76
notfire:1.1.4+fork.93.moshinda
notfire:1.1.4+fork.92.moshinda
notfire:v1.1.5+fork.75
notfire:1.1.4+fork.91.moshinda
notfire:1.1.4+fork.90.moshinda
notfire:1.1.4+fork.89.moshinda
notfire:1.1.4+fork.88.moshinda
notfire:v1.1.5+fork.74
notfire:v1.1.5+fork.73
notfire:v1.1.5+fork.71
notfire:v1.1.5+fork.70
notfire:1.1.4+fork.87.moshinda
notfire:v1.1.5+fork.69
notfire:v1.1.5+fork.68
notfire:v1.1.5+fork.67
notfire:1.1.4+fork.86.moshinda
notfire:v1.1.5+fork.66
notfire:1.1.4+fork.85.moshinda
notfire:1.1.4+fork.84.moshinda
notfire:1.1.4+fork.83.moshinda
notfire:1.1.4+fork.82.moshinda
notfire:v1.1.5+fork.65
notfire:v1.1.5+fork.64
notfire:1.1.4+fork.81.moshinda
notfire:1.1.4+fork.80.moshinda
notfire:1.1.4+fork.79.moshinda
notfire:1.1.4+fork.78.moshinda
notfire:1.1.4+fork.77.moshinda
notfire:1.1.4+fork.76.moshinda
notfire:v1.1.5+fork.63
notfire:1.1.4+fork.75.moshinda
notfire:1.1.4+fork.74.moshinda
notfire:1.1.4+fork.73.moshinda
notfire:1.1.4+fork.72.moshinda
notfire:v1.1.5+fork.62
notfire:1.1.4+fork.71.moshinda
notfire:1.1.4+fork.70.moshinda
notfire:1.1.4+fork.69.moshinda
notfire:1.1.4+fork.68.moshinda
notfire:1.1.4+fork.67.moshinda
notfire:v1.1.5+fork.61
notfire:v1.1.5+fork.60
notfire:1.1.4+fork.66.moshinda
notfire:1.1.4+fork.65.moshinda
notfire:1.1.4+fork.64.moshinda
notfire:v1.1.4+fork.59
notfire:1.1.4+fork.63.moshinda
notfire:1.1.4+fork.62.moshinda
notfire:1.1.4+fork.61.moshinda
notfire:1.1.4+fork.60.moshinda
notfire:v1.1.4+fork.58
notfire:1.1.4+fork.59.moshinda
notfire:v1.1.4+fork.57
notfire:1.1.4+fork.58.moshinda
notfire:v1.1.4+fork.56
notfire:1.1.4+fork.57.moshinda
notfire:1.1.4+fork.56.moshinda
notfire:1.1.4+fork.55.moshinda
notfire:1.1.4+fork.54.moshinda
notfire:v1.1.4
notfire:v1.1.4+fork.55
notfire:v1.1.4+fork.51
notfire:v1.1.4+fork.50
notfire:v1.1.4+fork.49
notfire:v1.1.4+fork.48
notfire:v1.1.4+fork.47
notfire:v1.1.4+fork.46
notfire:v1.1.4+fork.45
notfire:v1.1.4+fork.44
notfire:v1.1.4+fork.43
notfire:v1.1.4+fork.42
notfire:v1.1.4+fork.41
notfire:v1.1.4+fork.40
notfire:v1.1.4+fork.39
notfire:v1.1.4+fork.38
notfire:v1.1.4+fork.37
notfire:v1.1.4+fork.36
notfire:v1.1.4+fork.35
notfire:v1.1.4+fork.34
notfire:v1.1.4+fork.33
notfire:v1.1.4+fork.32
notfire:v1.1.4+fork.31
notfire:v1.1.4+fork.30
notfire:v1.1.4+fork.29
notfire:v1.1.4+fork.28
notfire:v1.1.4+fork.27
notfire:v1.1.4+fork.26
notfire:v1.1.4+fork.25
notfire:v1.1.3+fork.24
notfire:v1.1.3+fork.23
notfire:v1.1.3+fork.22
notfire:v1.1.3+fork.21
notfire:v1.1.3+fork.20
notfire:v1.1.3
notfire:v1.1.2
notfire:v1.1.1+fork.19
notfire:v1.1.1+fork.18
notfire:v1.1.1+fork.17
notfire:v1.1.1+fork.16
notfire:v1.1.1+fork.15
notfire:v1.1.1+fork.14
notfire:v1.1.1+fork.13
notfire:v1.1.1+fork.12
notfire:v1.1.1+fork.11
notfire:v1.1.1-dev+fork.10
notfire:v1.1.1-dev+fork.9
notfire:v1.1.1-dev+fork.8
notfire:v1.1.1-dev+fork.7
notfire:v1.1.1-dev+fork.6
notfire:v1.1.1-dev+fork.1
notfire:v1.1.1
notfire:v1.1.0-dev+fork.1.0
notfire:v1.1.0
notfire:v1.0.4-dev+fork.1.1
notfire:v1.0.3
notfire:v1.0.2
notfire:v1.0.1
notfire:v1.0
Sign in to create a new pull request.
1 commit
master
...
revert-804
Author | SHA1 | Message | Date | |
---|---|---|---|---|
![]() |
f6ea0404ef |
Revert "fix: allows for editing timeline badges again. fixes sk22#800 (#804)"
This reverts commit
|
1 changed files with 1 additions and 1 deletions
|
@ -344,7 +344,7 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
|
|||
mainHashtag = name;
|
||||
name = null;
|
||||
}
|
||||
if (TextUtils.isEmpty(mainHashtag) && (item != null && item.getType() == TimelineDefinition.TimelineType.HASHTAG)) {
|
||||
if (TextUtils.isEmpty(mainHashtag)) {
|
||||
Toast.makeText(ctx, R.string.sk_add_timeline_tag_error_empty, Toast.LENGTH_SHORT).show();
|
||||
onSave.accept(null);
|
||||
return;
|
||||
|
|
Write
Preview
Loading…
Add table
Reference in a new issue