Mastodon/Shitter-android-app
1
0
Fork 0
mirror of https://github.com/nuclearfog/Shitter.git synced 2025-01-01 04:17:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

added initial instance announcement support, fixed report dialog, notification item layout fix, gradle dependency update

Browse Source
This commit is contained in:
nuclearfog 2023-11-26 10:00:07 +01:00
parent 6098e1fd63
commit 670a4dbaf4
No known key found for this signature in database
GPG Key ID: 43E45B82006BC9D5
20 changed files with 481 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -52,9 +52,9 @@ dependencies {
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'androidx.media3:media3-exoplayer:1.1.1'
implementation 'androidx.media3:media3-ui:1.1.1'
implementation 'androidx.media3:media3-datasource-okhttp:1.1.1'
implementation 'androidx.media3:media3-exoplayer:1.2.0'
implementation 'androidx.media3:media3-ui:1.2.0'
implementation 'androidx.media3:media3-datasource-okhttp:1.2.0'
implementation 'androidx.viewpager2:viewpager2:1.0.0'
//noinspection GradleDependency
implementation 'com.squareup.okhttp3:okhttp:4.11.0'

8
app/src/main/java/org/nuclearfog/twidda/backend/api/Connection.java
View File

@ -26,6 +26,7 @@ import org.nuclearfog.twidda.model.Translation;
import org.nuclearfog.twidda.model.User;
import org.nuclearfog.twidda.model.UserList;
import org.nuclearfog.twidda.model.WebPush;
import org.nuclearfog.twidda.model.lists.Announcements;
import org.nuclearfog.twidda.model.lists.Domains;
import org.nuclearfog.twidda.model.lists.Filters;
import org.nuclearfog.twidda.model.lists.Notifications;
@ -70,6 +71,13 @@ public interface Connection {
*/
Instance getInformation() throws ConnectionException;
/**
* get instance announcements
*
* @return a list of {@link org.nuclearfog.twidda.model.Announcement}
*/
Announcements getAnnouncements() throws ConnectionException;
/**
* lookup user and return user information
*

246
app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java
View File

@ -16,6 +16,7 @@ import org.nuclearfog.twidda.backend.api.Connection;
import org.nuclearfog.twidda.backend.api.ConnectionException;
import org.nuclearfog.twidda.backend.api.mastodon.impl.EditedMastodonStatus;
import org.nuclearfog.twidda.backend.api.mastodon.impl.MastodonAccount;
import org.nuclearfog.twidda.backend.api.mastodon.impl.MastodonAnnouncement;
import org.nuclearfog.twidda.backend.api.mastodon.impl.MastodonCredentials;
import org.nuclearfog.twidda.backend.api.mastodon.impl.MastodonEmoji;
import org.nuclearfog.twidda.backend.api.mastodon.impl.MastodonFilter;
@ -59,6 +60,7 @@ import org.nuclearfog.twidda.model.Translation;
import org.nuclearfog.twidda.model.User;
import org.nuclearfog.twidda.model.UserList;
import org.nuclearfog.twidda.model.WebPush;
import org.nuclearfog.twidda.model.lists.Announcements;
import org.nuclearfog.twidda.model.lists.Domains;
import org.nuclearfog.twidda.model.lists.Filters;
import org.nuclearfog.twidda.model.lists.Notifications;
@ -158,6 +160,7 @@ public class Mastodon implements Connection {
private static final String ENDPOINT_REPORT = "/api/v1/reports";
private static final String ENDPOINT_SCHEDULED_STATUS = "/api/v1/scheduled_statuses";
private static final String ENDPOINT_GET_RULES = "/api/v1/instance/rules";
private static final String ENDPOINT_ANNOUNCEMENTS = "/api/v1/announcements";
private static final MediaType TYPE_TEXT = MediaType.parse("text/plain");
private static final MediaType TYPE_STREAM = MediaType.parse("application/octet-stream");
@ -243,7 +246,7 @@ public class Mastodon implements Connection {
@Override
public Instance getInformation() throws ConnectionException {
try {
Response response = get(ENDPOINT_INSTANCE, new ArrayList<>());
Response response = get(ENDPOINT_INSTANCE);
ResponseBody body = response.body();
if (response.code() == 200 && body != null) {
JSONObject json = new JSONObject(body.string());
@ -256,10 +259,32 @@ public class Mastodon implements Connection {
}
@Override
public Announcements getAnnouncements() throws ConnectionException {
try {
Announcements result = new Announcements();
List<String> params = new ArrayList<>();
params.add("with_dismissed=true");
Response response = get(ENDPOINT_ANNOUNCEMENTS, params);
ResponseBody body = response.body();
if (response.code() == 200 && body != null) {
JSONArray array = new JSONArray(body.string());
for (int i = 0 ; i < array.length() ; i++) {
JSONObject json = array.getJSONObject(i);
result.add(new MastodonAnnouncement(json));
}
}
return result;
} catch (JSONException | IOException e) {
throw new MastodonException(e);
}
}
@Override
public User showUser(long id) throws MastodonException {
try {
return createUser(get(ENDPOINT_GET_USER + id, new ArrayList<>()));
return createUser(get(ENDPOINT_GET_USER + id));
} catch (IOException e) {
throw new MastodonException(e);
}
@ -277,31 +302,31 @@ public class Mastodon implements Connection {
@Override
public Users getRepostingUsers(long id, long cursor) throws MastodonException {
return getUsers(ENDPOINT_STATUS + id + "/reblogged_by", cursor, new ArrayList<>());
return getUsers(ENDPOINT_STATUS + id + "/reblogged_by", cursor);
}
@Override
public Users getFavoritingUsers(long id, long cursor) throws MastodonException {
return getUsers(ENDPOINT_STATUS + id + "/favourited_by", cursor, new ArrayList<>());
return getUsers(ENDPOINT_STATUS + id + "/favourited_by", cursor);
}
@Override
public Users getFollowing(long id, long cursor) throws MastodonException {
return getUsers(ENDPOINT_ACCOUNTS + id + "/following", cursor, new ArrayList<>());
return getUsers(ENDPOINT_ACCOUNTS + id + "/following", cursor);
}
@Override
public Users getFollower(long id, long cursor) throws MastodonException {
return getUsers(ENDPOINT_ACCOUNTS + id + "/followers", cursor, new ArrayList<>());
return getUsers(ENDPOINT_ACCOUNTS + id + "/followers", cursor);
}
@Override
public Users getListMember(long id, long cursor) throws MastodonException {
return getUsers(ENDPOINT_USERLIST + id + "/accounts", cursor, new ArrayList<>());
return getUsers(ENDPOINT_USERLIST + id + "/accounts", cursor);
}
@ -313,19 +338,19 @@ public class Mastodon implements Connection {
@Override
public Users getBlockedUsers(long cursor) throws MastodonException {
return getUsers(ENDPOINT_BLOCKS, cursor, new ArrayList<>());
return getUsers(ENDPOINT_BLOCKS, cursor);
}
@Override
public Users getMutedUsers(long cursor) throws MastodonException {
return getUsers(ENDPOINT_MUTES, cursor, new ArrayList<>());
return getUsers(ENDPOINT_MUTES, cursor);
}
@Override
public Users getIncomingFollowRequests(long cursor) throws MastodonException {
return getUsers(ENDPOINT_FOLLOW_REQUESTS, cursor, new ArrayList<>());
return getUsers(ENDPOINT_FOLLOW_REQUESTS, cursor);
}
@ -338,9 +363,8 @@ public class Mastodon implements Connection {
@Override
public void acceptFollowRequest(long id) throws ConnectionException {
try {
Response response = get(ENDPOINT_FOLLOW_REQUESTS + "/" + id + "/authorize", new ArrayList<>());
ResponseBody body = response.body();
if (response.code() == 200 && body != null) {
Response response = post(ENDPOINT_FOLLOW_REQUESTS + "/" + id + "/authorize");
if (response.code() != 200) {
throw new MastodonException(response);
}
} catch (IOException e) {
@ -352,9 +376,8 @@ public class Mastodon implements Connection {
@Override
public void rejectFollowRequest(long id) throws ConnectionException {
try {
Response response = get(ENDPOINT_FOLLOW_REQUESTS + "/" + id + "/reject", new ArrayList<>());
ResponseBody body = response.body();
if (response.code() == 200 && body != null) {
Response response = post(ENDPOINT_FOLLOW_REQUESTS + "/" + id + "/reject");
if (response.code() != 200) {
throw new MastodonException(response);
}
} catch (IOException e) {
@ -383,7 +406,7 @@ public class Mastodon implements Connection {
@Override
public Relation followUser(long id) throws MastodonException {
createPost(ENDPOINT_ACCOUNTS + id + "/follow", new ArrayList<>());
createPost(ENDPOINT_ACCOUNTS + id + "/follow");
MastodonRelation relation = getUserRelationship(id);
relation.setFollowing(true);
return relation;
@ -392,7 +415,7 @@ public class Mastodon implements Connection {
@Override
public Relation unfollowUser(long id) throws MastodonException {
createPost(ENDPOINT_ACCOUNTS + id + "/unfollow", new ArrayList<>());
createPost(ENDPOINT_ACCOUNTS + id + "/unfollow");
MastodonRelation relation = getUserRelationship(id);
relation.setFollowing(false);
return relation;
@ -401,7 +424,7 @@ public class Mastodon implements Connection {
@Override
public Relation blockUser(long id) throws MastodonException {
createPost(ENDPOINT_ACCOUNTS + id + "/block", new ArrayList<>());
createPost(ENDPOINT_ACCOUNTS + id + "/block");
MastodonRelation relation = getUserRelationship(id);
relation.setBlocked(true);
return relation;
@ -420,7 +443,7 @@ public class Mastodon implements Connection {
@Override
public Relation unblockUser(long id) throws MastodonException {
createPost(ENDPOINT_ACCOUNTS + id + "/unblock", new ArrayList<>());
createPost(ENDPOINT_ACCOUNTS + id + "/unblock");
MastodonRelation relation = getUserRelationship(id);
relation.setBlocked(false);
return relation;
@ -429,7 +452,7 @@ public class Mastodon implements Connection {
@Override
public Relation muteUser(long id) throws MastodonException {
createPost(ENDPOINT_ACCOUNTS + id + "/mute", new ArrayList<>());
createPost(ENDPOINT_ACCOUNTS + id + "/mute");
MastodonRelation relation = getUserRelationship(id);
relation.setMuted(true);
return relation;
@ -448,7 +471,7 @@ public class Mastodon implements Connection {
@Override
public Relation unmuteUser(long id) throws MastodonException {
createPost(ENDPOINT_ACCOUNTS + id + "/unmute", new ArrayList<>());
createPost(ENDPOINT_ACCOUNTS + id + "/unmute");
MastodonRelation relation = getUserRelationship(id);
relation.setMuted(false);
return relation;
@ -463,11 +486,11 @@ public class Mastodon implements Connection {
else if (settings.getPublicTimeline().equals(GlobalSettings.TIMELINE_REMOTE))
params.add("remote=true");
if (search.matches("#\\S+")) {
return getStatuses(ENDPOINT_TAG_TIMELINE + StringUtils.encode(search.substring(1)), params, minId, maxId);
return getStatuses(ENDPOINT_TAG_TIMELINE + StringUtils.encode(search.substring(1)), minId, maxId, params);
} else {
params.add("q=" + StringUtils.encode(search));
params.add("type=statuses");
return getStatuses(ENDPOINT_SEARCH_TIMELINE, params, minId, maxId);
return getStatuses(ENDPOINT_SEARCH_TIMELINE, minId, maxId, params);
}
}
@ -479,7 +502,7 @@ public class Mastodon implements Connection {
params.add("local=true");
else if (settings.getPublicTimeline().equals(GlobalSettings.TIMELINE_REMOTE))
params.add("remote=true");
return getStatuses(ENDPOINT_PUBLIC_TIMELINE, params, minId, maxId);
return getStatuses(ENDPOINT_PUBLIC_TIMELINE, minId, maxId, params);
}
@ -487,7 +510,7 @@ public class Mastodon implements Connection {
public StatusEditHistory getStatusEditHistory(long id) throws ConnectionException {
try {
StatusEditHistory result = new StatusEditHistory();
Response response = get(ENDPOINT_STATUS + id + "/history", new ArrayList<>());
Response response = get(ENDPOINT_STATUS + id + "/history");
ResponseBody body = response.body();
if (response.code() == 200 && body != null) {
JSONArray array = new JSONArray(body.string());
@ -505,7 +528,7 @@ public class Mastodon implements Connection {
@Override
public Tags getTags() throws MastodonException {
Tags result = getTags(ENDPOINT_TRENDS, new ArrayList<>());
Tags result = getTags(ENDPOINT_TRENDS);
Collections.sort(result);
return result;
}
@ -536,13 +559,13 @@ public class Mastodon implements Connection {
@Override
public Tags showTagFeaturing() throws ConnectionException {
return getTags(ENDPOINT_TAG_FEATURE, new ArrayList<>());
return getTags(ENDPOINT_TAG_FEATURE);
}
@Override
public Tags showTagSuggestions() throws ConnectionException {
return getTags(ENDPOINT_TAG_FEATURE + "/suggestions", new ArrayList<>());
return getTags(ENDPOINT_TAG_FEATURE + "/suggestions");
}
@ -551,7 +574,7 @@ public class Mastodon implements Connection {
try {
if (name.startsWith("#"))
name = name.substring(1);
return createTag(get(ENDPOINT_TAG + StringUtils.encode(name), new ArrayList<>()));
return createTag(get(ENDPOINT_TAG + StringUtils.encode(name)));
} catch (IOException e) {
throw new MastodonException(e);
}
@ -563,7 +586,7 @@ public class Mastodon implements Connection {
try {
if (name.startsWith("#"))
name = name.substring(1);
return createTag(post(ENDPOINT_TAG + StringUtils.encode(name) + "/follow", new ArrayList<>()));
return createTag(post(ENDPOINT_TAG + StringUtils.encode(name) + "/follow"));
} catch (IOException e) {
throw new MastodonException(e);
}
@ -575,7 +598,7 @@ public class Mastodon implements Connection {
try {
if (name.startsWith("#"))
name = name.substring(1);
return createTag(post(ENDPOINT_TAG + StringUtils.encode(name) + "/unfollow", new ArrayList<>()));
return createTag(post(ENDPOINT_TAG + StringUtils.encode(name) + "/unfollow"));
} catch (IOException e) {
throw new MastodonException(e);
}
@ -599,7 +622,7 @@ public class Mastodon implements Connection {
@Override
public Tag unfeatureTag(long id) throws ConnectionException {
try {
return createTag(delete(ENDPOINT_TAG_FEATURE + "/" + id, new ArrayList<>()));
return createTag(delete(ENDPOINT_TAG_FEATURE + "/" + id));
} catch (IOException e) {
throw new MastodonException(e);
}
@ -608,40 +631,40 @@ public class Mastodon implements Connection {
@Override
public Statuses getHomeTimeline(long minId, long maxId) throws MastodonException {
return getStatuses(ENDPOINT_HOME_TIMELINE, new ArrayList<>(0), minId, maxId);
return getStatuses(ENDPOINT_HOME_TIMELINE, minId, maxId);
}
@Override
public Statuses getUserTimeline(long id, long minId, long maxId) throws MastodonException {
String endpoint = ENDPOINT_USER_TIMELINE + id + "/statuses";
return getStatuses(endpoint, new ArrayList<>(), minId, maxId);
return getStatuses(endpoint, minId, maxId);
}
@Override
public Statuses getUserFavorits(long id, long minId, long maxId) throws MastodonException {
if (id == settings.getLogin().getId()) // mastodon only returns favorits of the authenticating user
return getStatuses(ENDPOINT_USER_FAVORITS, new ArrayList<>(), maxId, minId); // min_id and max_id swapped by Mastodon
return getStatuses(ENDPOINT_USER_FAVORITS, maxId, minId); // min_id and max_id swapped by Mastodon
return new Statuses();
}
@Override
public Statuses getUserBookmarks(long minId, long maxId) throws MastodonException {
return getStatuses(ENDPOINT_BOOKMARKS, new ArrayList<>(), maxId, minId); // min_id and max_id swapped by Mastodon
return getStatuses(ENDPOINT_BOOKMARKS, maxId, minId); // min_id and max_id swapped by Mastodon
}
@Override
public Statuses getUserlistStatuses(long id, long minId, long maxId) throws MastodonException {
return getStatuses(ENDPOINT_LIST_TIMELINE + id, new ArrayList<>(0), minId, maxId);
return getStatuses(ENDPOINT_LIST_TIMELINE + id, minId, maxId);
}
@Override
public Statuses getStatusReplies(long id, long minId, long maxId) throws MastodonException {
Statuses statusThreads = getStatuses(ENDPOINT_STATUS + id + "/context", new ArrayList<>(0), minId, maxId);
Statuses statusThreads = getStatuses(ENDPOINT_STATUS + id + "/context", minId, maxId);
Statuses result = new Statuses();
int limit = Math.min(statusThreads.size(), settings.getListSize());
for (int i = 0; i < limit; i++)
@ -653,13 +676,13 @@ public class Mastodon implements Connection {
@Override
public Status showStatus(long id) throws MastodonException {
return getStatus(ENDPOINT_STATUS + id, new ArrayList<>());
return getStatus(ENDPOINT_STATUS + id);
}
@Override
public Status favoriteStatus(long id) throws MastodonException {
MastodonStatus status = postStatus(ENDPOINT_STATUS + id + "/favourite", new ArrayList<>());
MastodonStatus status = postStatus(ENDPOINT_STATUS + id + "/favourite");
status.setFavorite(true);
return status;
}
@ -667,7 +690,7 @@ public class Mastodon implements Connection {
@Override
public Status unfavoriteStatus(long id) throws MastodonException {
MastodonStatus status = postStatus(ENDPOINT_STATUS + id + "/unfavourite", new ArrayList<>());
MastodonStatus status = postStatus(ENDPOINT_STATUS + id + "/unfavourite");
status.setFavorite(false);
return status;
}
@ -675,7 +698,7 @@ public class Mastodon implements Connection {
@Override
public Status repostStatus(long id) throws MastodonException {
MastodonStatus status = postStatus(ENDPOINT_STATUS + id + "/reblog", new ArrayList<>());
MastodonStatus status = postStatus(ENDPOINT_STATUS + id + "/reblog");
status.setRepost(true);
return status;
}
@ -683,7 +706,7 @@ public class Mastodon implements Connection {
@Override
public Status removeRepost(long id) throws MastodonException {
MastodonStatus status = postStatus(ENDPOINT_STATUS + id + "/unreblog", new ArrayList<>());
MastodonStatus status = postStatus(ENDPOINT_STATUS + id + "/unreblog");
status.setRepost(false);
return status;
}
@ -691,7 +714,7 @@ public class Mastodon implements Connection {
@Override
public Status bookmarkStatus(long id) throws ConnectionException {
MastodonStatus status = postStatus(ENDPOINT_STATUS + id + "/bookmark", new ArrayList<>());
MastodonStatus status = postStatus(ENDPOINT_STATUS + id + "/bookmark");
status.setBookmark(true);
return status;
}
@ -699,7 +722,7 @@ public class Mastodon implements Connection {
@Override
public Status removeBookmark(long id) throws ConnectionException {
MastodonStatus status = postStatus(ENDPOINT_STATUS + id + "/unbookmark", new ArrayList<>());
MastodonStatus status = postStatus(ENDPOINT_STATUS + id + "/unbookmark");
status.setBookmark(false);
return status;
}
@ -707,20 +730,20 @@ public class Mastodon implements Connection {
@Override
public void muteConversation(long id) throws MastodonException {
createPost(ENDPOINT_MUTES + id + "/mute", new ArrayList<>());
createPost(ENDPOINT_MUTES + id + "/mute");
}
@Override
public void unmuteConversation(long id) throws MastodonException {
createPost(ENDPOINT_STATUS + id + "/unmute", new ArrayList<>());
createPost(ENDPOINT_STATUS + id + "/unmute");
}
@Override
public void deleteStatus(long id) throws MastodonException {
try {
Response response = delete(ENDPOINT_STATUS + id, new ArrayList<>());
Response response = delete(ENDPOINT_STATUS + id);
if (response.code() != 200) {
throw new MastodonException(response);
}
@ -852,7 +875,7 @@ public class Mastodon implements Connection {
@Override
public void cancelScheduledStatus(long id) throws ConnectionException {
try {
Response response = delete(ENDPOINT_SCHEDULED_STATUS + "/" + id, new ArrayList<>());
Response response = delete(ENDPOINT_SCHEDULED_STATUS + "/" + id);
if (response.code() != 200) {
throw new MastodonException(response);
}
@ -943,7 +966,7 @@ public class Mastodon implements Connection {
@Override
public UserList getUserlist(long id) throws MastodonException {
try {
return createUserlist(get(ENDPOINT_USERLIST + id, new ArrayList<>()));
return createUserlist(get(ENDPOINT_USERLIST + id));
} catch (IOException e) {
throw new MastodonException(e);
}
@ -953,7 +976,7 @@ public class Mastodon implements Connection {
@Override
public void deleteUserlist(long id) throws MastodonException {
try {
Response response = delete(ENDPOINT_USERLIST + id, new ArrayList<>());
Response response = delete(ENDPOINT_USERLIST + id);
if (response.code() != 200) {
throw new MastodonException(response);
}
@ -965,13 +988,13 @@ public class Mastodon implements Connection {
@Override
public UserLists getUserlistOwnerships(long id, long cursor) throws MastodonException {
return getUserLists(ENDPOINT_USERLIST, new ArrayList<>(), cursor);
return getUserLists(ENDPOINT_USERLIST, cursor);
}
@Override
public UserLists getUserlistMemberships(long id, long cursor) throws MastodonException {
return getUserLists(ENDPOINT_ACCOUNTS + id + "/lists", new ArrayList<>(), cursor);
return getUserLists(ENDPOINT_ACCOUNTS + id + "/lists", cursor);
}
@ -1010,7 +1033,7 @@ public class Mastodon implements Connection {
@Override
public List<Emoji> getEmojis() throws MastodonException {
try {
Response response = get(ENDPOINT_CUSTOM_EMOJIS, new ArrayList<>());
Response response = get(ENDPOINT_CUSTOM_EMOJIS);
ResponseBody body = response.body();
if (response.code() == 200 && body != null) {
JSONArray json = new JSONArray(body.string());
@ -1034,7 +1057,7 @@ public class Mastodon implements Connection {
@Override
public Poll getPoll(long id) throws ConnectionException {
try {
Response response = get(ENDPOINT_POLL + id, new ArrayList<>());
Response response = get(ENDPOINT_POLL + id);
ResponseBody body = response.body();
if (response.code() == 200 && body != null) {
JSONObject json = new JSONObject(body.string());
@ -1070,7 +1093,7 @@ public class Mastodon implements Connection {
@Override
public Filters getFilter() throws ConnectionException {
try {
Response response = get(ENDPOINT_FILTER, new ArrayList<>());
Response response = get(ENDPOINT_FILTER);
ResponseBody body = response.body();
if (response.code() == 200 && body != null) {
JSONArray array = new JSONArray(body.string());
@ -1153,7 +1176,7 @@ public class Mastodon implements Connection {
@Override
public void deleteFilter(long id) throws ConnectionException {
try {
Response response = delete(ENDPOINT_FILTER + '/' + id, new ArrayList<>());
Response response = delete(ENDPOINT_FILTER + '/' + id);
if (response.code() != 200) {
throw new MastodonException(response);
}
@ -1253,7 +1276,7 @@ public class Mastodon implements Connection {
JSONObject json = new JSONObject(body.string());
long id = Long.parseLong(json.getString("id"));
while (retryCount++ < 10) {
response = get(ENDPOINT_MEDIA_STATUS + id, new ArrayList<>());
response = get(ENDPOINT_MEDIA_STATUS + id);
if (response.code() == 200)
return id;
Thread.sleep(2000L);
@ -1339,7 +1362,7 @@ public class Mastodon implements Connection {
@Override
public Notification getNotification(long id) throws ConnectionException {
try {
return createNotification(get(ENDPOINT_NOTIFICATION + '/' + id, new ArrayList<>()));
return createNotification(get(ENDPOINT_NOTIFICATION + '/' + id));
} catch (IOException e) {
throw new MastodonException(e);
}
@ -1349,7 +1372,7 @@ public class Mastodon implements Connection {
@Override
public void dismissNotification(long id) throws ConnectionException {
try {
Response response = post(ENDPOINT_NOTIFICATION + '/' + id + "/dismiss", new ArrayList<>());
Response response = post(ENDPOINT_NOTIFICATION + '/' + id + "/dismiss");
if (response.code() != 200) {
throw new MastodonException(response);
}
@ -1363,7 +1386,6 @@ public class Mastodon implements Connection {
public Translation getStatusTranslation(long id) throws ConnectionException {
try {
List<String> params = new ArrayList<>();
// params.add("lang=" + Locale.getDefault().getLanguage()); // set system language as destiny for translation
Response response = post(ENDPOINT_STATUS + id + "/translate", params);
ResponseBody body = response.body();
if (response.code() == 200 && body != null) {
@ -1409,7 +1431,7 @@ public class Mastodon implements Connection {
@Override
public Rules getRules() throws ConnectionException {
try {
Response response = get(ENDPOINT_GET_RULES, new ArrayList<>());
Response response = get(ENDPOINT_GET_RULES);
ResponseBody body = response.body();
if (response.code() == 200 && body != null) {
JSONArray jsonArray = new JSONArray(body.string());
@ -1456,7 +1478,7 @@ public class Mastodon implements Connection {
*/
private Credentials getCredentials(String host, @NonNull String bearer) throws MastodonException {
try {
Response response = get(host, ENDPOINT_VERIFY_CREDENTIALS, bearer, new ArrayList<>());
Response response = get(host, ENDPOINT_VERIFY_CREDENTIALS, bearer);
ResponseBody body = response.body();
if (response.code() == 200 && body != null) {
JSONObject json = new JSONObject(body.string());
@ -1472,12 +1494,11 @@ public class Mastodon implements Connection {
* get a status from endpoint
*
* @param endpoint endpoint to use
* @param params additional parameters
* @return status
*/
private Status getStatus(String endpoint, List<String> params) throws MastodonException {
private Status getStatus(String endpoint) throws MastodonException {
try {
return createStatus(get(endpoint, params));
return createStatus(get(endpoint));
} catch (IOException e) {
throw new MastodonException(e);
}
@ -1487,17 +1508,28 @@ public class Mastodon implements Connection {
* post a status from endpoint
*
* @param endpoint endpoint to use
* @param params additional parameters
* @return status
* @return status returned by POST endpoint
*/
private MastodonStatus postStatus(String endpoint, List<String> params) throws MastodonException {
private MastodonStatus postStatus(String endpoint) throws MastodonException {
try {
return createStatus(post(endpoint, params));
return createStatus(post(endpoint));
} catch (IOException e) {
throw new MastodonException(e);
}
}
/**
* get a status timeline
*
* @param endpoint Endpoint to use
* @param minId minimum status ID
* @param maxId maximum status ID
* @return status timeline
*/
private Statuses getStatuses(String endpoint, long minId, long maxId) throws MastodonException {
return getStatuses(endpoint, minId, maxId, new ArrayList<>());
}
/**
* get a status timeline
*
@ -1507,7 +1539,7 @@ public class Mastodon implements Connection {
* @param maxId maximum status ID
* @return status timeline
*/
private Statuses getStatuses(String endpoint, List<String> params, long minId, long maxId) throws MastodonException {
private Statuses getStatuses(String endpoint, long minId, long maxId, List<String> params) throws MastodonException {
if (minId != 0L)
params.add("min_id=" + minId);
if (maxId != 0L)
@ -1524,6 +1556,16 @@ public class Mastodon implements Connection {
}
}
/**
* get a list of users from an endpoint
*
* @param endpoint Endpoint to use
* @return list of users
*/
private Users getUsers(String endpoint, long cursor) throws MastodonException {
return getUsers(endpoint, cursor, new ArrayList<>());
}
/**
* get a list of users from an endpoint
*
@ -1542,6 +1584,16 @@ public class Mastodon implements Connection {
}
}
/**
* call tag endpoint and create trend result
*
* @param endpoint Endpoint to use
* @return trend list
*/
private Tags getTags(String endpoint) throws MastodonException {
return getTags(endpoint, new ArrayList<>());
}
/**
* call tag endpoint and create trend result
*
@ -1582,10 +1634,10 @@ public class Mastodon implements Connection {
* create userlists from GET endpoint
*
* @param endpoint userlist endpoint
* @param params additional parameters
* @return userlists
*/
private UserLists getUserLists(String endpoint, List<String> params, long cursor) throws MastodonException {
private UserLists getUserLists(String endpoint, long cursor) throws MastodonException {
List<String> params = new ArrayList<>();
params.add("limit=" + settings.getListSize());
if (cursor != -1L)
params.add("max_id=" + cursor);
@ -1789,11 +1841,10 @@ public class Mastodon implements Connection {
* send post request without return
*
* @param endpoint endpoint to use
* @param params additional parameters
*/
private void createPost(String endpoint, List<String> params) throws MastodonException {
private void createPost(String endpoint) throws MastodonException {
try {
Response response = post(endpoint, params);
Response response = post(endpoint);
ResponseBody body = response.body();
if (response.code() == 200 && body != null)
return;
@ -1803,6 +1854,16 @@ public class Mastodon implements Connection {
}
}
/**
* create get response with current bearer token
*
* @param endpoint endpoint to use
* @return GET response
*/
private Response get(String endpoint) throws IOException {
return get(endpoint, new ArrayList<>());
}
/**
* create get response with current bearer token
*
@ -1815,6 +1876,17 @@ public class Mastodon implements Connection {
return get(currentLogin.getHostname(), endpoint, currentLogin.getBearerToken(), params);
}
/**
* create a GET response
*
* @param endpoint endpoint url
* @param bearer bearer token or null
* @return GET response
*/
private Response get(String hostname, String endpoint, @Nullable String bearer) throws IOException {
return get(hostname, endpoint, bearer, new ArrayList<>());
}
/**
* create a GET response
*
@ -1831,6 +1903,16 @@ public class Mastodon implements Connection {
return client.newCall(request.build()).execute();
}
/**
* create post response with current bearer token
*
* @param endpoint endpoint to use
* @return POST response
*/
private Response post(String endpoint) throws IOException {
return post(endpoint, new ArrayList<>());
}
/**
* create post response with current bearer token
*
@ -1902,6 +1984,16 @@ public class Mastodon implements Connection {
return client.newCall(request.build()).execute();
}
/**
* create a DELETE response
*
* @param endpoint endpoint url
* @return DELETE response
*/
private Response delete(String endpoint) throws IOException {
return delete(endpoint, new ArrayList<>());
}
/**
* create a DELETE response
*

84
app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonAnnouncement.java Normal file
View File

@ -0,0 +1,84 @@
package org.nuclearfog.twidda.backend.api.mastodon.impl;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.nuclearfog.twidda.backend.utils.StringUtils;
import org.nuclearfog.twidda.model.Announcement;
import org.nuclearfog.twidda.model.Emoji;
import org.nuclearfog.twidda.model.Reaction;
/**
* @author nuclearfog
*/
public class MastodonAnnouncement implements Announcement {
private static final long serialVersionUID = 8328117490026664930L;
private long id;
private String message;
private long time;
private Emoji[] emojis = {};
private Reaction[] reactions = {};
/**
*
*/
public MastodonAnnouncement(JSONObject json) throws JSONException {
JSONArray emojiArray = json.optJSONArray("emojis");
JSONArray reactionArray = json.optJSONArray("reactions");
String idStr = json.getString("id");
String timeStr = json.getString("published_at");
message = StringUtils.extractText(json.getString("content"));
time = StringUtils.getIsoTime(timeStr);
if (emojiArray != null && emojiArray.length() > 0) {
emojis = new Emoji[emojiArray.length()];
for (int i = 0; i < emojis.length; i++) {
JSONObject emojiJson = emojiArray.getJSONObject(i);
emojis[i] = new MastodonEmoji(emojiJson);
}
}
if (reactionArray != null && reactionArray.length() > 0) {
reactions = new Reaction[reactionArray.length()];
for (int i = 0; i < reactions.length; i++) {
JSONObject reactionJson = reactionArray.getJSONObject(i);
reactions[i] = new MastodonReaction(reactionJson);
}
}
try {
id = Long.parseLong(idStr);
} catch (NumberFormatException e) {
throw new JSONException("bad ID: " + idStr);
}
}
@Override
public long getId() {
return id;
}
@Override
public String getMessage() {
return message;
}
@Override
public long getTimestamp() {
return time;
}
@Override
public Emoji[] getEmojis() {
return emojis;
}
@Override
public Reaction[] getReactions() {
return reactions;
}
}

51
app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/impl/MastodonReaction.java Normal file
View File

@ -0,0 +1,51 @@
package org.nuclearfog.twidda.backend.api.mastodon.impl;
import org.json.JSONException;
import org.json.JSONObject;
import org.nuclearfog.twidda.model.Reaction;
/**
* @author nuclearfog
*/
public class MastodonReaction implements Reaction {
private static final long serialVersionUID = 6127823131972079805L;
private String name, url;
private int count;
private boolean selected;
/**
*
*/
public MastodonReaction(JSONObject json) throws JSONException {
name = json.getString("name");
count = json.optInt("count", 0);
selected = json.optBoolean("me", false);
url = json.optString("static_url", "");
}
@Override
public String getName() {
return name;
}
@Override
public String getImageUrl() {
return url;
}
@Override
public int getCount() {
return count;
}
@Override
public boolean isSelected() {
return selected;
}
}

8
app/src/main/java/org/nuclearfog/twidda/backend/async/ReportUpdater.java
View File

@ -32,9 +32,9 @@ public class ReportUpdater extends AsyncExecutor<ReportUpdate, ReportUpdater.Res
protected Result doInBackground(@NonNull ReportUpdate param) {
try {
connection.createReport(param);
return new Result(true, null);
return new Result(null);
} catch (ConnectionException exception) {
return new Result(false, exception);
return new Result(exception);
}
}
@ -43,13 +43,11 @@ public class ReportUpdater extends AsyncExecutor<ReportUpdate, ReportUpdater.Res
*/
public static class Result {
public final boolean reported;
@Nullable
public final ConnectionException exception;
Result(boolean reported, @Nullable ConnectionException exception) {
Result(@Nullable ConnectionException exception) {
this.exception = exception;
this.reported = reported;
}
}
}

36
app/src/main/java/org/nuclearfog/twidda/model/Announcement.java Normal file
View File

@ -0,0 +1,36 @@
package org.nuclearfog.twidda.model;
import java.io.Serializable;
/**
* Represents an announcement set by an instance administrator
*
* @author nuclearfog
*/
public interface Announcement extends Serializable {
/**
* @return ID of the announcement
*/
long getId();
/**
* @return message text of the announcement
*/
String getMessage();
/**
* @return announcement publishing time
*/
long getTimestamp();
/**
* @return emojis used in message text
*/
Emoji[] getEmojis();
/**
* @return user reactions of the announcement
*/
Reaction[] getReactions();
}

31
app/src/main/java/org/nuclearfog/twidda/model/Reaction.java Normal file
View File

@ -0,0 +1,31 @@
package org.nuclearfog.twidda.model;
import java.io.Serializable;
/**
* Represents an emoji reaction
*
* @author nuclearfog
*/
public interface Reaction extends Serializable {
/**
* @return title, emoji unicode or custom emoji shortcode of the reaction
*/
String getName();
/**
* @return icon image url or empty if unused
*/
String getImageUrl();
/**
* @return number of users adding this reaction
*/
int getCount();
/**
* @return true if selected by current user
*/
boolean isSelected();
}

34
app/src/main/java/org/nuclearfog/twidda/model/lists/Announcements.java Normal file
View File

@ -0,0 +1,34 @@
package org.nuclearfog.twidda.model.lists;
import androidx.annotation.NonNull;
import org.nuclearfog.twidda.model.Announcement;
import java.util.LinkedList;
/**
* @author nuclearfog
*/
public class Announcements extends LinkedList<Announcement> {
private static final long serialVersionUID = -4480120236663321113L;
/**
*
*/
public Announcements() {}
/**
*
*/
public Announcements(Announcements announcements) {
super(announcements);
}
@NonNull
@Override
public String toString() {
return "item_count=" + size();
}
}

4
app/src/main/java/org/nuclearfog/twidda/ui/adapter/recyclerview/NotificationAdapter.java
View File

@ -59,9 +59,9 @@ public class NotificationAdapter extends Adapter<ViewHolder> implements OnHolder
@Override
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
if (viewType == TYPE_STATUS) {
return new StatusHolder(parent, this);
return new StatusHolder(parent, this, true);
} else if (viewType == TYPE_USER) {
return new UserHolder(parent, this, false);
return new UserHolder(parent, this, true, false);
} else {
return new PlaceHolder(parent, this, false);
}

2
app/src/main/java/org/nuclearfog/twidda/ui/adapter/recyclerview/StatusAdapter.java
View File

@ -78,7 +78,7 @@ public class StatusAdapter extends Adapter<ViewHolder> implements OnHolderClickL
@Override
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
if (viewType == VIEW_STATUS) {
return new StatusHolder(parent, this);
return new StatusHolder(parent, this, false);
} else {
return new PlaceHolder(parent, this, false);
}

2
app/src/main/java/org/nuclearfog/twidda/ui/adapter/recyclerview/UserAdapter.java
View File

@ -72,7 +72,7 @@ public class UserAdapter extends Adapter<ViewHolder> implements OnHolderClickLis
@Override
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
if (viewType == ITEM_USER) {
return new UserHolder(parent, this, enableDelete);
return new UserHolder(parent, this, false, enableDelete);
} else {
return new PlaceHolder(parent, this, false);
}

18
app/src/main/java/org/nuclearfog/twidda/ui/adapter/recyclerview/holder/StatusHolder.java
View File

@ -53,7 +53,7 @@ public class StatusHolder extends ViewHolder implements OnClickListener {
private static final int IMG_SIZE = 150;
private ImageView profile, repostUserIcon, verifiedIcon, lockedIcon, repostIcon, favoriteIcon, replyStatus;
private ImageView profile, repostUserIcon, verifiedIcon, lockedIcon, repostIcon, favoriteIcon, replyStatus, labelIcon;
private TextView username, screenname, statusText, repost, favorite, reply, reposter, created, replyname, label;
private View dismissButton;
private RecyclerView iconList;
@ -73,7 +73,7 @@ public class StatusHolder extends ViewHolder implements OnClickListener {
/**
*
*/
public StatusHolder(ViewGroup parent, OnHolderClickListener listener) {
public StatusHolder(ViewGroup parent, OnHolderClickListener listener, boolean isNotification) {
super(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_status, parent, false));
settings = GlobalSettings.get(parent.getContext());
picasso = PicassoBuilder.get(parent.getContext());
@ -101,6 +101,7 @@ public class StatusHolder extends ViewHolder implements OnClickListener {
reposter = itemView.findViewById(R.id.item_status_reposter_name);
created = itemView.findViewById(R.id.item_status_created_at);
replyname = itemView.findViewById(R.id.item_status_reply_name);
labelIcon = itemView.findViewById(R.id.item_status_label_icon);
placeholder = new ColorDrawable(EMPTY_COLOR);
iconList.setLayoutManager(new LinearLayoutManager(parent.getContext(), RecyclerView.HORIZONTAL, false));
@ -112,6 +113,13 @@ public class StatusHolder extends ViewHolder implements OnClickListener {
} else {
favoriteIcon.setImageResource(R.drawable.favorite);
}
if (isNotification) {
label.setVisibility(View.VISIBLE);
labelIcon.setVisibility(View.VISIBLE);
if (settings.getLogin().getConfiguration().notificationDismissEnabled()) {
dismissButton.setVisibility(View.VISIBLE);
}
}
AppStyles.setTheme(container, Color.TRANSPARENT);
cardLayout.setCardBackgroundColor(settings.getCardColor());
@ -288,12 +296,8 @@ public class StatusHolder extends ViewHolder implements OnClickListener {
iconRes = R.drawable.poll;
break;
}
label.setVisibility(View.VISIBLE);
label.setText(text);
label.setCompoundDrawablesWithIntrinsicBounds(iconRes, 0, 0, 0);
if (settings.getLogin().getConfiguration().notificationDismissEnabled()) {
dismissButton.setVisibility(View.VISIBLE);
}
labelIcon.setImageResource(iconRes);
AppStyles.setDrawableColor(label, settings.getIconColor());
}

18
app/src/main/java/org/nuclearfog/twidda/ui/adapter/recyclerview/holder/UserHolder.java
View File

@ -50,7 +50,7 @@ public class UserHolder extends ViewHolder implements OnClickListener, AsyncCall
private static final int IMG_SIZE = 150;
private TextView username, screenname, followingCount, followerCount, label;
private ImageView profileImg, verifyIcon, lockedIcon;
private ImageView profileImg, verifyIcon, lockedIcon, labelIcon;
private ImageButton delete;
private View notificationDismiss;
private Drawable placeholder;
@ -66,7 +66,7 @@ public class UserHolder extends ViewHolder implements OnClickListener, AsyncCall
/**
* @param enableRemoveButton true to enable remove button
*/
public UserHolder(ViewGroup parent, OnHolderClickListener listener, boolean enableRemoveButton) {
public UserHolder(ViewGroup parent, OnHolderClickListener listener, boolean isNotification, boolean enableRemoveButton) {
super(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_user, parent, false));
settings = GlobalSettings.get(parent.getContext());
picasso = PicassoBuilder.get(parent.getContext());
@ -76,6 +76,7 @@ public class UserHolder extends ViewHolder implements OnClickListener, AsyncCall
CardView background = (CardView) itemView;
ViewGroup container = itemView.findViewById(R.id.item_user_container);
label = itemView.findViewById(R.id.item_user_label);
labelIcon = itemView.findViewById(R.id.item_user_label_icon);
notificationDismiss = itemView.findViewById(R.id.item_user_notification_dismiss);
username = itemView.findViewById(R.id.item_user_username);
screenname = itemView.findViewById(R.id.item_user_screenname);
@ -94,6 +95,13 @@ public class UserHolder extends ViewHolder implements OnClickListener, AsyncCall
} else {
delete.setVisibility(View.GONE);
}
if (isNotification) {
label.setVisibility(View.VISIBLE);
labelIcon.setVisibility(View.VISIBLE);
if (settings.getLogin().getConfiguration().notificationDismissEnabled()) {
notificationDismiss.setVisibility(View.VISIBLE);
}
}
itemView.setOnClickListener(this);
notificationDismiss.setOnClickListener(this);
delete.setOnClickListener(this);
@ -188,11 +196,7 @@ public class UserHolder extends ViewHolder implements OnClickListener, AsyncCall
iconRes = R.drawable.follower_request;
break;
}
if (settings.getLogin().getConfiguration().notificationDismissEnabled()) {
notificationDismiss.setVisibility(View.VISIBLE);
}
label.setVisibility(View.VISIBLE);
label.setCompoundDrawablesWithIntrinsicBounds(iconRes, 0, 0, 0);
labelIcon.setImageResource(iconRes);
label.setText(text);
}
}

6
app/src/main/java/org/nuclearfog/twidda/ui/dialogs/ReportDialog.java
View File

@ -145,6 +145,7 @@ public class ReportDialog extends Dialog implements OnClickListener {
update.setComment(editDescription.getText().toString());
update.setForward(switchForward.isChecked());
reportUpdater.execute(update, reportResult);
Toast.makeText(getContext(), R.string.info_report_submit, Toast.LENGTH_SHORT).show();
}
}
}
@ -169,15 +170,16 @@ public class ReportDialog extends Dialog implements OnClickListener {
}
/**
* callback for {@link ReportUpdater}
* callback used by {@link ReportUpdater}
*/
private void onReportResult(@NonNull ReportUpdater.Result result) {
if (result.reported) {
if (result.exception == null) {
if (update != null && update.getStatusIds().length > 0) {
Toast.makeText(getContext(), R.string.info_status_reported, Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(getContext(), R.string.info_user_reported, Toast.LENGTH_SHORT).show();
}
dismiss();
} else {
ErrorUtils.showErrorMessage(getContext(), result.exception);
}

3
app/src/main/res/layout/dialog_report.xml
View File

@ -83,7 +83,8 @@
android:id="@+id/dialog_report_apply"
android:layout_width="wrap_content"
android:layout_height="@dimen/dialog_report_button_height"
android:padding="@dimen/dialog_report_button_padding"
android:paddingStart="@dimen/dialog_report_button_padding"
android:paddingEnd="@dimen/dialog_report_button_padding"
android:text="@string/dialog_apply"
android:layout_margin="@dimen/dialog_report_margin_items_layout"
android:lines="1"

17
app/src/main/res/layout/item_status.xml
View File

@ -12,16 +12,28 @@
android:layout_height="match_parent"
android:padding="@dimen/item_status_layout_padding">
<ImageView
android:id="@+id/item_status_label_icon"
android:layout_width="0dp"
android:layout_height="0dp"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/item_status_label"
app:layout_constraintBottom_toBottomOf="@id/item_status_label"
app:layout_constraintDimensionRatio="1.0"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/item_status_label"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:lines="1"
android:drawablePadding="@dimen/item_status_drawable_margin"
android:textSize="@dimen/item_status_textsize_notification"
android:layout_marginStart="@dimen/item_status_drawable_margin"
android:layout_marginBottom="@dimen/item_status_label_margin"
android:layout_marginEnd="@dimen/item_status_drawable_margin"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toEndOf="@id/item_status_label_icon"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/item_status_label_barrier"
app:layout_constraintEnd_toStartOf="@id/item_status_notification_dismiss" />
@ -36,7 +48,6 @@
android:scaleType="fitCenter"
android:contentDescription="@string/notification_dismiss"
app:layout_constraintDimensionRatio="1"
app:layout_constraintStart_toEndOf="@id/item_status_label"
app:layout_constraintTop_toTopOf="@id/item_status_label"
app:layout_constraintBottom_toBottomOf="@id/item_status_label"
app:layout_constraintEnd_toEndOf="parent"

17
app/src/main/res/layout/item_user.xml
View File

@ -12,16 +12,28 @@
android:layout_height="match_parent"
android:padding="@dimen/item_user_layout_padding">
<ImageView
android:id="@+id/item_user_label_icon"
android:layout_width="0dp"
android:layout_height="0dp"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/item_user_label"
app:layout_constraintBottom_toBottomOf="@id/item_user_label"
app:layout_constraintDimensionRatio="1.0"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/item_user_label"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:lines="1"
android:drawablePadding="@dimen/item_user_drawable_margin"
android:textSize="@dimen/item_user_textsize_notification"
android:layout_marginStart="@dimen/item_user_drawable_margin"
android:layout_marginBottom="@dimen/item_user_image_margin"
android:layout_marginEnd="@dimen/item_user_drawable_margin"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toEndOf="@id/item_user_label_icon"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/item_user_notification_barrier"
app:layout_constraintEnd_toStartOf="@id/item_user_notification_dismiss" />
@ -36,7 +48,6 @@
android:scaleType="fitCenter"
android:contentDescription="@string/notification_dismiss"
app:layout_constraintDimensionRatio="1"
app:layout_constraintStart_toEndOf="@id/item_user_label"
app:layout_constraintTop_toTopOf="@id/item_user_label"
app:layout_constraintBottom_toBottomOf="@id/item_user_label"
app:layout_constraintEnd_toEndOf="parent"

1
app/src/main/res/values-de/strings.xml
View File

@ -35,6 +35,7 @@
<string name="info_filter_removed">Filter gelöscht</string>
<string name="info_user_reported">Nutzer gemeldet</string>
<string name="info_status_reported">Status gemeldet</string>
<string name="info_report_submit">Meldung wird eingereicht</string>
<string name="info_error">Fehler!</string>
<string name="menu_status_edit">bearbeiten</string>
<string name="menu_status_delete">löschen</string>

1
app/src/main/res/values/strings.xml
View File

@ -82,6 +82,7 @@
<string name="info_status_reported">Post reported</string>
<string name="info_schedule_updated">scheduled post updated</string>
<string name="info_schedule_removed">scheduled post removed</string>
<string name="info_report_submit">submitting report</string>
<string name="info_error">Error</string>
<!-- toast messages for error information -->