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

Fix account reply redirection

This commit is contained in:
stom79 2018-12-08 17:03:27 +01:00
parent 5cc25c3c68
commit 6dbfe49a68
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
View File

@ -189,7 +189,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
private AlertDialog dialogTrans; private AlertDialog dialogTrans;
private AlertDialog alertDialogEmoji; private AlertDialog alertDialogEmoji;
private String mentionAccount; private String mentionAccount;
private String idRedirect; private Status idRedirect;
private String userId, instance; private String userId, instance;
private Account account; private Account account;
private ArrayList<String> splitToot; private ArrayList<String> splitToot;
@ -327,7 +327,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
sharedContentIni = b.getString("sharedContent", null); sharedContentIni = b.getString("sharedContent", null);
sharedSubject = b.getString("sharedSubject", null); sharedSubject = b.getString("sharedSubject", null);
mentionAccount = b.getString("mentionAccount", null); mentionAccount = b.getString("mentionAccount", null);
idRedirect = b.getString("idRedirect"); idRedirect = b.getParcelable("idRedirect");
removed = b.getBoolean("removed"); removed = b.getBoolean("removed");
visibility = b.getString("visibility", null); visibility = b.getString("visibility", null);
restoredScheduled = b.getBoolean("restoredScheduled", false); restoredScheduled = b.getBoolean("restoredScheduled", false);
@ -501,7 +501,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
public void onClick(View v) { public void onClick(View v) {
toot_it.setEnabled(false); toot_it.setEnabled(false);
if(toot_content.getText().toString().trim().length() == 0 && attachments.size() == 0){ if(toot_content.getText().toString().trim().length() == 0 && attachments.size() == 0){
Toasty.error(getApplicationContext(),getString(R.string.toot_error_no_content),Toast.LENGTH_LONG).show(); Toasty.error(getApplicationContext(),getString(R.string.toot_select_image_error),Toast.LENGTH_LONG).show();
toot_it.setEnabled(true); toot_it.setEnabled(true);
return; return;
} }
@ -1690,7 +1690,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
if( idRedirect == null) if( idRedirect == null)
b.putParcelable("status", status); b.putParcelable("status", status);
else { else {
b.putString("status", idRedirect); b.putParcelable("status", idRedirect);
} }
intent.putExtras(b); intent.putExtras(b);
startActivity(intent); startActivity(intent);