Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added boolean parameter

Browse source
This commit is contained in:
PaulStets 2018-05-01 14:45:30 +03:00
parent 825c9bdc21
commit a1eb53465b
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
View file

@ -80,6 +80,8 @@ import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import static net.osmand.plus.download.ui.SearchDialogFragment.SHOW_WIKI_KEY;
public class DownloadActivity extends AbstractDownloadActivity implements DownloadEvents,
OnRequestPermissionsResultCallback {
private static final Log LOG = PlatformUtil.getLog(DownloadActivity.class);
@ -138,11 +140,6 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
accessibilityAssistant = new AccessibilityAssistant(this);
setContentView(R.layout.download);
// Search for the region from Wikivoyage article
String region = getIntent() == null ? "" : getIntent().getStringExtra(REGION_TO_SEARCH);
if (region != null && !region.isEmpty()) {
showDialog(this, SearchDialogFragment.createInstance(region, true));
}
//noinspection ConstantConditions
getSupportActionBar().setTitle(R.string.shared_string_map);
final View downloadProgressLayout = findViewById(R.id.downloadProgressLayout);
@ -200,6 +197,11 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
final Intent intent = getIntent();
if (intent != null && intent.getExtras() != null) {
String region = getIntent().getStringExtra(REGION_TO_SEARCH);
if (region != null && !region.isEmpty()) {
showDialog(this, SearchDialogFragment.createInstance(region,
getIntent().getBooleanExtra(SHOW_WIKI_KEY, false)));
}
filter = intent.getExtras().getString(FILTER_KEY);
filterCat = intent.getExtras().getString(FILTER_CAT);
filterGroup = intent.getExtras().getString(FILTER_GROUP);

2
OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java
View file

@ -65,7 +65,7 @@ public class SearchDialogFragment extends DialogFragment implements DownloadEven
public static final String TAG = "SearchDialogFragment";
private static final String SEARCH_TEXT_DLG_KEY = "search_text_dlg_key";
private static final String SHOW_WIKI_KEY = "show_wiki_key";
public static final String SHOW_WIKI_KEY = "show_wiki_key";
private boolean showWiki;
private ListView listView;
private SearchListAdapter listAdapter;