Merge remote-tracking branch 'megalodon_main/main'

# Conflicts: # mastodon/build.gradle # mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java # mastodon/src/main/java/org/joinmastodon/android/MainActivity.java # mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java # mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverHashtagsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java # mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java # mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java # mastodon/src/main/res/layout/item_account_switcher.xml # mastodon/src/main/res/values-ar-rDZ/strings_sk.xml # mastodon/src/main/res/values-es-rES/strings_sk.xml # mastodon/src/main/res/values-nl-rNL/strings_sk.xml # mastodon/src/main/res/values-pt-rPT/strings_sk.xml # mastodon/src/main/res/values-v31/colors.xml # mastodon/src/main/res/values/colors.xml # mastodon/src/main/res/values/styles.xml
2023-06-03 19:56:16 -03:00
parent 04fdea0296 fb8764bcd7
commit 14175a9140
113 changed files with 4439 additions and 1513 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
@@ -19,7 +19,6 @@ import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Notification;
-import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
@@ -160,7 +159,7 @@ public class CacheController{
 					}
 				}
 				Instance instance=AccountSessionManager.getInstance().getInstanceInfo(accountSession.domain);
-				new GetNotifications(maxID, count, onlyPosts ? EnumSet.of(Notification.Type.STATUS) : onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class), instance.pleroma != null)
+				new GetNotifications(maxID, count, onlyPosts ? EnumSet.of(Notification.Type.STATUS) : onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class), instance.isAkkoma())
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Notification> result){
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/PleromaMarkNotificationsRead.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/PleromaMarkNotificationsRead.java
@@ -0,0 +1,30 @@
+package org.joinmastodon.android.api.requests.notifications;
+
+import android.text.TextUtils;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Notification;
+
+import java.util.List;
+
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
+
+public class PleromaMarkNotificationsRead extends MastodonAPIRequest<List<Notification>> {
+    private String maxID;
+    public PleromaMarkNotificationsRead(String maxID) {
+        super(HttpMethod.POST, "/pleroma/notifications/read", new TypeToken<>(){});
+        this.maxID = maxID;
+    }
+
+    @Override
+    public RequestBody getRequestBody() {
+        MultipartBody.Builder builder=new MultipartBody.Builder()
+                .setType(MultipartBody.FORM);
+        if(!TextUtils.isEmpty(maxID))
+            builder.addFormDataPart("max_id", maxID);
+        return builder.build();
+    }
+}
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetBubbleTimeline.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetBubbleTimeline.java
@@ -0,0 +1,23 @@
+package org.joinmastodon.android.api.requests.timelines;
+
+import android.text.TextUtils;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Status;
+
+import java.util.List;
+
+public class GetBubbleTimeline extends MastodonAPIRequest<List<Status>> {
+    public GetBubbleTimeline(String maxID, int limit) {
+        super(HttpMethod.GET, "/timelines/bubble", new TypeToken<>(){});
+        if(!TextUtils.isEmpty(maxID))
+            addQueryParameter("max_id", maxID);
+        if(limit>0)
+            addQueryParameter("limit", limit+"");
+        if(GlobalUserPreferences.replyVisibility != null)
+            addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
+    }
+}
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHashtagTimeline.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHashtagTimeline.java
@@ -2,6 +2,7 @@ package org.joinmastodon.android.api.requests.timelines;

 import com.google.gson.reflect.TypeToken;

+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;

@@ -16,5 +17,7 @@ public class GetHashtagTimeline extends MastodonAPIRequest<List<Status>>{
 			addQueryParameter("min_id", minID);
 		if(limit>0)
 			addQueryParameter("limit", ""+limit);
+		if(GlobalUserPreferences.replyVisibility != null)
+			addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetListTimeline.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetListTimeline.java
@@ -2,6 +2,7 @@ package org.joinmastodon.android.api.requests.timelines;

 import com.google.gson.reflect.TypeToken;

+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;

@@ -18,5 +19,7 @@ public class GetListTimeline extends MastodonAPIRequest<List<Status>> {
            addQueryParameter("limit", ""+limit);
        if(sinceID!=null)
            addQueryParameter("since_id", sinceID);
+        if(GlobalUserPreferences.replyVisibility != null)
+            addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
    }
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java
@@ -4,6 +4,7 @@ import android.text.TextUtils;

 import com.google.gson.reflect.TypeToken;

+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;

@@ -20,5 +21,7 @@ public class GetPublicTimeline extends MastodonAPIRequest<List<Status>>{
 			addQueryParameter("max_id", maxID);
 		if(limit>0)
 			addQueryParameter("limit", limit+"");
+		if(GlobalUserPreferences.replyVisibility != null)
+			addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
@@ -1,5 +1,7 @@
 package org.joinmastodon.android.api.session;

+import android.net.Uri;
+
 import org.joinmastodon.android.api.CacheController;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.PushSubscriptionManager;
@@ -7,6 +9,7 @@ import org.joinmastodon.android.api.StatusInteractionController;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Application;
 import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Markers;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.PushSubscription;
@@ -14,6 +17,7 @@ import org.joinmastodon.android.model.Token;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;

 public class AccountSession{
 	public Token token;
@@ -87,4 +91,15 @@ public class AccountSession{
 			pushSubscriptionManager=new PushSubscriptionManager(getID());
 		return pushSubscriptionManager;
 	}
+
+	public Optional<Instance> getInstance() {
+		return Optional.ofNullable(AccountSessionManager.getInstance().getInstanceInfo(domain));
+	}
+
+	public Uri getInstanceUri() {
+		return new Uri.Builder()
+				.scheme("https")
+				.authority(getInstance().map(i -> i.normalizedUri).orElse(domain))
+				.build();
+	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
@@ -15,6 +15,7 @@ import android.util.Log;

 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.E;
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
@@ -121,6 +122,12 @@ public class AccountSessionManager{
 		sessions.put(session.getID(), session);
 		lastActiveAccountID=session.getID();
 		writeAccountsFile();
+
+		// write initial instance info to file immediately to avoid sessions without instance info
+		InstanceInfoStorageWrapper wrapper = new InstanceInfoStorageWrapper();
+		wrapper.instance = instance;
+		MastodonAPIController.runInBackground(()->writeInstanceInfoFile(wrapper, instance.uri));
+
 		updateMoreInstanceInfo(instance, instance.uri);
 		if(PushSubscriptionManager.arePushNotificationsAvailable()){
 			session.getPushSubscriptionManager().registerAccountForPush(null);
@@ -129,14 +136,16 @@ public class AccountSessionManager{
 	}

 	public synchronized void writeAccountsFile(){
-		File file=new File(MastodonApp.context.getFilesDir(), "accounts.json");
+		File tmpFile = new File(MastodonApp.context.getFilesDir(), "accounts.json~");
+		File file = new File(MastodonApp.context.getFilesDir(), "accounts.json");
 		try{
-			try(FileOutputStream out=new FileOutputStream(file)){
+			try(FileOutputStream out=new FileOutputStream(tmpFile)){
 				SessionsStorageWrapper w=new SessionsStorageWrapper();
 				w.accounts=new ArrayList<>(sessions.values());
 				OutputStreamWriter writer=new OutputStreamWriter(out, StandardCharsets.UTF_8);
 				MastodonAPIController.gson.toJson(w, writer);
 				writer.flush();
+				if (!tmpFile.renameTo(file)) Log.e(TAG, "Error renaming " + tmpFile.getPath() + " to " + file.getPath());
 			}
 		}catch(IOException x){
 			Log.e(TAG, "Error writing accounts file", x);
@@ -189,6 +198,7 @@ public class AccountSessionManager{
 		AccountSession session=getAccount(id);
 		session.getCacheController().closeDatabase();
 		MastodonApp.context.deleteDatabase(id+".db");
+		GlobalUserPreferences.removeAccount(id);
 		sessions.remove(id);
 		if(lastActiveAccountID.equals(id)){
 			if(sessions.isEmpty())
@@ -259,31 +269,35 @@ public class AccountSessionManager{
 	}

 	public void maybeUpdateLocalInfo(){
+		maybeUpdateLocalInfo(null);
+	}
+
+	public void maybeUpdateLocalInfo(AccountSession activeSession){
 		long now=System.currentTimeMillis();
 		HashSet<String> domains=new HashSet<>();
 		for(AccountSession session:sessions.values()){
 			domains.add(session.domain.toLowerCase());
-//			if(now-session.infoLastUpdated>24L*3600_000L){
-			updateSessionPreferences(session);
-			updateSessionLocalInfo(session);
-//			}
-//			if(now-session.filtersLastUpdated>3600_000L){
-			updateSessionWordFilters(session);
-//			}
+			if(now-session.infoLastUpdated>24L*3600_000L || session == activeSession){
+				updateSessionPreferences(session);
+				updateSessionLocalInfo(session);
+			}
+			if(now-session.filtersLastUpdated>3600_000L || session == activeSession){
+				updateSessionWordFilters(session);
+			}
 			updateSessionMarkers(session);
 		}
 		if(loadedInstances){
-			maybeUpdateCustomEmojis(domains);
+			maybeUpdateCustomEmojis(domains, activeSession != null ? activeSession.domain : null);
 		}
 	}

-	private void maybeUpdateCustomEmojis(Set<String> domains){
+	private void maybeUpdateCustomEmojis(Set<String> domains, String activeDomain){
 		long now=System.currentTimeMillis();
 		for(String domain:domains){
-//			Long lastUpdated=instancesLastUpdated.get(domain);
-//			if(lastUpdated==null || now-lastUpdated>24L*3600_000L){
-			updateInstanceInfo(domain);
-//			}
+			Long lastUpdated=instancesLastUpdated.get(domain);
+			if(lastUpdated==null || now-lastUpdated>24L*3600_000L || domain.equals(activeDomain)){
+				updateInstanceInfo(domain);
+			}
 		}
 	}

@@ -411,7 +425,9 @@ public class AccountSessionManager{

 					@Override
 					public void onError(ErrorResponse error){
-
+						InstanceInfoStorageWrapper wrapper=new InstanceInfoStorageWrapper();
+						wrapper.instance = instance;
+						MastodonAPIController.runInBackground(()->writeInstanceInfoFile(wrapper, domain));
 					}
 				})
 				.execNoAuth(domain);
@@ -422,10 +438,13 @@ public class AccountSessionManager{
 	}

 	private void writeInstanceInfoFile(InstanceInfoStorageWrapper emojis, String domain){
-		try(FileOutputStream out=new FileOutputStream(getInstanceInfoFile(domain))){
+		File file = getInstanceInfoFile(domain);
+		File tmpFile = new File(file.getPath() + "~");
+		try(FileOutputStream out=new FileOutputStream(tmpFile)){
 			OutputStreamWriter writer=new OutputStreamWriter(out, StandardCharsets.UTF_8);
 			MastodonAPIController.gson.toJson(emojis, writer);
 			writer.flush();
+			if (!tmpFile.renameTo(file)) Log.e(TAG, "Error renaming " + tmpFile.getPath() + " to " + file.getPath());
 		}catch(IOException x){
 			Log.w(TAG, "Error writing instance info file for "+domain, x);
 		}
@@ -445,7 +464,7 @@ public class AccountSessionManager{
 		}
 		if(!loadedInstances){
 			loadedInstances=true;
-			maybeUpdateCustomEmojis(domains);
+			maybeUpdateCustomEmojis(domains, null);
 		}
 	}

@@ -469,10 +488,6 @@ public class AccountSessionManager{
 		return instances.get(domain);
 	}

-	public Instance getInstanceInfoForAccount(String account) {
-		return AccountSessionManager.getInstance().getInstanceInfo(instance.getAccount(account).domain);
-	}
-
 	public void updateAccountInfo(String id, Account account){
 		AccountSession session=getAccount(id);
 		session.self=account;