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

Merge branch 'r3.5'

Browse source
This commit is contained in:
Chumva 2019-11-18 16:19:46 +02:00
commit 8ac72d7ae5
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java
View file

@ -221,7 +221,7 @@ public class SelectProfileBottomSheetDialogFragment extends MenuBottomSheetDialo
if (activity != null) {
FragmentManager fragmentManager = activity.getSupportFragmentManager();
EditProfileFragment editProfileFragment = (EditProfileFragment) fragmentManager.findFragmentByTag(EditProfileFragment.TAG);
SettingsProfileFragment settingsProfileFragment = (SettingsProfileFragment) fragmentManager.findFragmentByTag(SettingsProfileFragment.TAG);
SettingsProfileFragment settingsProfileFragment = (SettingsProfileFragment) fragmentManager.findFragmentByTag(SettingsProfileFragment.class.getName());
if (editProfileFragment != null) {
switch (type) {

2
OsmAnd/src/net/osmand/plus/profiles/SettingsProfileActivity.java
View file

@ -19,7 +19,7 @@ public class SettingsProfileActivity extends OsmandActionBarActivity {
SettingsProfileFragment profileFragment = new SettingsProfileFragment();
profileFragment.setArguments(getIntent().getExtras());
getSupportFragmentManager().beginTransaction()
.add(android.R.id.content, profileFragment, SettingsProfileFragment.TAG).commit();
.add(android.R.id.content, profileFragment, SettingsProfileFragment.class.getName()).commit();
}
}

2
OsmAnd/src/net/osmand/plus/profiles/SettingsProfileFragment.java
View file

@ -45,8 +45,6 @@ public class SettingsProfileFragment extends BaseOsmAndFragment
private static final Log LOG = PlatformUtil.getLog(SettingsProfileFragment.class);
public static final String TAG = "SettingsProfileFragment";
public static final String PROFILE_STRING_KEY = "string_key";
public static final String IS_NEW_PROFILE = "new_profile";
public static final String IS_USER_PROFILE = "user_profile";