Skip to content

HW-52989. Fixed restoring tree map #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 3, 2019
Merged

HW-52989. Fixed restoring tree map #46

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
477dee9
HW-52989. Fixed restoring tree map
azakrevska-epam Jun 13, 2019
4d2943c
Merge branch 'development' into bugfix/HW-52989-treemap-cast
fmattos-hw Jun 25, 2019
703c1e3
Merge branch 'development' into bugfix/HW-52989-treemap-cast
fmattos-hw Jul 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ui/src/main/java/com/hyperwallet/android/ui/view/WidgetSelectionDialogFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.TreeMap;

public class WidgetSelectionDialogFragment extends DialogFragment implements ToolbarEventListener {
Expand Down Expand Up @@ -105,7 +106,8 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
super.onViewStateRestored(savedInstanceState);
if (savedInstanceState != null) {
mNameValueMap = (TreeMap) savedInstanceState.getSerializable(ARGUMENT_NAME_VALUE_MAP);
mNameValueMap = new TreeMap<>(
(Map<String, String>) savedInstanceState.getSerializable(ARGUMENT_NAME_VALUE_MAP));
mSelectedName = savedInstanceState.getString(ARGUMENT_SELECTED_NAME);
mSelectionLabel = savedInstanceState.getString(ARGUMENT_SELECTION_LABEL);
mFieldName = savedInstanceState.getString(ARGUMENT_SELECTION_FIELD_NAME);
Expand Down Expand Up @@ -154,7 +156,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
@Nullable Bundle savedInstanceState) {

if (savedInstanceState != null) { // framework recreating previously destroyed instance
mNameValueMap = (TreeMap) savedInstanceState.getSerializable(ARGUMENT_NAME_VALUE_MAP);
mNameValueMap = new TreeMap<>(
(Map<String, String>) savedInstanceState.getSerializable(ARGUMENT_NAME_VALUE_MAP));
mSelectedName = savedInstanceState.getString(ARGUMENT_SELECTED_NAME);
mSelectionLabel = savedInstanceState.getString(ARGUMENT_SELECTION_LABEL);
mFieldName = savedInstanceState.getString(ARGUMENT_SELECTION_FIELD_NAME);
Expand Down