aboutsummaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java9
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentsRecyclerViewAdapter.java18
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java14
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedComment.java131
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedCommentReveddit.java78
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java65
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/post/FetchRemovedPost.java159
-rw-r--r--app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml20
-rw-r--r--app/src/main/res/menu/view_post_detail_fragment.xml11
-rw-r--r--app/src/main/res/values-cs/strings.xml6
-rw-r--r--app/src/main/res/values-de/strings.xml6
-rw-r--r--app/src/main/res/values-el/strings.xml6
-rw-r--r--app/src/main/res/values-es/strings.xml6
-rw-r--r--app/src/main/res/values-fr/strings.xml6
-rw-r--r--app/src/main/res/values-hi/strings.xml6
-rw-r--r--app/src/main/res/values-hr/strings.xml6
-rw-r--r--app/src/main/res/values-hu/strings.xml6
-rw-r--r--app/src/main/res/values-it/strings.xml6
-rw-r--r--app/src/main/res/values-ja/strings.xml6
-rw-r--r--app/src/main/res/values-ko/strings.xml6
-rw-r--r--app/src/main/res/values-nl/strings.xml6
-rw-r--r--app/src/main/res/values-pl/strings.xml6
-rw-r--r--app/src/main/res/values-pt-rBR/strings.xml6
-rw-r--r--app/src/main/res/values-pt/strings.xml6
-rw-r--r--app/src/main/res/values-ro/strings.xml6
-rw-r--r--app/src/main/res/values-ru/strings.xml6
-rw-r--r--app/src/main/res/values-ta/strings.xml6
-rw-r--r--app/src/main/res/values-tr-rTR/strings.xml6
-rw-r--r--app/src/main/res/values-uk/strings.xml6
-rw-r--r--app/src/main/res/values-vi/strings.xml6
-rw-r--r--app/src/main/res/values-zh-rCN/strings.xml6
-rw-r--r--app/src/main/res/values/strings.xml6
32 files changed, 2 insertions, 641 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java
index 1d0919d4..9bf59eac 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java
@@ -428,15 +428,6 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
}
}
- public void showRemovedComment(Comment comment, int position) {
- if (sectionsPagerAdapter != null) {
- ViewPostDetailFragment fragment = sectionsPagerAdapter.getCurrentFragment();
- if (fragment != null) {
- fragment.showRemovedComment(comment, position);
- }
- }
- }
-
public void saveComment(@NonNull Comment comment, int position) {
if (comment.isSaved()) {
comment.setSaved(false);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentsRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentsRecyclerViewAdapter.java
index 4978bdbd..53bb5d57 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentsRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentsRecyclerViewAdapter.java
@@ -1038,24 +1038,6 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
}
}
- public void editComment(Comment fetchedComment, Comment originalComment, int position) {
- if (position >= mVisibleComments.size() || !mVisibleComments.get(position).equals(originalComment)) {
- position = mVisibleComments.indexOf(originalComment);
- if (position < 0) {
- Toast.makeText(mActivity, R.string.show_removed_comment_failed, Toast.LENGTH_SHORT).show();
- return;
- }
- }
- mVisibleComments.get(position).setSubmittedByAuthor(originalComment.isSubmitter());
- mVisibleComments.get(position).setCommentMarkdown(fetchedComment.getCommentMarkdown());
-
- if (mIsSingleCommentThreadMode) {
- notifyItemChanged(position + 1);
- } else {
- notifyItemChanged(position);
- }
- }
-
public void deleteComment(int position) {
if (mVisibleComments != null && position >= 0 && position < mVisibleComments.size()) {
if (mVisibleComments.get(position).hasReply()) {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java
index 59345840..bd8b992f 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java
@@ -171,20 +171,6 @@ public class CommentMoreBottomSheetFragment extends LandscapeExpandedRoundedBott
dismiss();
});
- if ("[deleted]".equals(comment.getAuthor()) ||
- "[deleted]".equals(comment.getCommentRawText()) ||
- "[removed]".equals(comment.getCommentRawText())
- ) {
- binding.seeRemovedViewCommentMoreBottomSheetFragment.setVisibility(View.VISIBLE);
-
- binding.seeRemovedViewCommentMoreBottomSheetFragment.setOnClickListener(view -> {
- dismiss();
- if (activity instanceof ViewPostDetailActivity) {
- ((ViewPostDetailActivity) activity).showRemovedComment(comment, bundle.getInt(EXTRA_POSITION));
- }
- });
- }
-
binding.addToCommentFilterViewCommentMoreBottomSheetFragment.setOnClickListener(view -> {
Intent intent = new Intent(activity, CommentFilterPreferenceActivity.class);
intent.putExtra(CommentFilterPreferenceActivity.EXTRA_COMMENT, comment);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedComment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedComment.java
deleted file mode 100644
index 24ab8d54..00000000
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedComment.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package ml.docilealligator.infinityforreddit.comment;
-
-import android.os.Handler;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.util.concurrent.Executor;
-
-import ml.docilealligator.infinityforreddit.apis.PushshiftAPI;
-import ml.docilealligator.infinityforreddit.utils.JSONUtils;
-import ml.docilealligator.infinityforreddit.utils.Utils;
-import retrofit2.Response;
-import retrofit2.Retrofit;
-
-public class FetchRemovedComment {
-
- public static void fetchRemovedComment(Executor executor, Handler handler, Retrofit retrofit, Comment comment,
- FetchRemovedCommentListener listener) {
- executor.execute(() -> {
- try {
- Response<String> response = retrofit.create(PushshiftAPI.class).getRemovedComment(comment.getId()).execute();
- if (response.isSuccessful()) {
- Comment removedComment = parseComment(response.body(), comment);
- handler.post(() -> {
- if (removedComment != null) {
- listener.fetchSuccess(removedComment, comment);
- } else {
- listener.fetchFailed();
- }
- });
- } else {
- handler.post(listener::fetchFailed);
- }
- } catch (IOException e) {
- e.printStackTrace();
- handler.post(listener::fetchFailed);
- }
- });
- }
-
- // At the moment of writing this code, directly fetching a removed comment from
- // Pushift.io API returns an Internal Server Error, so we temporarily do it this way instead.
- // If this fails to return the removed comment, we try our luck with Reveddit API
- public static void searchRemovedComment(Executor executor, Handler handler, Retrofit retrofit, Comment comment,
- FetchRemovedCommentListener listener) {
- executor.execute(() -> {
- long after = (comment.getCommentTimeMillis() / 1000) - 1; // 1 second before comment creation epoch
- try {
- Response<String> response = retrofit.create(PushshiftAPI.class).searchComments(
- comment.getLinkId(),
- 1000,
- "id",
- "id,author,body,is_submitter",
- after,
- after + 43200, // 12 Hours later
- "*").execute();
- if (response.isSuccessful()) {
- Comment removedComment = parseComment(response.body(), comment);
- handler.post(() -> {
- if (removedComment != null) {
- listener.fetchSuccess(removedComment, comment);
- } else {
- listener.fetchFailed();
- }
- });
- } else {
- handler.post(listener::fetchFailed);
- }
- } catch (IOException e) {
- e.printStackTrace();
- handler.post(listener::fetchFailed);
- }
- });
- }
-
- @Nullable
- private static Comment parseComment(String responseBody, Comment comment) {
- try {
- JSONArray commentJSONArray = new JSONObject(responseBody).getJSONArray(JSONUtils.DATA_KEY);
- JSONObject commentFound = null;
- for (int i = 0; i < commentJSONArray.length(); i++) {
- JSONObject commentJSON = commentJSONArray.getJSONObject(i);
- if (!commentJSON.isNull("id") && commentJSON.getString("id").equals(comment.getId())) {
- commentFound = commentJSON;
- break;
- }
- }
- if (commentFound == null) {
- return null;
- }
-
- return parseRemovedComment(commentFound, comment);
- } catch (JSONException e) {
- e.printStackTrace();
- return null;
- }
- }
-
- @Nullable
- private static Comment parseRemovedComment(@NonNull JSONObject result, Comment comment) throws JSONException {
- String id = result.getString(JSONUtils.ID_KEY);
- String author = result.getString(JSONUtils.AUTHOR_KEY);
- String body = Utils.modifyMarkdown(Utils.trimTrailingWhitespace(result.optString(JSONUtils.BODY_KEY)));
- boolean isSubmitter = result.getBoolean(JSONUtils.IS_SUBMITTER_KEY);
-
- if (id.equals(comment.getId()) &&
- (!author.equals(comment.getAuthor()) ||
- !body.equals(comment.getCommentRawText()))
- ) {
- comment.setAuthor(author);
- comment.setCommentMarkdown(body);
- comment.setCommentRawText(body);
- comment.setSubmittedByAuthor(isSubmitter);
- return comment;
- } else {
- return null;
- }
- }
-
- public interface FetchRemovedCommentListener {
- void fetchSuccess(Comment fetchedComment, Comment originalComment);
-
- void fetchFailed();
- }
-}
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedCommentReveddit.java b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedCommentReveddit.java
deleted file mode 100644
index ec7beea8..00000000
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedCommentReveddit.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package ml.docilealligator.infinityforreddit.comment;
-
-import android.os.Handler;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.util.concurrent.Executor;
-
-import ml.docilealligator.infinityforreddit.apis.RevedditAPI;
-import ml.docilealligator.infinityforreddit.utils.APIUtils;
-import ml.docilealligator.infinityforreddit.utils.JSONUtils;
-import ml.docilealligator.infinityforreddit.utils.Utils;
-import retrofit2.Response;
-import retrofit2.Retrofit;
-
-public class FetchRemovedCommentReveddit {
-
- public static void fetchRemovedComment(Executor executor, Handler handler, Retrofit retrofit, Comment comment,
- long postCreatedUtc, int nComments, FetchRemovedCommentListener listener) {
- executor.execute(() -> {
- String parentIdWithoutPrefix = comment.getParentId().substring(3);
- String rootCommentId = parentIdWithoutPrefix.equals(comment.getLinkId()) ? comment.getId() : parentIdWithoutPrefix;
- try {
- Response<String> response = retrofit.create(RevedditAPI.class).getRemovedComments(
- APIUtils.getRevedditHeader(),
- comment.getLinkId(),
- (comment.getCommentTimeMillis() / 1000) - 1,
- rootCommentId,
- comment.getId(),
- nComments,
- postCreatedUtc / 1000,
- true).execute();
- if (response.isSuccessful()) {
- Comment removedComment = parseRemovedComment(new JSONObject(response.body()).getJSONObject(comment.getId()), comment);
- handler.post(() -> {
- if (removedComment != null) {
- listener.fetchSuccess(removedComment, comment);
- } else {
- listener.fetchFailed();
- }
- });
- } else {
- handler.post(listener::fetchFailed);
- }
- } catch (IOException | JSONException e) {
- e.printStackTrace();
- handler.post(listener::fetchFailed);
- }
- });
- }
-
- private static Comment parseRemovedComment(JSONObject result, Comment comment) throws JSONException {
- String id = result.getString(JSONUtils.ID_KEY);
- String author = result.getString(JSONUtils.AUTHOR_KEY);
- String body = Utils.modifyMarkdown(Utils.trimTrailingWhitespace(result.optString(JSONUtils.BODY_KEY)));
-
- if (id.equals(comment.getId()) && (!author.equals(comment.getAuthor()) || !body.equals(comment.getCommentRawText()))) {
- comment.setAuthor(author);
- comment.setCommentMarkdown(body);
- comment.setCommentRawText(body);
- if (result.has(JSONUtils.IS_SUBMITTER_KEY)) {
- // This doesn't seem to be present for the Reveddit API anymore...
- comment.setSubmittedByAuthor(result.getBoolean(JSONUtils.IS_SUBMITTER_KEY));
- }
- return comment;
- } else {
- return null;
- }
- }
-
- public interface FetchRemovedCommentListener {
- void fetchSuccess(Comment fetchedComment, Comment originalComment);
-
- void fetchFailed();
- }
-}
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java
index 249364f0..4a712ee0 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java
@@ -91,8 +91,6 @@ import ml.docilealligator.infinityforreddit.bottomsheetfragments.FlairBottomShee
import ml.docilealligator.infinityforreddit.bottomsheetfragments.PostCommentSortTypeBottomSheetFragment;
import ml.docilealligator.infinityforreddit.comment.Comment;
import ml.docilealligator.infinityforreddit.comment.FetchComment;
-import ml.docilealligator.infinityforreddit.comment.FetchRemovedComment;
-import ml.docilealligator.infinityforreddit.comment.FetchRemovedCommentReveddit;
import ml.docilealligator.infinityforreddit.comment.ParseComment;
import ml.docilealligator.infinityforreddit.commentfilter.CommentFilter;
import ml.docilealligator.infinityforreddit.commentfilter.FetchCommentFilter;
@@ -107,7 +105,6 @@ import ml.docilealligator.infinityforreddit.events.PostUpdateEventToPostDetailFr
import ml.docilealligator.infinityforreddit.events.PostUpdateEventToPostList;
import ml.docilealligator.infinityforreddit.message.ReadMessage;
import ml.docilealligator.infinityforreddit.post.FetchPost;
-import ml.docilealligator.infinityforreddit.post.FetchRemovedPost;
import ml.docilealligator.infinityforreddit.post.HidePost;
import ml.docilealligator.infinityforreddit.post.ParsePost;
import ml.docilealligator.infinityforreddit.post.Post;
@@ -726,13 +723,6 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
}
mMenu.findItem(R.id.action_view_crosspost_parent_view_post_detail_fragment).setVisible(mPost.getCrosspostParentId() != null);
-
- if ("[deleted]".equals(mPost.getAuthor()) ||
- "[deleted]".equals(mPost.getSelfText()) ||
- "[removed]".equals(mPost.getSelfText())
- ) {
- mMenu.findItem(R.id.action_see_removed_view_post_detail_fragment).setVisible(true);
- }
}
}
@@ -1138,9 +1128,6 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
intent.putExtra(ReportActivity.EXTRA_THING_FULLNAME, mPost.getFullName());
startActivity(intent);
return true;
- } else if (itemId == R.id.action_see_removed_view_post_detail_fragment) {
- showRemovedPost();
- return true;
} else if (itemId == R.id.action_crosspost_view_post_detail_fragment) {
Intent submitCrosspostIntent = new Intent(activity, SubmitCrosspostActivity.class);
submitCrosspostIntent.putExtra(SubmitCrosspostActivity.EXTRA_POST, mPost);
@@ -1821,36 +1808,6 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
.show();
}
- public void showRemovedComment(Comment comment, int position) {
- Toast.makeText(activity, R.string.fetching_removed_comment, Toast.LENGTH_SHORT).show();
- FetchRemovedComment.fetchRemovedComment(
- mExecutor, new Handler(), pushshiftRetrofit, comment,
- new FetchRemovedComment.FetchRemovedCommentListener() {
- @Override
- public void fetchSuccess(Comment fetchedComment, Comment originalComment) {
- mCommentsAdapter.editComment(fetchedComment, originalComment, position);
- }
-
- @Override
- public void fetchFailed() {
- // Reveddit fallback
- FetchRemovedCommentReveddit.fetchRemovedComment(mExecutor, new Handler(), revedditRetrofit,
- comment, mPost.getPostTimeMillis(), mPost.getNComments(),
- new FetchRemovedCommentReveddit.FetchRemovedCommentListener() {
- @Override
- public void fetchSuccess(Comment fetchedComment, Comment originalComment) {
- mCommentsAdapter.editComment(fetchedComment, originalComment, position);
- }
-
- @Override
- public void fetchFailed() {
- Toast.makeText(activity, R.string.show_removed_comment_failed, Toast.LENGTH_SHORT).show();
- }
- });
- }
- });
- }
-
public void changeToNormalThreadMode() {
isSingleCommentThreadMode = false;
mSingleCommentId = null;
@@ -1892,28 +1849,6 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
TransitionManager.beginDelayedTransition((mCommentsRecyclerView == null ? mRecyclerView : mCommentsRecyclerView), new AutoTransition());
}
- public void showRemovedPost() {
- Toast.makeText(activity, R.string.fetching_removed_post, Toast.LENGTH_SHORT).show();
- FetchRemovedPost.fetchRemovedPost(
- pushshiftRetrofit,
- mPost,
- new FetchRemovedPost.FetchRemovedPostListener() {
- @Override
- public void fetchSuccess(Post post) {
- mPost = post;
- tryMarkingPostAsRead();
- if (mPostAdapter != null) {
- mPostAdapter.updatePost(post);
- }
- }
-
- @Override
- public void fetchFailed() {
- Toast.makeText(activity, R.string.show_removed_post_failed, Toast.LENGTH_SHORT).show();
- }
- });
- }
-
public boolean getIsNsfwSubreddit() {
if (activity != null) {
return activity.isNsfwSubreddit();
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/post/FetchRemovedPost.java b/app/src/main/java/ml/docilealligator/infinityforreddit/post/FetchRemovedPost.java
deleted file mode 100644
index 5d815e83..00000000
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/post/FetchRemovedPost.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package ml.docilealligator.infinityforreddit.post;
-
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.text.Html;
-
-import androidx.annotation.NonNull;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-
-import ml.docilealligator.infinityforreddit.apis.PushshiftAPI;
-import ml.docilealligator.infinityforreddit.utils.JSONUtils;
-import ml.docilealligator.infinityforreddit.utils.Utils;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-import retrofit2.Retrofit;
-
-public class FetchRemovedPost {
-
- public static void fetchRemovedPost(Retrofit retrofit, Post post, FetchRemovedPostListener listener) {
- retrofit.create(PushshiftAPI.class).getRemovedPost(post.getId())
- .enqueue(new Callback<String>() {
- @Override
- public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
- if (response.isSuccessful()) {
- new ParsePostAsyncTask(response.body(), post, listener).execute();
- } else {
- listener.fetchFailed();
- }
- }
-
- @Override
- public void onFailure(@NonNull Call<String> call, @NonNull Throwable t) {
- t.printStackTrace();
- listener.fetchFailed();
- }
- });
- }
-
- private static Post parseRemovedPost(JSONObject result, Post post) throws JSONException {
- String id = result.getString(JSONUtils.ID_KEY);
- String author = result.getString(JSONUtils.AUTHOR_KEY);
- String title = result.getString(JSONUtils.TITLE_KEY);
- String body = Utils.modifyMarkdown(Utils.trimTrailingWhitespace(result.getString(JSONUtils.SELFTEXT_KEY)));
-
- if ( id.equals(post.getId()) &&
- (!author.equals(post.getAuthor()) ||
- foundSelfText(post.getSelfText(), body))
- ) {
- post.setAuthor(author);
- post.setTitle(title);
- post.setSelfText(body);
- post.setSelfTextPlain("");
- post.setSelfTextPlainTrimmed("");
-
- String url = result.optString(JSONUtils.URL_KEY);
-
- if (url.endsWith("gif") || url.endsWith("mp4")) {
- post.setVideoUrl(url);
- post.setVideoDownloadUrl(url);
- } else if (post.getPostType() == Post.VIDEO_TYPE || post.getPostType() == Post.GIF_TYPE) {
- JSONObject redditVideoObject = result.getJSONObject("secure_media").getJSONObject(JSONUtils.REDDIT_VIDEO_KEY);
- String videoUrl = Html.fromHtml(redditVideoObject.getString(JSONUtils.HLS_URL_KEY)).toString();
- String videoDownloadUrl = redditVideoObject.getString(JSONUtils.FALLBACK_URL_KEY);
-
- post.setVideoUrl(videoUrl);
- post.setVideoDownloadUrl(videoDownloadUrl);
- } else if (post.getPostType() == Post.LINK_TYPE) {
- post.setUrl(url);
- }
-
- if (post.getPostType() == Post.VIDEO_TYPE) {
- try {
- Uri uri = Uri.parse(url);
- String authority = uri.getAuthority();
- if (authority != null && authority.contains("redgifs.com")) {
- post.setPostType(Post.LINK_TYPE);
- post.setUrl(url);
- }
- } catch (IllegalArgumentException ignore) {
- }
- }
-
- if (!result.isNull("thumbnail")) {
- ArrayList<Post.Preview> previews = post.getPreviews();
- if (previews != null && !previews.isEmpty()) {
- if (previews.size() >= 2) {
- Post.Preview preview = previews.get(1);
- preview.setPreviewUrl(result.getString("thumbnail"));
- previews.set(1, preview);
- } else {
- Post.Preview preview = previews.get(0);
- preview.setPreviewUrl(result.getString("thumbnail"));
- previews.set(0, preview);
- }
- } else {
- Post.Preview preview = new Post.Preview(result.getString("thumbnail"), 1, 1, "", "");
- preview.setPreviewUrl(result.getString("thumbnail"));
- ArrayList<Post.Preview> newPreviews = new ArrayList<>();
- newPreviews.add(preview);
- post.setPreviews(newPreviews);
- }
- }
-
- return post;
- } else {
- return null;
- }
- }
-
- private static boolean foundSelfText(String oldText, String newText) {
- return !(newText.equals("[deleted]") || newText.equals("[removed]")) &&
- !newText.equals(oldText);
- }
-
- public interface FetchRemovedPostListener {
- void fetchSuccess(Post post);
-
- void fetchFailed();
- }
-
- private static class ParsePostAsyncTask extends AsyncTask<Void, Void, Void> {
-
- private final String responseBody;
- private final FetchRemovedPostListener listener;
- Post post;
-
- public ParsePostAsyncTask(String responseBody, Post post, FetchRemovedPostListener listener) {
- this.responseBody = responseBody;
- this.post = post;
- this.listener = listener;
- }
-
- @Override
- protected Void doInBackground(Void... voids) {
- try {
- JSONObject postJson = new JSONObject(responseBody).getJSONArray(JSONUtils.DATA_KEY).getJSONObject(0);
- post = parseRemovedPost(postJson, post);
- } catch (JSONException e) {
- e.printStackTrace();
- post = null;
- }
- return null;
- }
-
- @Override
- protected void onPostExecute(Void aVoid) {
- super.onPostExecute(aVoid);
- if (post != null)
- listener.fetchSuccess(post);
- else
- listener.fetchFailed();
- }
- }
-}
diff --git a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml
index 2aedd340..6d233edc 100644
--- a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml
@@ -144,26 +144,6 @@
app:drawableStartCompat="@drawable/ic_report_24dp" />
<TextView
- android:id="@+id/see_removed_view_comment_more_bottom_sheet_fragment"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="?attr/selectableItemBackground"
- android:clickable="true"
- android:drawablePadding="48dp"
- android:focusable="true"
- android:gravity="center_vertical"
- android:paddingStart="32dp"
- android:paddingTop="16dp"
- android:paddingEnd="32dp"
- android:paddingBottom="16dp"
- android:text="@string/see_removed_comment"
- android:textColor="?attr/primaryTextColor"
- android:textSize="?attr/font_default"
- android:fontFamily="?attr/font_family"
- android:visibility="gone"
- app:drawableStartCompat="@drawable/ic_preview_24dp" />
-
- <TextView
android:id="@+id/add_to_comment_filter_view_comment_more_bottom_sheet_fragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/menu/view_post_detail_fragment.xml b/app/src/main/res/menu/view_post_detail_fragment.xml
index e84ad402..fff9c211 100644
--- a/app/src/main/res/menu/view_post_detail_fragment.xml
+++ b/app/src/main/res/menu/view_post_detail_fragment.xml
@@ -89,21 +89,14 @@
app:showAsAction="never" />
<item
- android:id="@+id/action_see_removed_view_post_detail_fragment"
- android:orderInCategory="14"
- android:title="@string/action_see_removed"
- app:showAsAction="never"
- android:visible="false" />
-
- <item
android:id="@+id/action_crosspost_view_post_detail_fragment"
- android:orderInCategory="15"
+ android:orderInCategory="14"
android:title="@string/action_crosspost"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_post_filter_view_post_detail_fragment"
- android:orderInCategory="16"
+ android:orderInCategory="15"
android:title="@string/action_add_to_post_filter"
app:showAsAction="never" />
</menu>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index ffaa1c1f..a4e58e8b 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -68,7 +68,6 @@
<string name="action_share">"Sdílet"</string>
<string name="action_preview">"Náhled"</string>
<string name="action_report">"Nahlásit"</string>
- <string name="action_see_removed">"Zobrazit odebrané"</string>
<string name="action_set_wallpaper">"Nastavit jako pozadí"</string>
<string name="action_send_private_message">"Poslat soukromou zprávu"</string>
<string name="parse_json_response_error">"Při parsování JSON odpovědi se vyskytla chyba"</string>
@@ -274,11 +273,6 @@
<string name="are_you_sure">"Opravdu?"</string>
<string name="edit">"Upravit"</string>
<string name="delete">"Odstranit"</string>
- <string name="see_removed_comment">"Zobrazit odstraněný komentář"</string>
- <string name="fetching_removed_comment">"Získávání odstraněného komentáře"</string>
- <string name="show_removed_comment_failed">"Nepodařilo se nalézt odstraněný komentář"</string>
- <string name="fetching_removed_post">"Získávání odstraněného příspěvku"</string>
- <string name="show_removed_post_failed">"Nepodařilo se nalézt odstraněný příspěvek"</string>
<string name="cancel">"Zrušit"</string>
<string name="ok">"OK"</string>
<string name="edit_success">"Úspěšně upraveno"</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6892bb5f..1ea7625f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -70,7 +70,6 @@
<string name="action_share">"Teilen"</string>
<string name="action_preview">"Vorschau"</string>
<string name="action_report">"Melden"</string>
- <string name="action_see_removed">"Entfernten Beitrag ansehen"</string>
<string name="action_set_wallpaper">"Als Hintergrundbild einstellen"</string>
<string name="action_send_private_message">"Private Nachricht senden"</string>
<string name="parse_json_response_error">"Ein Fehler trat beim Abruf der JSON-Antwort auf"</string>
@@ -268,11 +267,6 @@ Tippen für Neuversuch."</string>
<string name="are_you_sure">"Bist du sicher?"</string>
<string name="edit">"Bearbeiten"</string>
<string name="delete">"Löschen"</string>
- <string name="see_removed_comment">"Entfernten Kommentar ansehen"</string>
- <string name="fetching_removed_comment">"Rufe entfernten Kommentar ab"</string>
- <string name="show_removed_comment_failed">"Konnte den entfernten Kommentar nicht finden"</string>
- <string name="fetching_removed_post">"Rufe entfernten Beitrag ab"</string>
- <string name="show_removed_post_failed">"Konnte den entfernten Beitrag nicht finden"</string>
<string name="cancel">"Abbrechen"</string>
<string name="ok">"OK"</string>
<string name="edit_success">"Bearbeiten erfolgreich"</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 54aefad0..448886e5 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -58,7 +58,6 @@
<string name="action_share">"Κοινή χρήση"</string>
<string name="action_preview">"Προεπισκόπηση"</string>
<string name="action_report">"Αναφορά"</string>
- <string name="action_see_removed">"Προβολή διαγραμμένου"</string>
<string name="action_set_wallpaper">"Ορισμός ως ταπετσαρία"</string>
<string name="action_send_private_message">"Αποστολή προσωπικού μηνύματος"</string>
<string name="parse_json_response_error">"Σφάλμα κατά την ανάλυση της απόκρισης JSON"</string>
@@ -243,11 +242,6 @@
<string name="are_you_sure">"Είστε σίγουρος/η?"</string>
<string name="edit">"Επεξεργασία"</string>
<string name="delete">"Διαγραφή"</string>
- <string name="see_removed_comment">"Δες το διαγραμμένο σχόλιο"</string>
- <string name="fetching_removed_comment">"Λήψη διαγραμμένου σχολίου"</string>
- <string name="show_removed_comment_failed">"Δεν μπόρεσε να βρεθεί το διαγραμμένο σχόλιο"</string>
- <string name="fetching_removed_post">"Λήψη διαγραμμένης ανάρτησης"</string>
- <string name="show_removed_post_failed">"Δεν μπόρεσε να βρεθεί η διαγραμμένη ανάρτηση"</string>
<string name="cancel">"Άκυρο"</string>
<string name="ok">"ΟΚ"</string>
<string name="edit_success">"Επιτυχής επεξεργασία"</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a6dc7fd4..0ce96613 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -70,7 +70,6 @@
<string name="action_share">"Compartir"</string>
<string name="action_preview">"Previsualizar"</string>
<string name="action_report">"Reportar"</string>
- <string name="action_see_removed">"Ver eliminados"</string>
<string name="action_set_wallpaper">"Definir como fondo de pantalla"</string>
<string name="action_send_private_message">"Enviar mensaje privado"</string>
<string name="parse_json_response_error">"No fue posible procesar la respuesta JSON"</string>
@@ -282,11 +281,6 @@ Toca para reintentar."</string>
<string name="are_you_sure">"¿Estás seguro?"</string>
<string name="edit">"Editar"</string>
<string name="delete">"Borrar"</string>
- <string name="see_removed_comment">"Ver comentario eliminado"</string>
- <string name="fetching_removed_comment">"Obteniendo el comentario"</string>
- <string name="show_removed_comment_failed">"No se encontró el comentario eliminado"</string>
- <string name="fetching_removed_post">"Obteniendo la publicación eliminada"</string>
- <string name="show_removed_post_failed">"No se encontró la publicación eliminada"</string>
<string name="cancel">"Cancelar"</string>
<string name="ok">"OK"</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 01bb0391..3b34a2e1 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -81,7 +81,6 @@
<string name="action_share">"Partager"</string>
<string name="action_preview">"Prévisualiser"</string>
<string name="action_report">"Reporter"</string>
- <string name="action_see_removed">"Afficher les publications supprimées"</string>
<string name="action_set_wallpaper">"Définir comme fond d'écran"</string>
<string name="action_send_private_message">"Envoyer le message privé"</string>
<string name="parse_json_response_error">"Une erreur s'est produite lors de l'analyse de la réponse JSON"</string>
@@ -294,13 +293,8 @@ Appuyez pour réessayer."</string>
<string name="are_you_sure">"Êtes-vous sûr ?"</string>
<string name="edit">"Éditer"</string>
<string name="delete">"Supprimer"</string>
- <string name="see_removed_comment">"Voir le commentaire supprimé"</string>
<!-- Fuzzy -->
- <string name="fetching_removed_comment">"Récupération du commentaire supprimé"</string>
- <string name="show_removed_comment_failed">"Impossible de trouver le commentaire supprimé"</string>
- <string name="fetching_removed_post">"Récupération de la publication supprimée"</string>
- <string name="show_removed_post_failed">"Impossible de trouver la publication supprimée"</string>
<string name="cancel">"Annuler"</string>
<string name="ok">"OK"</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 3a6313a1..55b2e2a2 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -74,7 +74,6 @@
<string name="action_share">"दूसरो को भेजे"</string>
<string name="action_preview">"पूर्वदर्शन"</string>
<string name="action_report">"शिकायत करें"</string>
- <string name="action_see_removed">"हटाए हुए पोस्ट देखें"</string>
<string name="action_set_wallpaper">"वालपेपर लगाएं "</string>
<string name="action_send_private_message">"व्यक्तिगत संदेश भेजें"</string>
<string name="parse_json_response_error">"JSON प्रतिक्रिया को समझने में त्रुटि"</string>
@@ -297,11 +296,6 @@ Behavior -->
<string name="are_you_sure">"क्या आप सुनिश्चित हैं? "</string>
<string name="edit">"संपादन करें "</string>
<string name="delete">"हटाएं "</string>
- <string name="see_removed_comment">"हटाई हुई टिप्पणी देखें "</string>
- <string name="fetching_removed_comment">"हटाई हुई टिप्पणी प्राप्त हो रही है "</string>
- <string name="show_removed_comment_failed">"हटाई हुई टिप्पणी नहीं खोज सका "</string>
- <string name="fetching_removed_post">"हटाई हुई पोस्ट प्राप्त हो रही है "</string>
- <string name="show_removed_post_failed">"हटाई हुई पोस्ट नहीं खोजी जा सकी"</string>
<string name="cancel">"निरस्त करें "</string>
<string name="ok">"ठीक है "</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index acf0c68f..a18123d5 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -72,7 +72,6 @@
<string name="action_share">"Podijeli"</string>
<string name="action_preview">"Pregledaj"</string>
<string name="action_report">"Prijavi"</string>
- <string name="action_see_removed">"Vidi uklonjeno"</string>
<string name="action_set_wallpaper">"Postavi kao pozadinu zaslona"</string>
<string name="action_send_private_message">"Pošalji privatnu poruku"</string>
<string name="parse_json_response_error">"Došlo je do pogreške prilikom raščlanjivanja JSON odgovora"</string>
@@ -272,11 +271,6 @@
<string name="are_you_sure">"Jeste li sigurni?"</string>
<string name="edit">"Uredi"</string>
<string name="delete">"Obriši"</string>
- <string name="see_removed_comment">"Vidi uklonjeni komentar"</string>
- <string name="fetching_removed_comment">"Dohvaćanje uklonjenog komentara"</string>
- <string name="show_removed_comment_failed">"Nismo uspjeli pronaći uklonjeni komentar"</string>
- <string name="fetching_removed_post">"Dohvaćanje uklonjene objave"</string>
- <string name="show_removed_post_failed">"Nismo uspjeli pronaći uklonjenu objavu"</string>
<string name="cancel">"Otkaži"</string>
<string name="ok">"U redu"</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 11b01b33..d15d71d3 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -58,7 +58,6 @@
<string name="action_share">"Megosztás"</string>
<string name="action_preview">"Előnézet"</string>
<string name="action_report">"Bejelentés"</string>
- <string name="action_see_removed">"Eltávolítottak megtekintése"</string>
<string name="action_set_wallpaper">"Beállítás háttérképként"</string>
<string name="action_send_private_message">"Privát üzenet küldése"</string>
<string name="parse_json_response_error">"Hiba történt a JSON válasz feldolgozása során"</string>
@@ -246,11 +245,6 @@
<string name="are_you_sure">"Biztos?"</string>
<string name="edit">"Szerkesztés"</string>
<string name="delete">"Törlés"</string>
- <string name="see_removed_comment">"Az eltávolított hozzászólás megtekintése"</string>
- <string name="fetching_removed_comment">"Az eltávolított hozzászólás lekérése"</string>
- <string name="show_removed_comment_failed">"Nem lehet megtalálni az eltávolított hozzászólást"</string>
- <string name="fetching_removed_post">"Eltávolított bejegyzés lekérése"</string>
- <string name="show_removed_post_failed">"Az eltávolított bejegyzés nem található"</string>
<string name="cancel">"Mégse"</string>
<string name="ok">"OK"</string>
<string name="edit_success">"A szerkesztés sikeres"</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 550f7843..6b502b83 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -58,7 +58,6 @@
<string name="action_share">"Condividi"</string>
<string name="action_preview">"Anteprima"</string>
<string name="action_report">"Segnala"</string>
- <string name="action_see_removed">"Visualizza Rimosso"</string>
<string name="action_set_wallpaper">"Imposta come sfondo del dispositivo"</string>
<string name="action_send_private_message">"Invia Messaggio privato"</string>
<string name="parse_json_response_error">"Si è verificato un errore durante l'analisi della risposta JSON"</string>
@@ -250,11 +249,6 @@ Tocca per riprovare."</string>
<string name="are_you_sure">"Sei sicuro?"</string>
<string name="edit">"Modifica"</string>
<string name="delete">"Elimina"</string>
- <string name="see_removed_comment">"Visualizza commento rimosso"</string>
- <string name="fetching_removed_comment">"Recupero del commento rimosso"</string>
- <string name="show_removed_comment_failed">"Impossibile trovare il commento rimosso"</string>
- <string name="fetching_removed_post">"Recupero post rimosso"</string>
- <string name="show_removed_post_failed">"Impossibile trovare il post rimosso"</string>
<string name="cancel">"Cancella"</string>
<string name="ok">"OK"</string>
<string name="edit_success">"Modifica eseguita correttamente"</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 7f63c702..64106cf2 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -72,7 +72,6 @@
<string name="action_share">"共有"</string>
<string name="action_preview">"プレビュー"</string>
<string name="action_report">"通報"</string>
- <string name="action_see_removed">"削除済みを見る"</string>
<string name="action_set_wallpaper">"壁紙に設定"</string>
<string name="action_send_private_message">"個人メッセージを送信"</string>
<string name="parse_json_response_error">"JSONの解析中にエラーが発生しました"</string>
@@ -298,11 +297,6 @@
<string name="are_you_sure">"よろしいですか?"</string>
<string name="edit">"編集"</string>
<string name="delete">"削除"</string>
- <string name="see_removed_comment">"削除済みのコメントを表示"</string>
- <string name="fetching_removed_comment">"削除済みのコメントを取得中です"</string>
- <string name="show_removed_comment_failed">"削除済みのコメントを取得できませんでした"</string>
- <string name="fetching_removed_post">"削除済みの投稿を取得中です"</string>
- <string name="show_removed_post_failed">"削除済みの投稿を取得できませんでした"</string>
<string name="cancel">"キャンセル"</string>
<string name="ok">"OK"</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 784f132c..2743e087 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -68,7 +68,6 @@
<string name="action_share">"공유"</string>
<string name="action_preview">"미리 보기"</string>
<string name="action_report">"신고"</string>
- <string name="action_see_removed">"삭제된 항목 보기"</string>
<string name="action_set_wallpaper">"배경화면으로 설정"</string>
<string name="action_send_private_message">"개인 메시지 보내기"</string>
<string name="parse_json_response_error">"JSON 답변을 파싱하는데 오류가 발생했습니다"</string>
@@ -274,11 +273,6 @@
<string name="are_you_sure">"정말로 실행할까요?"</string>
<string name="edit">"편집"</string>
<string name="delete">"삭제"</string>
- <string name="see_removed_comment">"삭제된 댓글 보기"</string>
- <string name="fetching_removed_comment">"삭제된 댓글 가져오는 중"</string>
- <string name="show_removed_comment_failed">"삭제된 댓글을 찾을 수 없습니다"</string>
- <string name="fetching_removed_post">"삭제된 글 가져오는 중"</string>
- <string name="show_removed_post_failed">"삭제된 글을 찾을 수 없습니다"</string>
<string name="cancel">"취소"</string>
<string name="ok">"확인"</string>
<string name="edit_success">"성공적으로 편집"</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e855da6a..a8de9df4 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -68,7 +68,6 @@
<string name="action_share">"Delen"</string>
<string name="action_preview">"Voorvertoning"</string>
<string name="action_report">"Melden"</string>
- <string name="action_see_removed">"Zie verwijderd"</string>
<string name="action_set_wallpaper">"Instellen als startschermachtergrond"</string>
<string name="action_send_private_message">"Privebericht versturen"</string>
<string name="parse_json_response_error">"Er is een fout opgetreden bij het verwerken van het json-antwoord"</string>
@@ -271,11 +270,6 @@ Druk om opnieuw te proberen."</string>
<string name="are_you_sure">"Weet je het zeker?"</string>
<string name="edit">"Bewerken"</string>
<string name="delete">"Verwijderen"</string>
- <string name="see_removed_comment">"Verwijderde reactie bekijken"</string>
- <string name="fetching_removed_comment">"Bezig met ophalen van verwijderde reactie…"</string>
- <string name="show_removed_comment_failed">"De verwijderde reactie ontbreekt"</string>
- <string name="fetching_removed_post">"Bezig met ophalen van verwijderd bericht…"</string>
- <string name="show_removed_post_failed">"Het verwijderde bericht ontbreekt"</string>
<string name="cancel">"Annuleren"</string>
<string name="ok">"Oké"</string>
<string name="edit_success">"Het bericht is bewerkt"</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index b8d074aa..1780f959 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -68,7 +68,6 @@
<string name="action_share">"Udostępnij"</string>
<string name="action_preview">"Podgląd"</string>
<string name="action_report">"Zgłoś"</string>
- <string name="action_see_removed">"Zobacz usunięte"</string>
<string name="action_set_wallpaper">"Ustaw jako tapetę"</string>
<string name="action_send_private_message">"Wyślij wiadomość prywatną"</string>
<string name="parse_json_response_error">"Wystąpił błąd podczas analizy odpowiedzi JSON"</string>
@@ -263,11 +262,6 @@ Naciśnij, aby spróbować ponownie."</string>
<string name="are_you_sure">"Jesteś pewien?"</string>
<string name="edit">"Edytuj"</string>
<string name="delete">"Usuń"</string>
- <string name="see_removed_comment">"Zobacz usunięty komentarz"</string>
- <string name="fetching_removed_comment">"Pobieranie usuniętego komentarza"</string>
- <string name="show_removed_comment_failed">"Nie można znaleźć usuniętego komentarza"</string>
- <string name="fetching_removed_post">"Pobieranie usuniętego posta"</string>
- <string name="show_removed_post_failed">"Nie można znaleźć usuniętego posta"</string>
<string name="cancel">"Anuluj"</string>
<string name="ok">"OK"</string>
<string name="edit_success">"Zedytowano pomyślnie"</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f96cb25b..a0278fe9 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -70,7 +70,6 @@
<string name="action_share">"Compartilhar"</string>
<string name="action_preview">"Prévia"</string>
<string name="action_report">"Reportar"</string>
- <string name="action_see_removed">"Ver excluído"</string>
<string name="action_set_wallpaper">"Definir como papel de parede"</string>
<string name="action_send_private_message">"Enviar mensagem privada"</string>
<string name="parse_json_response_error">"Erro ao analisar a resposta do JSON"</string>
@@ -266,11 +265,6 @@ Toque para tentar de novo."</string>
<string name="are_you_sure">"Tem certeza?"</string>
<string name="edit">"Editar"</string>
<string name="delete">"Excluir"</string>
- <string name="see_removed_comment">"Ver comentário excluído"</string>
- <string name="fetching_removed_comment">"Buscando comentário excluído"</string>
- <string name="show_removed_comment_failed">"Não pôde achar o comentário excluído"</string>
- <string name="fetching_removed_post">"Buscando postagem excluída"</string>
- <string name="show_removed_post_failed">"Não pôde achar a postagem excluída"</string>
<string name="cancel">"Cancelar"</string>
<string name="ok">"Ok"</string>
<string name="edit_success">"Êxito ao editar"</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 52ca9422..21eb51aa 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -68,7 +68,6 @@
<string name="action_share">"Partilhar"</string>
<string name="action_preview">"Pré-visualizar"</string>
<string name="action_report">"Denunciar"</string>
- <string name="action_see_removed">"Ver Removido"</string>
<string name="action_set_wallpaper">"Definir como Imagem de Fundo"</string>
<string name="action_send_private_message">"Enviar Mensagem Privada"</string>
<string name="parse_json_response_error">"Ocorreu um erro ao analisar a resposta do JSON"</string>
@@ -278,11 +277,6 @@ Toque para tentar novamente."</string>
<string name="are_you_sure">"Tem a certeza?"</string>
<string name="edit">"Editar"</string>
<string name="delete">"Eliminar"</string>
- <string name="see_removed_comment">"Ver Comentário Removido"</string>
- <string name="fetching_removed_comment">"A obter comentário removido"</string>
- <string name="show_removed_comment_failed">"Comentário removido não encontrado"</string>
- <string name="fetching_removed_post">"A obter publicação removido"</string>
- <string name="show_removed_post_failed">"Publicação removida não encontrada"</string>
<string name="cancel">"Cancelar"</string>
<string name="ok">"OK"</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index baf6b796..56d77f34 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -68,7 +68,6 @@
<string name="action_share">"Distribuire"</string>
<string name="action_preview">"Previzualizare"</string>
<string name="action_report">"Raportați"</string>
- <string name="action_see_removed">"Vedeți eliminate"</string>
<string name="action_set_wallpaper">"Setați ca fundal"</string>
<string name="action_send_private_message">"Trimiteți mesaj privat"</string>
<string name="parse_json_response_error">"Eroare la afișarea răspunsului JSON"</string>
@@ -268,11 +267,6 @@ Apăsați pentru reîncărcare."</string>
<string name="are_you_sure">"Sunteți sigur?"</string>
<string name="edit">"Editare"</string>
<string name="delete">"Ștergere"</string>
- <string name="see_removed_comment">"Vedeți comentariul șters"</string>
- <string name="fetching_removed_comment">"Se caută comentariul șters"</string>
- <string name="show_removed_comment_failed">"Nu s-a găsit comentariul șters"</string>
- <string name="fetching_removed_post">"Se caută postarea ștearsă"</string>
- <string name="show_removed_post_failed">"Nu s-a găsit postarea ștearsă"</string>
<string name="cancel">"Anulare"</string>
<string name="ok">"OK"</string>
<string name="edit_success">"Editare reușită"</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5b90a82b..7b2f5d77 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -72,7 +72,6 @@
<string name="action_share">"Поделиться"</string>
<string name="action_preview">"Предпросмотр"</string>
<string name="action_report">"Пожаловаться"</string>
- <string name="action_see_removed">"Просмотр удалённого"</string>
<string name="action_set_wallpaper">"Установить как обои"</string>
<string name="action_send_private_message">"Отправить личное сообщение"</string>
<string name="parse_json_response_error">"Произошла ошибка при анализе JSON-ответа"</string>
@@ -279,11 +278,6 @@
<string name="are_you_sure">"Вы уверены?"</string>
<string name="edit">"Изменить"</string>
<string name="delete">"Удалить"</string>
- <string name="see_removed_comment">"Посмотреть удалённый комментарий"</string>
- <string name="fetching_removed_comment">"Получение удалённого комментария"</string>
- <string name="show_removed_comment_failed">"Невозможно найти удалённый комментарий"</string>
- <string name="fetching_removed_post">"Получение удалённого сообщения"</string>
- <string name="show_removed_post_failed">"Невозможно найти удалённую запись"</string>
<string name="cancel">"Отменить"</string>
<string name="ok">"ОК"</string>
<string name="edit_success">"Редактирование успешно"</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 16dee245..1c2ff6ab 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -64,7 +64,6 @@
<string name="action_share">"பகிர்"</string>
<string name="action_preview">"முன்னோட்டம்"</string>
<string name="action_report">"புகாரளி"</string>
- <string name="action_see_removed">"நீக்கியவற்றைப் பார்"</string>
<string name="action_set_wallpaper">"சுவரொட்டியாக அமை"</string>
<string name="action_send_private_message">"தனித் தகவல் அனுப்பு"</string>
<string name="parse_json_response_error">"JSON பதிலைக் கூறாக்கும்போது பிழை ஏற்பட்டது"</string>
@@ -259,11 +258,6 @@
<string name="are_you_sure">"நீங்கள் உறுதியா?"</string>
<string name="edit">"திருத்து"</string>
<string name="delete">"அழி"</string>
- <string name="see_removed_comment">"நீக்கப்பட்ட கருத்தைப் பார்"</string>
- <string name="fetching_removed_comment">"நீக்கப்பட்ட கருத்தைப் பெறுகிறது"</string>
- <string name="show_removed_comment_failed">"நீக்கப்பட்ட கருத்தைக் கண்டறிய முடியவில்லை"</string>
- <string name="fetching_removed_post">"நீக்கப்பட்ட இடுகையைப் பெறுகிறது"</string>
- <string name="show_removed_post_failed">"நீக்கப்பட்ட இடுகையைப் பெற முடியவில்லை"</string>
<string name="cancel">"ரத்துசெய்"</string>
<string name="ok">"சரி"</string>
<string name="edit_success">"திருத்தம் வெற்றி"</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 088f20ab..798f5071 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -68,7 +68,6 @@
<string name="action_share">"Paylaş"</string>
<string name="action_preview">"Önizleme"</string>
<string name="action_report">"Bildir"</string>
- <string name="action_see_removed">"Kaldırılanları Göster"</string>
<string name="action_set_wallpaper">"Duvar Kağıdı Yap"</string>
<string name="action_send_private_message">"Özel Mesaj Gönder"</string>
<string name="parse_json_response_error">"JSON yanıtı ayrıştırılırken hata oluştu"</string>
@@ -269,11 +268,6 @@ Tekrar denemek için tıklayın."</string>
<string name="are_you_sure">"Emin misiniz?"</string>
<string name="edit">"Düzenle"</string>
<string name="delete">"Sil"</string>
- <string name="see_removed_comment">"Kaldırılan Yorumu Gör"</string>
- <string name="fetching_removed_comment">"Kaldırılan yorum getiriliyor"</string>
- <string name="show_removed_comment_failed">"Kaldırılan yorum bulunamadı"</string>
- <string name="fetching_removed_post">"Kaldırılan gönderi getiriliyor"</string>
- <string name="show_removed_post_failed">"Kaldırılan gönderi bulunamadı"</string>
<string name="cancel">"İptal"</string>
<string name="ok">"Tamam"</string>
<string name="edit_success">"Başarıyla düzenlendi"</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 9b8ee409..8b5773a6 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -68,7 +68,6 @@
<string name="action_share">"Поширити"</string>
<string name="action_preview">"Перегляд"</string>
<string name="action_report">"Повідомити"</string>
- <string name="action_see_removed">"Переглянути вилучені"</string>
<string name="action_set_wallpaper">"Зробити шпалерами"</string>
<string name="action_send_private_message">"Надіслати приватне повідомлення"</string>
<string name="parse_json_response_error">"Помилка відбулася під час аналізу відповіді JSON"</string>
@@ -270,11 +269,6 @@
<string name="are_you_sure">"Ви впевнені?"</string>
<string name="edit">"Змінити"</string>
<string name="delete">"Видалити"</string>
- <string name="see_removed_comment">"Показати вилучений коментар"</string>
- <string name="fetching_removed_comment">"Отримати вилучений коментар"</string>
- <string name="show_removed_comment_failed">"Не вдалося знайти вилучений коментар"</string>
- <string name="fetching_removed_post">"Отримати вилучений допис"</string>
- <string name="show_removed_post_failed">"Не вдалося знайти вилучений допис"</string>
<string name="cancel">"Скасувати"</string>
<string name="ok">"Гаразд"</string>
<string name="edit_success">"Успішно змінено"</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 3236a559..8b8bd8d4 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -68,7 +68,6 @@
<string name="action_share">"Chia sẻ"</string>
<string name="action_preview">"Xem trước"</string>
<string name="action_report">"Báo cáo"</string>
- <string name="action_see_removed">"Xem bài đăng đã bị xóa"</string>
<string name="action_set_wallpaper">"Đặt làm hình nền"</string>
<string name="action_send_private_message">"Gửi tin nhắn riêng tư"</string>
<string name="parse_json_response_error">"Lỗi khi phân tích phản hồi JSON"</string>
@@ -271,11 +270,6 @@ Nhấn để thử lại."</string>
<string name="are_you_sure">"Bạn có chắc không?"</string>
<string name="edit">"Sửa"</string>
<string name="delete">"Xóa"</string>
- <string name="see_removed_comment">"Xem bình luận bị xóa"</string>
- <string name="fetching_removed_comment">"Đang tìm bình luận bị xóa"</string>
- <string name="show_removed_comment_failed">"Không thể tìm được bình luận bị xóa"</string>
- <string name="fetching_removed_post">"Đang tìm bài đăng bị xóa"</string>
- <string name="show_removed_post_failed">"Không thể tìm được bài đăng bị xóa"</string>
<string name="cancel">"Hủy"</string>
<string name="ok">"OK"</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a1243303..b433a0a0 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -64,7 +64,6 @@
<string name="action_share">"分享"</string>
<string name="action_preview">"预览"</string>
<string name="action_report">"举报"</string>
- <string name="action_see_removed">"查看已删除"</string>
<string name="action_set_wallpaper">"设为壁纸"</string>
<string name="action_send_private_message">"发送私信"</string>
<string name="parse_json_response_error">"解析 JSON 响应错误"</string>
@@ -272,11 +271,6 @@
<string name="are_you_sure">"确定吗?"</string>
<string name="edit">"编辑"</string>
<string name="delete">"删除"</string>
- <string name="see_removed_comment">"查看已删除的评论"</string>
- <string name="fetching_removed_comment">"正在获取已删除的评论"</string>
- <string name="show_removed_comment_failed">"无法找到已删除的评论"</string>
- <string name="fetching_removed_post">"正在获取已删除的帖子"</string>
- <string name="show_removed_post_failed">"无法找到已删除的帖子"</string>
<string name="cancel">"取消"</string>
<string name="ok">"确定"</string>
<string name="edit_success">"编辑成功"</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 542929a3..aa5a36b4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -78,7 +78,6 @@
<string name="action_share">Share</string>
<string name="action_preview">Preview</string>
<string name="action_report">Report</string>
- <string name="action_see_removed">See Removed</string>
<string name="action_crosspost">Crosspost</string>
<string name="action_set_wallpaper">Set as Wallpaper</string>
<string name="action_send_private_message">Send Private Message</string>
@@ -332,11 +331,6 @@
<string name="are_you_sure">Are you sure?</string>
<string name="edit">Edit</string>
<string name="delete">Delete</string>
- <string name="see_removed_comment">See Removed Comment</string>
- <string name="fetching_removed_comment">Fetching removed comment</string>
- <string name="show_removed_comment_failed">Could not find the removed comment</string>
- <string name="fetching_removed_post">Fetching removed post</string>
- <string name="show_removed_post_failed">Could not find the removed post</string>
<string name="cancel">Cancel</string>
<string name="ok">OK</string>
<string name="edit_success">Edit successfully</string>