owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix timeline editor messing with non-hashtag tls

Browse Source
This commit is contained in:
sk
2023-11-13 21:31:54 +01:00
parent ee82772fee
commit 0c376d57e7
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
View File

@@ -340,11 +340,13 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
.setTitle(item==null ? R.string.sk_add_timeline : R.string.sk_edit_timeline) .setTitle(item==null ? R.string.sk_add_timeline : R.string.sk_edit_timeline)
.setView(view) .setView(view)
.setPositiveButton(R.string.save, (d, which)->{ .setPositiveButton(R.string.save, (d, which)->{
String name=editText.getText().toString().trim();
String mainHashtag=tagMain.getText().toString().trim();
if(item.getType()==TimelineDefinition.TimelineType.HASHTAG){
tagsAny.chipifyAllUnterminatedTokens(); tagsAny.chipifyAllUnterminatedTokens();
tagsAll.chipifyAllUnterminatedTokens(); tagsAll.chipifyAllUnterminatedTokens();
tagsNone.chipifyAllUnterminatedTokens(); tagsNone.chipifyAllUnterminatedTokens();
String name=editText.getText().toString().trim();
String mainHashtag=tagMain.getText().toString().trim();
if(TextUtils.isEmpty(mainHashtag)){ if(TextUtils.isEmpty(mainHashtag)){
mainHashtag=name; mainHashtag=name;
name=null; name=null;
@@ -354,11 +356,13 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
onSave.accept(null); onSave.accept(null);
return; return;
} }
}
TimelineDefinition tl=item!=null ? item : TimelineDefinition.ofHashtag(name); TimelineDefinition tl=item!=null ? item : TimelineDefinition.ofHashtag(name);
TimelineDefinition.Icon icon=TimelineDefinition.Icon.values()[(int) btn.getTag()]; TimelineDefinition.Icon icon=TimelineDefinition.Icon.values()[(int) btn.getTag()];
tl.setIcon(icon); tl.setIcon(icon);
tl.setTitle(name); tl.setTitle(name);
if(item.getType()==TimelineDefinition.TimelineType.HASHTAG){
tl.setTagOptions( tl.setTagOptions(
mainHashtag, mainHashtag,
tagsAny.getChipValues(), tagsAny.getChipValues(),
@@ -366,10 +370,10 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
tagsNone.getChipValues(), tagsNone.getChipValues(),
localOnlySwitch.isChecked() localOnlySwitch.isChecked()
); );
}
onSave.accept(tl); onSave.accept(tl);
}) })
.setNegativeButton(R.string.cancel, (d, which)->{ .setNegativeButton(R.string.cancel, (d, which)->{});
});
if(onRemove!=null) builder.setNeutralButton(R.string.sk_remove, (d, which)->onRemove.run()); if(onRemove!=null) builder.setNeutralButton(R.string.sk_remove, (d, which)->onRemove.run());