FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add only forward flag when coming from main activity

Browse Source
This commit is contained in:
Shinokuni 2019-05-23 21:53:00 +02:00
parent 52219995bb
commit 14596c75fd
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java
View File

@ -41,10 +41,15 @@ public class AccountTypeListActivity extends AppCompatActivity {
binding.accountTypeRecyclerview.setLayoutManager(new LinearLayoutManager(this)); binding.accountTypeRecyclerview.setLayoutManager(new LinearLayoutManager(this));
binding.accountTypeRecyclerview.addItemDecoration(new DividerItemDecoration(this, LinearLayout.VERTICAL)); binding.accountTypeRecyclerview.addItemDecoration(new DividerItemDecoration(this, LinearLayout.VERTICAL));
boolean fromMainActivity = getIntent().getBooleanExtra("fromMainActivity", false);
adapter = new AccountTypeListAdapter(accountType -> { adapter = new AccountTypeListAdapter(accountType -> {
if (!(accountType.getAccountType() == Account.AccountType.LOCAL)) { if (!(accountType.getAccountType() == Account.AccountType.LOCAL)) {
Intent intent = new Intent(getApplicationContext(), AddAccountActivity.class); Intent intent = new Intent(getApplicationContext(), AddAccountActivity.class);
if (fromMainActivity)
intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
intent.putExtra("accountType", accountType); intent.putExtra("accountType", accountType);
startActivity(intent); startActivity(intent);

1
app/src/main/java/com/readrops/app/activities/MainActivity.java
View File

@ -145,6 +145,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
switch (id) { switch (id) {
case DrawerManager.ADD_ACCOUNT_ID: case DrawerManager.ADD_ACCOUNT_ID:
Intent intent = new Intent(this, AccountTypeListActivity.class); Intent intent = new Intent(this, AccountTypeListActivity.class);
intent.putExtra("fromMainActivity", true);
startActivityForResult(intent, ADD_ACCOUNT_REQUEST); startActivityForResult(intent, ADD_ACCOUNT_REQUEST);
break; break;
case DrawerManager.ACCOUNT_SETTINGS_ID: case DrawerManager.ACCOUNT_SETTINGS_ID: