Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Direct & private toots can't be mentionned

This commit is contained in:
tom79 2017-09-17 18:55:02 +02:00
parent e56aaa2a67
commit 8ef7a2cfd1
2 changed files with 62 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
View File

@ -55,6 +55,7 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import fr.gouv.etalab.mastodon.activities.MediaActivity;
@ -832,14 +833,37 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio
final String[] stringArray, stringArrayConf;
final API.StatusAction[] doAction;
if( isOwner) {
stringArray = context.getResources().getStringArray(R.array.more_action_owner);
stringArrayConf = context.getResources().getStringArray(R.array.more_action_owner_confirm);
doAction = new API.StatusAction[]{API.StatusAction.UNSTATUS};
if( status.getVisibility().equals("private") || status.getVisibility().equals("direct")){
String[] stringArraytmp = context.getResources().getStringArray(R.array.more_action_owner);
List<String> list = new ArrayList<>(Arrays.asList(stringArraytmp));
list.remove(3);
stringArray = list.toArray(new String[0]);
String[] stringArrayConftmp = context.getResources().getStringArray(R.array.more_action_owner_confirm);
list = new ArrayList<>(Arrays.asList(stringArrayConftmp));
list.remove(3);
stringArrayConf = list.toArray(new String[0]);
doAction = new API.StatusAction[]{API.StatusAction.UNSTATUS};
}else {
stringArray = context.getResources().getStringArray(R.array.more_action_owner);
stringArrayConf = context.getResources().getStringArray(R.array.more_action_owner_confirm);
doAction = new API.StatusAction[]{API.StatusAction.UNSTATUS};
}
}else {
stringArray = context.getResources().getStringArray(R.array.more_action);
stringArrayConf = context.getResources().getStringArray(R.array.more_action_confirm);
doAction = new API.StatusAction[]{API.StatusAction.MUTE,API.StatusAction.BLOCK,API.StatusAction.REPORT};
if( status.getVisibility().equals("private") || status.getVisibility().equals("direct")){
String[] stringArraytmp = context.getResources().getStringArray(R.array.more_action);
List<String> list = new ArrayList<>(Arrays.asList(stringArraytmp));
list.remove(5);
stringArray = list.toArray(new String[0]);
String[] stringArrayConftmp = context.getResources().getStringArray(R.array.more_action_confirm);
list = new ArrayList<>(Arrays.asList(stringArrayConftmp));
list.remove(5);
stringArrayConf = list.toArray(new String[0]);
doAction = new API.StatusAction[]{API.StatusAction.MUTE, API.StatusAction.BLOCK, API.StatusAction.REPORT};
}else {
stringArray = context.getResources().getStringArray(R.array.more_action);
stringArrayConf = context.getResources().getStringArray(R.array.more_action_confirm);
doAction = new API.StatusAction[]{API.StatusAction.MUTE, API.StatusAction.BLOCK, API.StatusAction.REPORT};
}
}
final ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, stringArray);
builderSingle.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {

37
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -69,6 +69,7 @@ import java.io.FileOutputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@ -1325,14 +1326,38 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
final String[] stringArray, stringArrayConf;
final API.StatusAction[] doAction;
if( isOwner) {
stringArray = context.getResources().getStringArray(R.array.more_action_owner);
stringArrayConf = context.getResources().getStringArray(R.array.more_action_owner_confirm);
doAction = new API.StatusAction[]{API.StatusAction.UNSTATUS};
if( status.getVisibility().equals("private") || status.getVisibility().equals("direct")){
String[] stringArraytmp = context.getResources().getStringArray(R.array.more_action_owner);
List<String> list = new ArrayList<>(Arrays.asList(stringArraytmp));
list.remove(3);
stringArray = list.toArray(new String[0]);
String[] stringArrayConftmp = context.getResources().getStringArray(R.array.more_action_owner_confirm);
list = new ArrayList<>(Arrays.asList(stringArrayConftmp));
list.remove(3);
stringArrayConf = list.toArray(new String[0]);
doAction = new API.StatusAction[]{API.StatusAction.UNSTATUS};
}else {
stringArray = context.getResources().getStringArray(R.array.more_action_owner);
stringArrayConf = context.getResources().getStringArray(R.array.more_action_owner_confirm);
doAction = new API.StatusAction[]{API.StatusAction.UNSTATUS};
}
}else {
stringArray = context.getResources().getStringArray(R.array.more_action);
stringArrayConf = context.getResources().getStringArray(R.array.more_action_confirm);
doAction = new API.StatusAction[]{API.StatusAction.MUTE,API.StatusAction.BLOCK,API.StatusAction.REPORT};
if( status.getVisibility().equals("private") || status.getVisibility().equals("direct")){
String[] stringArraytmp = context.getResources().getStringArray(R.array.more_action);
List<String> list = new ArrayList<>(Arrays.asList(stringArraytmp));
list.remove(5);
stringArray = list.toArray(new String[0]);
String[] stringArrayConftmp = context.getResources().getStringArray(R.array.more_action_confirm);
list = new ArrayList<>(Arrays.asList(stringArrayConftmp));
list.remove(5);
stringArrayConf = list.toArray(new String[0]);
doAction = new API.StatusAction[]{API.StatusAction.MUTE, API.StatusAction.BLOCK, API.StatusAction.REPORT};
}else {
stringArray = context.getResources().getStringArray(R.array.more_action);
stringArrayConf = context.getResources().getStringArray(R.array.more_action_confirm);
doAction = new API.StatusAction[]{API.StatusAction.MUTE, API.StatusAction.BLOCK, API.StatusAction.REPORT};
}
}
final ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, stringArray);
builderSingle.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {