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/PushNotificationReceiver.java

@@ -86,7 +86,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 						}
 						String accountID=account.getID();
 						PushNotification pn=AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().decryptNotification(k, p, s);
-						E.post(new NotificationReceivedEvent(pn.notificationId+""));
+						E.post(new NotificationReceivedEvent(accountID, pn.notificationId+""));
 						new GetNotificationByID(pn.notificationId+"")
 								.setCallback(new Callback<>(){
 									@Override

mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java

@@ -128,7 +128,7 @@ public class CacheController{
 		});
 	}
 
-	public void getNotifications(String maxID, int count, boolean onlyMentions, boolean onlyPosts, boolean forceReload, Callback<PaginatedResponse<List<Notification>>> callback){
+	public void getNotifications(String maxID, int count, boolean onlyMentions, boolean onlyPosts, boolean forceReload, Callback<CacheablePaginatedResponse<List<Notification>>> callback){
 		cancelDelayedClose();
 		databaseThread.postRunnable(()->{
 			try{
@@ -156,7 +156,7 @@ public class CacheController{
 								result.add(ntf);
 							}while(cursor.moveToNext());
 							String _newMaxID=newMaxID;
-							uiHandler.post(()->callback.onSuccess(new PaginatedResponse<>(result, _newMaxID)));
+							uiHandler.post(()->callback.onSuccess(new CacheablePaginatedResponse<>(result, _newMaxID, true)));
 							return;
 						}
 					}catch(IOException x){
@@ -168,7 +168,7 @@ public class CacheController{
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Notification> result){
-								callback.onSuccess(new PaginatedResponse<>(result.stream().filter(ntf->{
+								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(ntf->{
 									if(ntf.status!=null){
 										for(Filter filter:filters){
 											if(filter.matches(ntf.status)){
@@ -177,7 +177,7 @@ public class CacheController{
 										}
 									}
 									return true;
-								}).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id));
+								}).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
 								putNotifications(result, onlyMentions, onlyPosts, maxID==null);
 							}
 

mastodon/src/main/java/org/joinmastodon/android/events/NotificationReceivedEvent.java

@@ -1,8 +1,9 @@
 package org.joinmastodon.android.events;
 
 public class NotificationReceivedEvent {
-	public String id;
-	public NotificationReceivedEvent(String id) {
+	public String account, id;
+	public NotificationReceivedEvent(String account, String id) {
+		this.account = account;
 		this.id = id;
 	}
 }

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<>() {
@@ -298,9 +299,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 							try {
 								long newestId = Long.parseLong(notifications.get(0).id);
 								long lastSeenId = Long.parseLong(session.markers.notifications.lastReadId);
-								System.out.println("NEWEST: " + newestId);
-								System.out.println("LAST SEEN: " + lastSeenId);
-
 								setNotificationBadge(newestId > lastSeenId);
 							} catch (Exception ignored) {
 								setNotificationBadge(false);
@@ -323,7 +321,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 
 	@Subscribe
 	public void onNotificationReceived(NotificationReceivedEvent notificationReceivedEvent) {
-		setNotificationBadge(true);
+		if (notificationReceivedEvent.account.equals(accountID)) setNotificationBadge(true);
 	}
 
 	@Subscribe

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

@@ -166,6 +166,10 @@ public class HomeTimelineFragment extends StatusListFragment {
 					}
 				})
 				.exec(accountID);
+
+		if (parent.getParentFragment() instanceof HomeFragment homeFragment) {
+			homeFragment.updateNotificationBadge();
+		}
 	}
 
 	@Override

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

@@ -15,6 +15,7 @@ import org.joinmastodon.android.events.AllNotificationsSeenEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
@@ -128,7 +129,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 				.getAccount(accountID).getCacheController()
 				.getNotifications(offset>0 ? maxID : null, count, onlyMentions, onlyPosts, refreshing, new SimpleCallback<>(this){
 					@Override
-					public void onSuccess(PaginatedResponse<List<Notification>> result){
+					public void onSuccess(CacheablePaginatedResponse<List<Notification>> result){
 						if (getActivity() == null) return;
 						if(refreshing)
 							relationships.clear();
@@ -140,7 +141,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 						loadRelationships(needRelationships);
 						maxID=result.maxID;
 
-						if(offset==0 && !result.items.isEmpty()){
+						if(offset==0 && !result.items.isEmpty() && !result.isFromCache()){
 							E.post(new AllNotificationsSeenEvent());
 							new SaveMarkers(null, result.items.get(0).id).exec(accountID);
 							AccountSessionManager.getInstance().getAccount(accountID).markers

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

@@ -439,6 +439,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			toolbarTitleView.setTranslationY(titleTransY);
 			toolbarSubtitleView.setTranslationY(titleTransY);
 		}
+		RecyclerFragment.setRefreshLayoutColors(refreshLayout);
 	}
 
 	@Override

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

@@ -4,6 +4,8 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
 
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
@@ -25,7 +27,10 @@ public abstract class RecyclerFragment<T> extends BaseRecyclerFragment<T> {
 
 	public void onViewCreated(View view, Bundle savedInstanceState) {
 		super.onViewCreated(view, savedInstanceState);
-		Context ctx = getContext();
+		if (refreshLayout != null) setRefreshLayoutColors(refreshLayout);
+	}
+
+	public static void setRefreshLayoutColors(SwipeRefreshLayout l) {
 		List<Integer> colors = new ArrayList<>(Arrays.asList(
 				R.color.primary_600,
 				R.color.red_primary_600,
@@ -33,13 +38,13 @@ public abstract class RecyclerFragment<T> extends BaseRecyclerFragment<T> {
 				R.color.blue_primary_600,
 				R.color.purple_600
 		));
-		int primary = UiUtils.getThemeColorRes(ctx, R.attr.colorPrimary600);
+		int primary = UiUtils.getThemeColorRes(l.getContext(), R.attr.colorPrimary600);
 		if (!colors.contains(primary)) colors.add(0, primary);
 		int offset = colors.indexOf(primary);
 		int[] sorted = new int[colors.size()];
 		for (int i = 0; i < colors.size(); i++) {
 			sorted[i] = colors.get((i + offset) % colors.size());
 		}
-		refreshLayout.setColorSchemeResources(sorted);
+		l.setColorSchemeResources(sorted);
 	}
 }

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

@@ -32,23 +32,23 @@ import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
 import me.grishka.appkit.utils.V;
 
 public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
-	private CharSequence text, compactText;
+	private CharSequence text;
 	@DrawableRes
 	private int icon;
 	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