From 0b7923aba2dd5d3f2c174b481c29d6a040bedfb9 Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Thu, 30 Mar 2023 00:52:14 +0200
Subject: [PATCH] bug fix, version upgrade

---
 app/build.gradle                              |  4 ++--
 .../twidda/ui/activities/ProfileActivity.java |  7 ++----
 .../twidda/ui/activities/StatusActivity.java  | 22 +++++++------------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 737848e2..83c4be9f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
 		applicationId 'org.nuclearfog.twidda'
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 78
-		versionName '3.0.10'
+		versionCode 79
+		versionName '3.0.11'
 		resConfigs 'en', 'de-rDE', 'zh-rCN'
 	}
 
diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/activities/ProfileActivity.java b/app/src/main/java/org/nuclearfog/twidda/ui/activities/ProfileActivity.java
index ad7be489..f73aa488 100644
--- a/app/src/main/java/org/nuclearfog/twidda/ui/activities/ProfileActivity.java
+++ b/app/src/main/java/org/nuclearfog/twidda/ui/activities/ProfileActivity.java
@@ -77,7 +77,6 @@ import org.nuclearfog.twidda.backend.utils.PicassoBuilder;
 import org.nuclearfog.twidda.backend.utils.StringTools;
 import org.nuclearfog.twidda.backend.utils.TextWithEmoji;
 import org.nuclearfog.twidda.config.GlobalSettings;
-import org.nuclearfog.twidda.database.impl.DatabaseUser;
 import org.nuclearfog.twidda.model.Relation;
 import org.nuclearfog.twidda.model.User;
 import org.nuclearfog.twidda.ui.adapter.FragmentAdapter;
@@ -251,10 +250,8 @@ public class ProfileActivity extends AppCompatActivity implements ActivityResult
 		}
 		if (user != null) {
 			setUser(user);
-			if (user instanceof DatabaseUser) {
-				UserParam param = new UserParam(UserParam.ONLINE, userId);
-				userLoader.execute(param, userCallback);
-			}
+			UserParam param = new UserParam(UserParam.ONLINE, userId);
+			userLoader.execute(param, userCallback);
 		} else {
 			UserParam param = new UserParam(UserParam.DATABASE, userId);
 			userLoader.execute(param, userCallback);
diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java b/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
index 334c4f4e..77aad6c6 100644
--- a/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
+++ b/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
@@ -73,8 +73,6 @@ import org.nuclearfog.twidda.backend.utils.StringTools;
 import org.nuclearfog.twidda.backend.utils.TextWithEmoji;
 import org.nuclearfog.twidda.config.Configuration;
 import org.nuclearfog.twidda.config.GlobalSettings;
-import org.nuclearfog.twidda.database.impl.DatabaseNotification;
-import org.nuclearfog.twidda.database.impl.DatabaseStatus;
 import org.nuclearfog.twidda.model.Card;
 import org.nuclearfog.twidda.model.Location;
 import org.nuclearfog.twidda.model.Media;
@@ -304,31 +302,27 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
 		Object notificationObject = savedInstanceState.getSerializable(KEY_NOTIFICATION_DATA);
 		if (statusObject instanceof Status) {
 			Status status = (Status) statusObject;
+			Status embeddedStatus = status.getEmbeddedStatus();
 			setStatus(status);
-			Status embedded = status.getEmbeddedStatus();
-			if (embedded != null) {
-				statusId = embedded.getId();
-				replyUsername = embedded.getAuthor().getScreenname();
+			StatusParam statusParam = new StatusParam(StatusParam.ONLINE, status.getId());
+			statusAsync.execute(statusParam, statusCallback);
+			if (embeddedStatus != null) {
+				statusId = embeddedStatus.getId();
+				replyUsername = embeddedStatus.getAuthor().getScreenname();
 			} else {
 				statusId = status.getId();
 				hidden = status.isHidden();
 				replyUsername = status.getAuthor().getScreenname();
 			}
-			if (status instanceof DatabaseStatus) {
-				StatusParam statusParam = new StatusParam(StatusParam.ONLINE, status.getId());
-				statusAsync.execute(statusParam, statusCallback);
-			}
 		} else if (notificationObject instanceof Notification) {
 			Notification notification = (Notification) notificationObject;
+			NotificationActionParam notificationParam = new NotificationActionParam(NotificationActionParam.ONLINE, notification.getId());
+			notificationAsync.execute(notificationParam, notificationCallback);
 			if (notification.getStatus() != null) {
 				setNotification(notification);
 				statusId = notification.getStatus().getId();
 				replyUsername = notification.getStatus().getAuthor().getScreenname();
 			}
-			if (notification instanceof DatabaseNotification) {
-				NotificationActionParam notificationParam = new NotificationActionParam(NotificationActionParam.ONLINE, notification.getId());
-				notificationAsync.execute(notificationParam, notificationCallback);
-			}
 		} else {
 			statusId = savedInstanceState.getLong(KEY_STATUS_ID, 0L);
 			long notificationId = savedInstanceState.getLong(KEY_NOTIFICATION_ID, 0L);