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

Fix possible npe in ProfileCard

Browse source
This commit is contained in:
Vitaliy 2020-09-15 18:28:03 +03:00
parent f543d40b1a
commit 6e856f2ee3
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/plus/measurementtool/ProfileCard.java
View file

@ -8,6 +8,8 @@ import android.widget.LinearLayout;
import android.widget.RadioButton; import android.widget.RadioButton;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
@ -23,7 +25,7 @@ public class ProfileCard extends BaseCard {
private ApplicationMode selectedMode; private ApplicationMode selectedMode;
private ProfileCardListener listener; private ProfileCardListener listener;
public ProfileCard(MapActivity mapActivity, ApplicationMode selectedMode) { public ProfileCard(@NonNull MapActivity mapActivity, @NonNull ApplicationMode selectedMode) {
super(mapActivity); super(mapActivity);
this.selectedMode = selectedMode; this.selectedMode = selectedMode;
} }
@ -75,7 +77,10 @@ public class ProfileCard extends BaseCard {
} }
private void resetSelected(List<ApplicationMode> modes) { private void resetSelected(List<ApplicationMode> modes) {
((RadioButton) view.findViewWithTag(selectedMode.getStringKey()).findViewById(R.id.compound_button)).setChecked(true); View profileView = view.findViewWithTag(selectedMode.getStringKey());
if (profileView != null) {
((RadioButton) profileView.findViewById(R.id.compound_button)).setChecked(true);
}
} }
private void addProfileView(LinearLayout container, View.OnClickListener onClickListener, Object tag, private void addProfileView(LinearLayout container, View.OnClickListener onClickListener, Object tag,