Mastodon/Shitter-android-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix, version upgrade

Browse Source
This commit is contained in:
nuclearfog 2023-03-30 00:52:14 +02:00
parent c4b7ecca9e
commit 0b7923aba2
No known key found for this signature in database
GPG Key ID: 03488A185C476379
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -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'
}

7
app/src/main/java/org/nuclearfog/twidda/ui/activities/ProfileActivity.java
View File

@ -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);

22
app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
View File

@ -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);