|
41 | 41 | import ml.docilealligator.infinityforreddit.R;
|
42 | 42 | import ml.docilealligator.infinityforreddit.RecyclerViewContentScrollingInterface;
|
43 | 43 | import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
|
| 44 | +import ml.docilealligator.infinityforreddit.SelectThingReturnKey; |
44 | 45 | import ml.docilealligator.infinityforreddit.SortType;
|
45 | 46 | import ml.docilealligator.infinityforreddit.SortTypeSelectionCallback;
|
46 | 47 | import ml.docilealligator.infinityforreddit.account.Account;
|
@@ -116,6 +117,7 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
|
116 | 117 | CustomThemeWrapper mCustomThemeWrapper;
|
117 | 118 | @Inject
|
118 | 119 | Executor mExecutor;
|
| 120 | + private MultiReddit multiReddit; |
119 | 121 | private String multiPath;
|
120 | 122 | private Fragment mFragment;
|
121 | 123 | private int fabOption;
|
@@ -185,7 +187,7 @@ protected void onCreate(Bundle savedInstanceState) {
|
185 | 187 | }
|
186 | 188 | }
|
187 | 189 |
|
188 |
| - MultiReddit multiReddit = getIntent().getParcelableExtra(EXTRA_MULTIREDDIT_DATA); |
| 190 | + multiReddit = getIntent().getParcelableExtra(EXTRA_MULTIREDDIT_DATA); |
189 | 191 | if (multiReddit == null) {
|
190 | 192 | multiPath = getIntent().getStringExtra(EXTRA_MULTIREDDIT_PATH);
|
191 | 193 | if (multiPath != null) {
|
@@ -730,6 +732,16 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
|
730 | 732 | return true;
|
731 | 733 | } else if (itemId == R.id.action_search_view_multi_reddit_detail_activity) {
|
732 | 734 | Intent intent = new Intent(this, SearchActivity.class);
|
| 735 | + if (multiReddit == null) { |
| 736 | + MultiReddit dummyMultiReddit = new MultiReddit(multiPath, |
| 737 | + multiPath.substring(multiPath.lastIndexOf("/", multiPath.length() - 2) + 1), |
| 738 | + multiPath, null, null, null, null, Account.ANONYMOUS_ACCOUNT, |
| 739 | + 0, 0, true, false, false); |
| 740 | + intent.putExtra(SearchActivity.EXTRA_SEARCH_IN_MULTIREDDIT, dummyMultiReddit); |
| 741 | + } else { |
| 742 | + intent.putExtra(SearchActivity.EXTRA_SEARCH_IN_MULTIREDDIT, multiReddit); |
| 743 | + } |
| 744 | + intent.putExtra(SearchActivity.EXTRA_SEARCH_IN_THING_TYPE, SelectThingReturnKey.THING_TYPE.MULTIREDDIT); |
733 | 745 | startActivity(intent);
|
734 | 746 | return true;
|
735 | 747 | } else if (itemId == R.id.action_refresh_view_multi_reddit_detail_activity) {
|
|
0 commit comments