diff --git a/app/fdroid/release/app-fdroid-release-black_theme_fix_API27+.apk b/app/fdroid/release/app-fdroid-release-black_theme_fix_API27+.apk deleted file mode 100644 index 2cf090202..000000000 Binary files a/app/fdroid/release/app-fdroid-release-black_theme_fix_API27+.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-uploadFix.apk b/app/fdroid/release/app-fdroid-release-uploadFix.apk deleted file mode 100644 index 489415ba3..000000000 Binary files a/app/fdroid/release/app-fdroid-release-uploadFix.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-uploadFix2.apk b/app/fdroid/release/app-fdroid-release-uploadFix2.apk deleted file mode 100644 index eb06d5425..000000000 Binary files a/app/fdroid/release/app-fdroid-release-uploadFix2.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.0.1.apk b/app/old/releases/mastodon-etalab-v1.0.1.apk deleted file mode 100644 index c2669d37b..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.0.1.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.0.2.apk b/app/old/releases/mastodon-etalab-v1.0.2.apk deleted file mode 100644 index 65de92bc9..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.0.2.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.0.3.apk b/app/old/releases/mastodon-etalab-v1.0.3.apk deleted file mode 100644 index db2567033..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.0.3.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.0.4.apk b/app/old/releases/mastodon-etalab-v1.0.4.apk deleted file mode 100644 index d68ec146f..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.0.4.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.0.5.apk b/app/old/releases/mastodon-etalab-v1.0.5.apk deleted file mode 100644 index ff5fbdc10..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.0.5.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.0.apk b/app/old/releases/mastodon-etalab-v1.0.apk deleted file mode 100644 index ed4e555fc..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.0.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.1.0.apk b/app/old/releases/mastodon-etalab-v1.1.0.apk deleted file mode 100644 index 124e0902b..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.1.0.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.1.1.apk b/app/old/releases/mastodon-etalab-v1.1.1.apk deleted file mode 100644 index 4eb4934c8..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.1.1.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.1.2.1.apk b/app/old/releases/mastodon-etalab-v1.1.2.1.apk deleted file mode 100644 index e207d4ac2..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.1.2.1.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.1.2.apk b/app/old/releases/mastodon-etalab-v1.1.2.apk deleted file mode 100644 index 29c36499f..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.1.2.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.1.3.apk b/app/old/releases/mastodon-etalab-v1.1.3.apk deleted file mode 100644 index bbe26f939..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.1.3.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.1.4.apk b/app/old/releases/mastodon-etalab-v1.1.4.apk deleted file mode 100644 index eddfd03c8..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.1.4.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.1.5.apk b/app/old/releases/mastodon-etalab-v1.1.5.apk deleted file mode 100644 index d096bb78d..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.1.5.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.1.6.apk b/app/old/releases/mastodon-etalab-v1.1.6.apk deleted file mode 100644 index d6862bca7..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.1.6.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.1.7.apk b/app/old/releases/mastodon-etalab-v1.1.7.apk deleted file mode 100644 index e04d8bf83..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.1.7.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.1.8.apk b/app/old/releases/mastodon-etalab-v1.1.8.apk deleted file mode 100644 index baa7a2ca0..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.1.8.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.1.9.apk b/app/old/releases/mastodon-etalab-v1.1.9.apk deleted file mode 100644 index b20c2af96..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.1.9.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.2.0.apk b/app/old/releases/mastodon-etalab-v1.2.0.apk deleted file mode 100644 index 901e9b4af..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.2.0.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.2.1.apk b/app/old/releases/mastodon-etalab-v1.2.1.apk deleted file mode 100644 index 4a59cd5c1..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.2.1.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.2.2.apk b/app/old/releases/mastodon-etalab-v1.2.2.apk deleted file mode 100644 index d157666e8..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.2.2.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.2.3.apk b/app/old/releases/mastodon-etalab-v1.2.3.apk deleted file mode 100644 index 0d181544b..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.2.3.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.2.4.apk b/app/old/releases/mastodon-etalab-v1.2.4.apk deleted file mode 100644 index db094c623..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.2.4.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.2.5.apk b/app/old/releases/mastodon-etalab-v1.2.5.apk deleted file mode 100644 index 615598f64..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.2.5.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.2.6.apk b/app/old/releases/mastodon-etalab-v1.2.6.apk deleted file mode 100644 index 38f576a0f..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.2.6.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.2.7.apk b/app/old/releases/mastodon-etalab-v1.2.7.apk deleted file mode 100644 index 72d3d2157..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.2.7.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.2.8.apk b/app/old/releases/mastodon-etalab-v1.2.8.apk deleted file mode 100644 index ab39a8460..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.2.8.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.2.9.apk b/app/old/releases/mastodon-etalab-v1.2.9.apk deleted file mode 100644 index 980342e96..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.2.9.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.3.0.apk b/app/old/releases/mastodon-etalab-v1.3.0.apk deleted file mode 100644 index b0f59bacb..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.3.0.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.3.1.apk b/app/old/releases/mastodon-etalab-v1.3.1.apk deleted file mode 100644 index 68561b616..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.3.1.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.3.2.apk b/app/old/releases/mastodon-etalab-v1.3.2.apk deleted file mode 100644 index d3fd66438..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.3.2.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.3.3.apk b/app/old/releases/mastodon-etalab-v1.3.3.apk deleted file mode 100644 index eb2ecd1d2..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.3.3.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.3.4.apk b/app/old/releases/mastodon-etalab-v1.3.4.apk deleted file mode 100644 index d9acb7620..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.3.4.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.3.5.apk b/app/old/releases/mastodon-etalab-v1.3.5.apk deleted file mode 100644 index 29731a7ab..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.3.5.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.3.6.apk b/app/old/releases/mastodon-etalab-v1.3.6.apk deleted file mode 100644 index 8963fbe4f..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.3.6.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.3.7.apk b/app/old/releases/mastodon-etalab-v1.3.7.apk deleted file mode 100644 index f8c5467de..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.3.7.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.3.8.apk b/app/old/releases/mastodon-etalab-v1.3.8.apk deleted file mode 100644 index 4c1f00c54..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.3.8.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.3.9.1.apk b/app/old/releases/mastodon-etalab-v1.3.9.1.apk deleted file mode 100644 index 0cf9a0322..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.3.9.1.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.3.9.apk b/app/old/releases/mastodon-etalab-v1.3.9.apk deleted file mode 100644 index b69194806..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.3.9.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.4.0.apk b/app/old/releases/mastodon-etalab-v1.4.0.apk deleted file mode 100644 index 38e1b3712..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.4.0.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.4.1.apk b/app/old/releases/mastodon-etalab-v1.4.1.apk deleted file mode 100644 index bcfd8e911..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.4.1.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.4.2.apk b/app/old/releases/mastodon-etalab-v1.4.2.apk deleted file mode 100644 index 7a84f002f..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.4.2.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.4.3.apk b/app/old/releases/mastodon-etalab-v1.4.3.apk deleted file mode 100644 index e92c4db97..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.4.3.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.4.4.apk b/app/old/releases/mastodon-etalab-v1.4.4.apk deleted file mode 100644 index 968d2ccec..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.4.4.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.4.5.apk b/app/old/releases/mastodon-etalab-v1.4.5.apk deleted file mode 100644 index 54ae7d1f0..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.4.5.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.4.6.apk b/app/old/releases/mastodon-etalab-v1.4.6.apk deleted file mode 100644 index 6e5e77309..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.4.6.apk and /dev/null differ diff --git a/app/old/releases/mastodon-etalab-v1.4.7.apk b/app/old/releases/mastodon-etalab-v1.4.7.apk deleted file mode 100644 index 854a973ee..000000000 Binary files a/app/old/releases/mastodon-etalab-v1.4.7.apk and /dev/null differ diff --git a/app/playstore/release/app-playstore-release-freeze-issue.apk b/app/playstore/release/app-playstore-release-freeze-issue.apk deleted file mode 100644 index 9c9140a6b..000000000 Binary files a/app/playstore/release/app-playstore-release-freeze-issue.apk and /dev/null differ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java index 41f804111..0ac76d5cb 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java @@ -1833,14 +1833,22 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount //Sensitive content toot_sensitive.setChecked(status.isSensitive()); if( status.getSpoiler_text() != null && status.getSpoiler_text().length() > 0 ){ - toot_cw_content.setText(status.getSpoiler_text()); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) + toot_cw_content.setText(Html.fromHtml(status.getSpoiler_text(), Html.FROM_HTML_MODE_LEGACY)); + else + //noinspection deprecation + toot_cw_content.setText(Html.fromHtml(status.getSpoiler_text())); toot_cw_content.setVisibility(View.VISIBLE); }else { toot_cw_content.setText(""); toot_cw_content.setVisibility(View.GONE); } String content = status.getContent(); - toot_content.setText(content); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) + toot_content.setText(Html.fromHtml(content, Html.FROM_HTML_MODE_LEGACY)); + else + //noinspection deprecation + toot_content.setText(Html.fromHtml(content)); toot_space_left.setText(String.valueOf(toot_content.length())); toot_content.setSelection(toot_content.getText().length()); switch (status.getVisibility()){ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostActionAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostActionAsyncTask.java index 062388028..bc3dda6e3 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostActionAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/PostActionAsyncTask.java @@ -45,6 +45,8 @@ public class PostActionAsyncTask extends AsyncTask { private WeakReference contextReference; private boolean muteNotifications; + + public PostActionAsyncTask(Context context, API.StatusAction apiAction, String targetedId, OnPostActionInterface onPostActionInterface){ this.contextReference = new WeakReference<>(context); this.listener = onPostActionInterface; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index 776b65997..53d048fff 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -115,6 +115,7 @@ import fr.gouv.etalab.mastodon.interfaces.OnRetrieveRepliesInterface; import fr.gouv.etalab.mastodon.sqlite.AccountDAO; import fr.gouv.etalab.mastodon.sqlite.Sqlite; import fr.gouv.etalab.mastodon.sqlite.StatusCacheDAO; +import fr.gouv.etalab.mastodon.sqlite.StatusStoredDAO; import fr.gouv.etalab.mastodon.sqlite.TempMuteDAO; import static fr.gouv.etalab.mastodon.activities.MainActivity.currentLocale; @@ -144,7 +145,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct private final int COMPACT_STATUS = 3; private int conversationPosition; private List timedMute; - + private boolean redraft; public StatusListAdapter(Context context, List timedMute, RetrieveFeedsAsyncTask.Type type, String targetedId, boolean isOnWifi, int behaviorWithAttachments, int translator, List statuses){ @@ -159,6 +160,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct this.targetedId = targetedId; this.translator = translator; this.timedMute = timedMute; + redraft = false; } public StatusListAdapter(Context context, RetrieveFeedsAsyncTask.Type type, String targetedId, boolean isOnWifi, int behaviorWithAttachments, int translator, List statuses){ @@ -172,6 +174,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct this.type = type; this.targetedId = targetedId; this.translator = translator; + redraft = false; } public StatusListAdapter(Context context, int position, String targetedId, boolean isOnWifi, int behaviorWithAttachments, int translator, List statuses){ @@ -185,6 +188,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct this.conversationPosition = position; this.targetedId = targetedId; this.translator = translator; + redraft = false; } public void updateMuted(List timedMute){ @@ -1259,6 +1263,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct popup.getMenu().findItem(R.id.action_timed_mute).setVisible(false); stringArrayConf = context.getResources().getStringArray(R.array.more_action_owner_confirm); }else { + popup.getMenu().findItem(R.id.action_redraft).setVisible(false); popup.getMenu().findItem(R.id.action_remove).setVisible(false); stringArrayConf = context.getResources().getStringArray(R.array.more_action_confirm); if( type != RetrieveFeedsAsyncTask.Type.HOME){ @@ -1270,6 +1275,17 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct AlertDialog.Builder builderInner; final API.StatusAction doAction; switch (item.getItemId()) { + case R.id.action_redraft: + builderInner = new AlertDialog.Builder(context); + builderInner.setTitle(stringArrayConf[1]); + redraft = true; + doAction = API.StatusAction.UNSTATUS; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) + builderInner.setMessage(Html.fromHtml(status.getContent(), Html.FROM_HTML_MODE_LEGACY)); + else + //noinspection deprecation + builderInner.setMessage(Html.fromHtml(status.getContent())); + break; case R.id.action_remove: builderInner = new AlertDialog.Builder(context); builderInner.setTitle(stringArrayConf[0]); @@ -1523,6 +1539,14 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct if(doAction == API.StatusAction.UNSTATUS ){ String targetedId = status.getId(); new PostActionAsyncTask(context, doAction, targetedId, StatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + if( redraft ){ + long id = new StatusStoredDAO(context, db).insertStatus(status, null); + Intent intentToot = new Intent(context, TootActivity.class); + Bundle b = new Bundle(); + b.putLong("restored", id); + intentToot.putExtras(b); + context.startActivity(intentToot); + } }else if(doAction == API.StatusAction.REPORT ){ String comment = null; if( finalInput.getText() != null) diff --git a/app/src/main/res/menu/option_toot.xml b/app/src/main/res/menu/option_toot.xml index b8aa92206..96e7fb660 100644 --- a/app/src/main/res/menu/option_toot.xml +++ b/app/src/main/res/menu/option_toot.xml @@ -17,6 +17,10 @@ android:id="@+id/action_report" android:title="@string/more_action_3" app:showAsAction="never" /> + Share Mention Timed mute + Delete & re-draft Mute this account? Block this account? @@ -132,6 +133,7 @@ Remove this toot? + Delete & re-draft this toot?