From 2b2402e5e10f80f01cabf74262b603bde6beb689 Mon Sep 17 00:00:00 2001 From: stom79 Date: Sun, 9 Sep 2018 13:58:29 +0200 Subject: [PATCH] Remove some features --- .../mastodon/activities/AboutActivity.java | 4 +-- .../mastodon/activities/HashTagActivity.java | 5 +--- .../mastodon/activities/ListActivity.java | 3 +-- .../ManageAccountsInListActivity.java | 5 +--- .../activities/OwnerStatusActivity.java | 4 +-- .../activities/PartnerShipActivity.java | 4 +-- .../activities/RemoteFollowActivity.java | 14 ++++------ .../activities/SearchResultActivity.java | 10 ++----- .../activities/ShowAccountActivity.java | 20 +++----------- .../activities/ShowConversationActivity.java | 10 ++----- .../mastodon/activities/TootActivity.java | 16 +++++------ .../drawers/AccountSearchDevAdapter.java | 5 +--- .../drawers/AccountsFollowRequestAdapter.java | 5 +--- .../mastodon/drawers/AccountsListAdapter.java | 5 +--- .../mastodon/drawers/FilterAdapter.java | 5 +--- .../drawers/NotificationsListAdapter.java | 5 +--- .../mastodon/drawers/StatusListAdapter.java | 4 +-- .../fragments/DisplayAccountsFragment.java | 10 ++----- .../fragments/DisplayFiltersFragment.java | 5 +--- .../DisplayFollowRequestSentFragment.java | 5 +--- .../fragments/DisplayListsFragment.java | 5 +--- .../fragments/DisplayMediaFragment.java | 4 +-- .../DisplayNotificationsFragment.java | 4 +-- .../fragments/DisplayStatusFragment.java | 4 +-- .../mastodon/fragments/SettingsFragment.java | 27 +------------------ .../etalab/mastodon/helper/CrossActions.java | 2 +- .../gouv/etalab/mastodon/helper/Helper.java | 2 -- .../res/layout-sw600dp/fragment_settings.xml | 11 -------- app/src/main/res/layout/fragment_settings.xml | 12 --------- app/src/main/res/values/strings.xml | 2 -- 30 files changed, 41 insertions(+), 176 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java index 40ecd6287..1aa00bcfe 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java @@ -226,9 +226,7 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou public void onRetrieveRemoteAccount(Results results) { SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE); if( results == null){ - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(getApplicationContext(), R.string.toast_error,Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), R.string.toast_error,Toast.LENGTH_LONG).show(); return; } List accounts = results.getAccounts(); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/HashTagActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/HashTagActivity.java index ca911031c..0cc52a0c6 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/HashTagActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/HashTagActivity.java @@ -201,10 +201,7 @@ public class HashTagActivity extends BaseActivity implements OnRetrieveFeedsInte mainLoader.setVisibility(View.GONE); nextElementLoader.setVisibility(View.GONE); if( apiResponse.getError() != null){ - final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(getApplicationContext(), apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); return; } List statuses = apiResponse.getStatuses(); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ListActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ListActivity.java index 7e5efdcdf..4864d4221 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ListActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ListActivity.java @@ -266,8 +266,7 @@ public class ListActivity extends BaseActivity implements OnListActionInterface nextElementLoader.setVisibility(View.GONE); //Discards 404 - error which can often happen due to toots which have been deleted if (apiResponse.getError() != null) { - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if (show_error_messages && !apiResponse.getError().getError().startsWith("404 -")) + if ( !apiResponse.getError().getError().startsWith("404 -")) Toast.makeText(ListActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); swipeRefreshLayout.setRefreshing(false); swiped = false; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ManageAccountsInListActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ManageAccountsInListActivity.java index 1eec21356..fe042f2a0 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ManageAccountsInListActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ManageAccountsInListActivity.java @@ -182,10 +182,7 @@ public class ManageAccountsInListActivity extends BaseActivity implements OnList loader.setVisibility(View.GONE); main_account_container.setVisibility(View.VISIBLE); if( apiResponse.getError() != null){ - final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(ManageAccountsInListActivity.this, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(ManageAccountsInListActivity.this, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); return; } if( actionType == ManageListsAsyncTask.action.GET_LIST_ACCOUNT){ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/OwnerStatusActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/OwnerStatusActivity.java index 88f9b5b77..de513a78c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/OwnerStatusActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/OwnerStatusActivity.java @@ -431,9 +431,7 @@ public class OwnerStatusActivity extends BaseActivity implements OnRetrieveFeeds nextElementLoader.setVisibility(View.GONE); //Discards 404 - error which can often happen due to toots which have been deleted if( apiResponse.getError() != null && apiResponse.getError().getStatusCode() != 404 ){ - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages ) - Toast.makeText(OwnerStatusActivity.this, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(OwnerStatusActivity.this, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); swipeRefreshLayout.setRefreshing(false); swiped = false; flag_loading = false; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/PartnerShipActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/PartnerShipActivity.java index 47f9d6582..1dce5a10e 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/PartnerShipActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/PartnerShipActivity.java @@ -121,9 +121,7 @@ public class PartnerShipActivity extends BaseActivity implements OnRetrieveRemot public void onRetrieveRemoteAccount(Results results) { SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE); if( results == null){ - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(getApplicationContext(), R.string.toast_error,Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), R.string.toast_error,Toast.LENGTH_LONG).show(); return; } List accounts = results.getAccounts(); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/RemoteFollowActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/RemoteFollowActivity.java index 553421a2d..eac11dfc8 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/RemoteFollowActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/RemoteFollowActivity.java @@ -273,9 +273,7 @@ public class RemoteFollowActivity extends BaseActivity implements OnRetrieveRemo rf_search.setEnabled(true); SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE); if( results == null){ - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(getApplicationContext(), R.string.toast_error,Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), R.string.toast_error,Toast.LENGTH_LONG).show(); return; } List accounts = results.getAccounts(); @@ -295,9 +293,8 @@ public class RemoteFollowActivity extends BaseActivity implements OnRetrieveRemo public void onRetrieveRelationship(Relationship relationship, Error error) { final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); if( error != null){ - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); + return; } if( relationship == null) @@ -351,9 +348,8 @@ public class RemoteFollowActivity extends BaseActivity implements OnRetrieveRemo public void onPostAction(int statusCode, API.StatusAction statusAction, String userId, Error error) { if( error != null){ final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); + return; } Helper.manageMessageStatusCode(getApplicationContext(), statusCode, statusAction); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/SearchResultActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/SearchResultActivity.java index b023a3310..76bcb6cdc 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/SearchResultActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/SearchResultActivity.java @@ -112,10 +112,7 @@ public class SearchResultActivity extends BaseActivity implements OnRetrieveSear public void onRetrieveSearch(Results results, Error error) { loader.setVisibility(View.GONE); if( error != null){ - final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); return; } if( results == null || (results.getAccounts().size() == 0 && results.getStatuses().size() == 0 && results.getHashtags().size() == 0)){ @@ -139,10 +136,7 @@ public class SearchResultActivity extends BaseActivity implements OnRetrieveSear public void onRetrieveSearchStatus(APIResponse apiResponse, Error error) { loader.setVisibility(View.GONE); if( apiResponse.getError() != null){ - final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); return; } lv_search.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java index b945427d0..79deb6518 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java @@ -468,10 +468,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt @Override public void onPostAction(int statusCode,API.StatusAction statusAction, String targetedId, Error error) { if( error != null){ - final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); return; } Helper.manageMessageStatusCode(getApplicationContext(), statusCode, statusAction); @@ -483,10 +480,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt @Override public void onRetrieveAccount(final Account account, Error error) { if( error != null || account.getAcct() == null){ - final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages && error != null) - Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); return; } this.account = account; @@ -898,10 +892,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt @Override public void onRetrieveFeeds(APIResponse apiResponse) { if( apiResponse.getError() != null){ - final SharedPreferences sharedpreferences = getApplicationContext().getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(getApplicationContext(), apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); return; } @@ -921,10 +912,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt public void onRetrieveRelationship(Relationship relationship, Error error) { if( error != null){ - final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); return; } this.relationship = relationship; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java index 6ad1dfb59..21958c9a8 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java @@ -270,10 +270,7 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve @Override public void onRetrieveFeeds(APIResponse apiResponse) { if( apiResponse.getError() != null){ - final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(getApplicationContext(), apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); return; } List statuses = apiResponse.getStatuses(); @@ -288,10 +285,7 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve swipeRefreshLayout.setRefreshing(false); RelativeLayout loader = findViewById(R.id.loader); if( error != null){ - final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), error.getError(),Toast.LENGTH_LONG).show(); return; } boolean isOnWifi = Helper.isOnWIFI(getApplicationContext()); 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 cad507c63..5581ee0e9 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 @@ -1312,14 +1312,10 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount @Override public void onRetrieveAttachment(final Attachment attachment, Error error) { if( error != null || attachment == null){ - final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) { - if( error != null) - Toast.makeText(getApplicationContext(), error.getError(), Toast.LENGTH_LONG).show(); - else - Toast.makeText(getApplicationContext(), R.string.toast_error, Toast.LENGTH_LONG).show(); - } + if( error != null) + Toast.makeText(getApplicationContext(), error.getError(), Toast.LENGTH_LONG).show(); + else + Toast.makeText(getApplicationContext(), R.string.toast_error, Toast.LENGTH_LONG).show(); if( attachments.size() == 0 ) toot_picture_container.setVisibility(View.GONE); toot_picture.setEnabled(true); @@ -1359,7 +1355,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount imageView.setAdjustViewBounds(true); imageView.setScaleType(ImageView.ScaleType.FIT_XY); final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_media_urls = sharedpreferences.getBoolean(Helper.SET_MEDIA_URLS, true); + boolean show_media_urls = sharedpreferences.getBoolean(Helper.SET_MEDIA_URLS, false); if (show_media_urls) { //Adds the shorter text_url of attachment at the end of the toot
 int selectionBefore = toot_content.getSelectionStart(); @@ -1509,7 +1505,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount if( Integer.valueOf(attachment.getId()) == viewId){ attachments.remove(attachment); final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_media_urls = sharedpreferences.getBoolean(Helper.SET_MEDIA_URLS, true); + boolean show_media_urls = sharedpreferences.getBoolean(Helper.SET_MEDIA_URLS, false); if( show_media_urls) { //Clears the text_url at the end of the toot
 for this attachment int selectionBefore = toot_content.getSelectionStart(); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchDevAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchDevAdapter.java index 456abca58..b3a71a851 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchDevAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchDevAdapter.java @@ -157,10 +157,7 @@ public class AccountSearchDevAdapter extends BaseAdapter implements OnPostAction @Override public void onPostAction(int statusCode, API.StatusAction statusAction, String userId, Error error) { if( error != null){ - final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(context, error.getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(context, error.getError(),Toast.LENGTH_LONG).show(); holder.account_follow.setEnabled(true); return; } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java index 9f87924f6..2de241d9d 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java @@ -136,10 +136,7 @@ public class AccountsFollowRequestAdapter extends RecyclerView.Adapter implement @Override public void onPostAction(int statusCode, API.StatusAction statusAction, String userId, Error error) { if( error != null){ - final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(context, error.getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(context, error.getError(),Toast.LENGTH_LONG).show(); return; } Helper.manageMessageStatusCode(context, statusCode, statusAction); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java index 971de9d7b..480a5b672 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java @@ -210,10 +210,7 @@ public class AccountsListAdapter extends RecyclerView.Adapter implements OnPostA @Override public void onPostAction(int statusCode, API.StatusAction statusAction, String targetedId, Error error) { if( error != null){ - final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(context, error.getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(context, error.getError(),Toast.LENGTH_LONG).show(); return; } Helper.manageMessageStatusCode(context, statusCode, statusAction); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/FilterAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/FilterAdapter.java index 06a40173b..4cc2e5f02 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/FilterAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/FilterAdapter.java @@ -268,10 +268,7 @@ public class FilterAdapter extends BaseAdapter implements OnFilterActionInterfac public void onActionDone(ManageFiltersAsyncTask.action actionType, APIResponse apiResponse, int statusCode) { if( apiResponse != null) { if (apiResponse.getError() != null) { - final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if (show_error_messages) - Toast.makeText(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + Toast.makeText(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); } List filtersRes = apiResponse.getFilters(); if (filtersRes != null && filtersRes.size() > 0) { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java index 14b0a37da..3d3f56396 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java @@ -849,10 +849,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On @Override public void onPostAction(int statusCode, API.StatusAction statusAction, String targetedId, Error error) { if( error != null){ - final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(context, error.getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(context, error.getError(),Toast.LENGTH_LONG).show(); return; } Helper.manageMessageStatusCode(context, statusCode, statusAction); 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 dd2578b02..5511866d5 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 @@ -1944,9 +1944,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); if( error != null){ - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(context, error.getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(context, error.getError(),Toast.LENGTH_LONG).show(); return; } Helper.manageMessageStatusCode(context, statusCode, statusAction); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java index 41a2da86b..50006fc28 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java @@ -195,10 +195,7 @@ public class DisplayAccountsFragment extends Fragment implements OnRetrieveAccou mainLoader.setVisibility(View.GONE); nextElementLoader.setVisibility(View.GONE); if( apiResponse.getError() != null){ - final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); swipeRefreshLayout.setRefreshing(false); swiped = false; flag_loading = false; @@ -229,10 +226,7 @@ public class DisplayAccountsFragment extends Fragment implements OnRetrieveAccou @Override public void onRetrieveRelationship(APIResponse apiResponse) { if( apiResponse.getError() != null){ - final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); return; } SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFiltersFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFiltersFragment.java index fb1a01fbf..99d8e34a8 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFiltersFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFiltersFragment.java @@ -221,10 +221,7 @@ public class DisplayFiltersFragment extends Fragment implements OnFilterActionIn mainLoader.setVisibility(View.GONE); add_new.setEnabled(true); if( apiResponse.getError() != null){ - final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); return; } if( actionType == ManageFiltersAsyncTask.action.GET_ALL_FILTER) { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java index e8719af92..c8558df8c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java @@ -178,10 +178,7 @@ public class DisplayFollowRequestSentFragment extends Fragment implements OnRetr mainLoader.setVisibility(View.GONE); nextElementLoader.setVisibility(View.GONE); if( apiResponse.getError() != null){ - final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); flag_loading = false; swipeRefreshLayout.setRefreshing(false); swiped = false; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayListsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayListsFragment.java index 871a36ca1..1b8929936 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayListsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayListsFragment.java @@ -163,10 +163,7 @@ public class DisplayListsFragment extends Fragment implements OnListActionInterf mainLoader.setVisibility(View.GONE); add_new.setEnabled(true); if( apiResponse.getError() != null){ - final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); return; } if( actionType == ManageListsAsyncTask.action.GET_LIST) { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayMediaFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayMediaFragment.java index 9e0560629..3dd0a741a 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayMediaFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayMediaFragment.java @@ -167,9 +167,7 @@ public class DisplayMediaFragment extends Fragment implements OnRetrieveFeedsInt nextElementLoader.setVisibility(View.GONE); //Discards 404 - error which can often happen due to toots which have been deleted if( apiResponse.getError() != null && apiResponse.getError().getStatusCode() != 404 ){ - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages ) - Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); flag_loading = false; return; } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java index 0df866c4b..8d91fe25c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java @@ -197,9 +197,7 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve nextElementLoader.setVisibility(View.GONE); String lastReadNotifications = sharedpreferences.getString(Helper.LAST_NOTIFICATION_MAX_ID + userId + instance, null); if( apiResponse.getError() != null){ - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages) - Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); flag_loading = false; swipeRefreshLayout.setRefreshing(false); swiped = false; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java index b2e8247ea..c8354f76b 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java @@ -290,9 +290,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn nextElementLoader.setVisibility(View.GONE); //Discards 404 - error which can often happen due to toots which have been deleted if( apiResponse.getError() != null && apiResponse.getError().getStatusCode() != 404 ){ - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - if( show_error_messages ) - Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); + Toast.makeText(context, apiResponse.getError().getError(),Toast.LENGTH_LONG).show(); swipeRefreshLayout.setRefreshing(false); flag_loading = false; return; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java index 359cdf12b..550ee4c23 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java @@ -104,20 +104,7 @@ public class SettingsFragment extends Fragment { - boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); - final CheckBox set_show_error_messages = rootView.findViewById(R.id.set_show_error_messages); - set_show_error_messages.setChecked(show_error_messages); - - set_show_error_messages.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - SharedPreferences.Editor editor = sharedpreferences.edit(); - editor.putBoolean(Helper.SET_SHOW_ERROR_MESSAGES, set_show_error_messages.isChecked()); - editor.apply(); - } - }); - - boolean show_media_urls = sharedpreferences.getBoolean(Helper.SET_MEDIA_URLS, true); + boolean show_media_urls = sharedpreferences.getBoolean(Helper.SET_MEDIA_URLS, false); final CheckBox set_auto_add_media_url = rootView.findViewById(R.id.set_auto_add_media_url); set_auto_add_media_url.setChecked(show_media_urls); @@ -304,18 +291,6 @@ public class SettingsFragment extends Fragment { } }); - boolean multiaccount_actions = sharedpreferences.getBoolean(Helper.SET_ALLOW_CROSS_ACTIONS, true); - final CheckBox set_multiaccount_actions = rootView.findViewById(R.id.set_multiaccount_actions); - set_multiaccount_actions.setChecked(multiaccount_actions); - - set_multiaccount_actions.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - SharedPreferences.Editor editor = sharedpreferences.edit(); - editor.putBoolean(Helper.SET_ALLOW_CROSS_ACTIONS, set_multiaccount_actions.isChecked()); - editor.apply(); - } - }); boolean display_local = sharedpreferences.getBoolean(Helper.SET_DISPLAY_LOCAL, true); final CheckBox set_display_local = rootView.findViewById(R.id.set_display_local); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/CrossActions.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/CrossActions.java index fbd5af829..e35066aca 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/CrossActions.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/CrossActions.java @@ -69,7 +69,7 @@ public class CrossActions { String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null); Account currentAccount = new AccountDAO(context, db).getAccountByID(userId); List accounts = new ArrayList<>(); - if( !limitedToOwner && sharedpreferences.getBoolean(Helper.SET_ALLOW_CROSS_ACTIONS, true) && accountstmp.size() > 1 ){ + if( !limitedToOwner && accountstmp.size() > 1 ){ //It's for a reply if( status != null){ //Status is private or direct diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index c75b2d418..54b528dfa 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -294,7 +294,6 @@ public class Helper { public static final String SET_WIFI_ONLY = "set_wifi_only"; public static final String SET_NOTIF_HOMETIMELINE = "set_notif_hometimeline"; public static final String SET_NOTIF_SILENT = "set_notif_silent"; - public static final String SET_SHOW_ERROR_MESSAGES = "set_show_error_messages"; public static final String SET_EXPAND_CW = "set_expand_cw"; public static final String SET_EMBEDDED_BROWSER = "set_embedded_browser"; public static final String SET_CUSTOM_TABS = "set_custom_tabs"; @@ -304,7 +303,6 @@ public class Helper { public static final String SET_TOOT_VISIBILITY = "set_toot_visibility"; public static final String SET_DISPLAY_LOCAL = "set_display_local"; public static final String SET_DISPLAY_GLOBAL = "set_display_global"; - public static final String SET_ALLOW_CROSS_ACTIONS = "set_allow_cross_actions"; public static final String SET_DISPLAY_BOOST_COUNT = "set_display_boost_count"; public static final String SET_AUTOMATICALLY_SPLIT_TOOTS = "set_automatically_split_toots"; public static final String SET_AUTOMATICALLY_SPLIT_TOOTS_SIZE = "set_automatically_split_toots_size"; diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml index ba90a7eea..6071e350a 100644 --- a/app/src/main/res/layout-sw600dp/fragment_settings.xml +++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml @@ -46,17 +46,6 @@ android:text="@string/set_share_validation_fav" android:layout_height="wrap_content" /> - - - - - - - Choose a header picture Display the number of replies in home timeline Display profile pictures? - Allow interactions between accounts? Fit preview images Automatically split toots over 500 chars in replies You have reached the 160 characters allowed! @@ -385,7 +384,6 @@ News Notify for new toots on the home timeline - Display error messages Follow Unfollows Block