bump version

closes sk22#474

README.md

@@ -55,7 +55,7 @@ On the Fediverse, it’s quite common for people to pin posts they want others t
 
 [apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk](https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk)
 
-<a href="#installation"><img height="50" alt="Get it on IzzyOnDroid" src="img/izzy-badge.png"></a>
+<a href="https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk"><img height="50" alt="Get it on IzzyOnDroid" src="img/izzy-badge.png"></a>
 
 Note that you'll need to add Izzy's F-Droid repository to your F-Droid app first:
 

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 80
-		versionName "1.2.0+fork.80"
+		versionCode 82
+		versionName "1.2.0+fork.82"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "da-rDK", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fa-rIR", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "ig-rNG", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "my-rMM", "nl-rNL", "no-rNO", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
 	}

mastodon/src/main/AndroidManifest.xml

@@ -17,6 +17,9 @@
 			<action android:name="android.intent.action.PROCESS_TEXT" />
 			<data android:mimeType="text/plain" />
 		</intent>
+		<intent>
+			<action android:name="android.intent.action.TRANSLATE" />
+		</intent>
 	</queries>
 
 	<application

mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java

@@ -289,6 +289,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	public void updateNotificationBadge() {
 		AccountSession session = AccountSessionManager.getInstance().getAccount(accountID);
 		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
+		if (instance == null) return;
 
 		new GetNotifications(null, 1, EnumSet.allOf(Notification.Type.class), instance.pleroma != null)
 				.setCallback(new Callback<>() {

mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java

@@ -151,7 +151,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 
 	protected void onRemoveAccountPostsEvent(RemoveAccountPostsEvent ev){
 		List<Status> toRemove=Stream.concat(data.stream(), preloadedData.stream())
-				.filter(s->s.account.id.equals(ev.postsByAccountID) || (s.reblog!=null && s.reblog.account.id.equals(ev.postsByAccountID)))
+				.filter(s->s.account.id.equals(ev.postsByAccountID) || (!ev.isUnfollow && s.reblog!=null && s.reblog.account.id.equals(ev.postsByAccountID)))
 				.collect(Collectors.toList());
 		for(Status s:toRemove){
 			removeStatus(s);

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java

@@ -247,10 +247,11 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{
 				altTextAnimator.cancel();
 
 			View btn=controllers.get(altTextIndex).btnsWrap;
+			int i=0;
 			for(MediaAttachmentViewController c:controllers){
-				if(c.btnsWrap!=null && c.btnsWrap!=btn) {
+				if(c.btnsWrap!=null && c.btnsWrap!=btn && !TextUtils.isEmpty(item.attachments.get(i).description))
 					c.btnsWrap.setVisibility(View.VISIBLE);
-				}
+				i++;
 			}
 
 			int[] loc={0, 0};

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java

@@ -38,17 +38,17 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 	private StatusPrivacy visibility;
 	@DrawableRes
 	private int iconEnd;
-	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
+	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper(), fullTextEmojiHelper;
 	private View.OnClickListener handleClick;
 	boolean belowHeader, needBottomPadding;
 	ReblogOrReplyLineStatusDisplayItem extra;
-	String fullText;
+	CharSequence fullText;
 
 	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, StatusPrivacy visibility, @Nullable View.OnClickListener handleClick) {
-		this(parentID, parentFragment, text, emojis, icon, visibility, handleClick, null);
+		this(parentID, parentFragment, text, emojis, icon, visibility, handleClick, text);
 	}
 
-	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, StatusPrivacy visibility, @Nullable View.OnClickListener handleClick, String fullText) {
+	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, StatusPrivacy visibility, @Nullable View.OnClickListener handleClick, CharSequence fullText) {
 		super(parentID, parentFragment);
 		SpannableStringBuilder ssb=new SpannableStringBuilder(text);
 		HtmlParser.parseCustomEmoji(ssb, emojis);
@@ -59,7 +59,15 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 		TypedValue outValue = new TypedValue();
 		context.getTheme().resolveAttribute(android.R.attr.selectableItemBackground, outValue, true);
 		updateVisibility(visibility);
-		this.fullText = fullText;
+
+		if (fullText != null) {
+			fullTextEmojiHelper = new CustomEmojiHelper();
+			SpannableStringBuilder fullTextSsb = new SpannableStringBuilder(fullText);
+			HtmlParser.parseCustomEmoji(fullTextSsb, emojis);
+			this.fullText=fullTextSsb;
+			fullTextEmojiHelper.setText(fullTextSsb);
+		}
+
 	}
 
 	public void updateVisibility(StatusPrivacy visibility) {

metadata/de-DE/changelogs/82.txt

@@ -0,0 +1,5 @@
+- Favorisieren/Lesezeichen/Antworten direkt über Android-Benachrichtigungen
+- Verbesserte Kopfzeilen für Reblogs und Antworten in der Timeline
+- Benachrichtigungs-Punkt (Benachrichtigungen werden aktuell noch nicht automatisch nachgeladen)
+- Für Akkoma-Benutzer_innen: Antwort-Sichtbarkeit, sortierte Thread-Antworten, Zitate, …
+- Crashes behoben und kleinere Verbesserungen

metadata/en-US/changelogs/82.txt

@@ -0,0 +1,5 @@
+- Like/bookmark/reply directly from notification shade
+- Prettier and more consistent headers for reblogs and replies in timeline
+- Notification dot (which doesn't actually load the notifications just yet)
+- For Akkoma users: Reply visibility, sorted thread replies, quoting, …
+- Crash fixes and minor tweaks