diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java index 3e0df6016..c7f496bfd 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java @@ -1029,7 +1029,9 @@ public class API { action = String.format("/accounts/%s/block", targetedId); break; case BLOCK_DOMAIN: - action = String.format("/domain_blocks/%s", targetedId); + action = "/domain_blocks"; + params = new HashMap<>(); + params.put("domain", targetedId); break; case UNBLOCK: action = String.format("/accounts/%s/unblock", targetedId); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DomainsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DomainsListAdapter.java index 94b3d3874..f25e893e8 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DomainsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DomainsListAdapter.java @@ -16,6 +16,7 @@ package fr.gouv.etalab.mastodon.drawers; import android.content.Context; import android.content.DialogInterface; +import android.content.SharedPreferences; import android.os.AsyncTask; import android.support.annotation.NonNull; import android.support.v7.app.AlertDialog; @@ -26,13 +27,18 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; +import android.widget.Toast; + import java.util.List; import fr.gouv.etalab.mastodon.R; import fr.gouv.etalab.mastodon.asynctasks.DeleteDomainsAsyncTask; import fr.gouv.etalab.mastodon.client.APIResponse; +import fr.gouv.etalab.mastodon.helper.Helper; import fr.gouv.etalab.mastodon.interfaces.OnRetrieveDomainsInterface; +import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor; + /** * Created by Thomas on 26/09/2018. @@ -65,7 +71,13 @@ public class DomainsListAdapter extends RecyclerView.Adapter implements OnRetrie public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) { final DomainsListAdapter.ViewHolder holder = (DomainsListAdapter.ViewHolder) viewHolder; final String domain = domains.get(position); - + final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE); + int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); + if( theme == Helper.THEME_DARK){ + changeDrawableColor(context, holder.domain_delete, R.color.dark_text); + }else{ + changeDrawableColor(context, holder.domain_delete, R.color.black); + } holder.domain_name.setText(domain); holder.domain_delete.setOnClickListener(new View.OnClickListener() { @Override @@ -117,7 +129,13 @@ public class DomainsListAdapter extends RecyclerView.Adapter implements OnRetrie @Override public void onRetrieveDomainsDeleted(int response) { - + String message; + if( response == 200){ + message = context.getString(R.string.toast_unblock_domain); + }else{ + message = context.getString(R.string.toast_error); + } + Toast.makeText(context, message, Toast.LENGTH_LONG).show(); } private class ViewHolder extends RecyclerView.ViewHolder{ 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 c1718e1a3..df89876ed 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 @@ -43,6 +43,7 @@ import android.text.Spannable; import android.text.Spanned; import android.text.method.LinkMovementMethod; import android.text.style.ForegroundColorSpan; +import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.MenuItem; @@ -1193,7 +1194,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct popup.getMenu().findItem(R.id.action_redraft).setVisible(false); popup.getMenu().findItem(R.id.action_remove).setVisible(false); //Same instance - if(status.getAccount().getAcct().split("#").length <2 ) + if(status.getAccount().getAcct().split("@").length <2 ) popup.getMenu().findItem(R.id.action_block_domain).setVisible(false); stringArrayConf = context.getResources().getStringArray(R.array.more_action_confirm); if( type != RetrieveFeedsAsyncTask.Type.HOME){ 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 ed54b0f67..fed0e8821 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 @@ -727,6 +727,8 @@ public class Helper { message = context.getString(R.string.toast_show_boost); }else if(statusAction == API.StatusAction.HIDE_BOOST){ message = context.getString(R.string.toast_hide_boost); + }else if(statusAction == API.StatusAction.BLOCK_DOMAIN){ + message = context.getString(R.string.toast_block_domain); } }else { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 14b2be523..a2668ecfb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -629,6 +629,8 @@ Are you sure to block %s? Blocked domains Block domain + The domain is blocked + The domain is no longer blocked! Never