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

Fix #254

This commit is contained in:
tom79 2019-08-01 13:42:12 +02:00
parent dde82c2c57
commit abc048f0c8
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/app/fedilab/android/activities/TootActivity.java
View File

@ -558,7 +558,10 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
String accountReplyToken = b.getString("accountReplyToken", null);
accountReply = null;
if (accountReplyToken != null) {
accountReply = new AccountDAO(getApplicationContext(), db).getAccountByToken(accountReplyToken);
String[] val = accountReplyToken.split("\\|");
if( val.length == 2) {
accountReply = new AccountDAO(getApplicationContext(), db).getUniqAccount(val[0], val[1]);
}
}
tootMention = b.getString("tootMention", null);
urlMention = b.getString("urlMention", null);

8
app/src/main/java/app/fedilab/android/helper/CrossActions.java
View File

@ -644,7 +644,7 @@ public class CrossActions {
b.putParcelable("tootReply", remoteStatuses.get(0));
b.putParcelable("idRedirect", status);
}
b.putString("accountReplyToken", account.getToken());
b.putString("accountReplyToken", account.getId()+"|"+account.getInstance());
intent.putExtras(b); //Put your id to your next Intent
contextReference.get().startActivity(intent);
if (type == RetrieveFeedsAsyncTask.Type.CONTEXT) {
@ -661,7 +661,7 @@ public class CrossActions {
}else{
Intent intent = new Intent(context, TootActivity.class);
Bundle b = new Bundle();
b.putString("accountReplyToken", account.getToken());
b.putString("accountReplyToken", account.getId()+"|"+account.getInstance());
intent.putExtras(b); //Put your id to your next Intent
context.startActivity(intent);
}
@ -717,7 +717,7 @@ public class CrossActions {
b.putParcelable("tootReply", remoteStatuses.get(0));
b.putParcelable("idRedirect", remoteStatuses.get(0));
}
b.putString("accountReplyToken", account.getToken());
b.putString("accountReplyToken", account.getId()+"|"+account.getInstance());
intent.putExtras(b); //Put your id to your next Intent
contextReference.get().startActivity(intent);
}
@ -756,7 +756,7 @@ public class CrossActions {
public void onClick(final DialogInterface dialog, int which) {
final Account account = accountArray[which];
Intent intentToot = new Intent(context, TootActivity.class);
bundle.putString("accountReplyToken", account.getToken());
bundle.putString("accountReplyToken", account.getId()+"|"+account.getInstance());
intentToot.putExtras(bundle);
context.startActivity(intentToot);
((BaseActivity)context).finish();