|
@ -101,9 +101,6 @@ public class FragmentSetup extends Fragment { |
|
|
DB.getInstance(getContext()).account().liveFirstAccount().observe(FragmentSetup.this, new Observer<EntityAccount>() { |
|
|
DB.getInstance(getContext()).account().liveFirstAccount().observe(FragmentSetup.this, new Observer<EntityAccount>() { |
|
|
@Override |
|
|
@Override |
|
|
public void onChanged(@Nullable EntityAccount account) { |
|
|
public void onChanged(@Nullable EntityAccount account) { |
|
|
btnAccount.setEnabled(true); |
|
|
|
|
|
pbAccount.setVisibility(View.GONE); |
|
|
|
|
|
|
|
|
|
|
|
if (!once) { |
|
|
if (!once) { |
|
|
once = true; |
|
|
once = true; |
|
|
|
|
|
|
|
@ -117,6 +114,9 @@ public class FragmentSetup extends Fragment { |
|
|
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); |
|
|
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); |
|
|
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("account"); |
|
|
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("account"); |
|
|
fragmentTransaction.commit(); |
|
|
fragmentTransaction.commit(); |
|
|
|
|
|
|
|
|
|
|
|
btnAccount.setEnabled(true); |
|
|
|
|
|
pbAccount.setVisibility(View.GONE); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
@ -145,9 +145,6 @@ public class FragmentSetup extends Fragment { |
|
|
DB.getInstance(getContext()).identity().liveFirstIdentity().observe(FragmentSetup.this, new Observer<EntityIdentity>() { |
|
|
DB.getInstance(getContext()).identity().liveFirstIdentity().observe(FragmentSetup.this, new Observer<EntityIdentity>() { |
|
|
@Override |
|
|
@Override |
|
|
public void onChanged(@Nullable EntityIdentity identity) { |
|
|
public void onChanged(@Nullable EntityIdentity identity) { |
|
|
btnIdentity.setEnabled(true); |
|
|
|
|
|
pbIdentity.setVisibility(View.GONE); |
|
|
|
|
|
|
|
|
|
|
|
if (!once) { |
|
|
if (!once) { |
|
|
once = true; |
|
|
once = true; |
|
|
Bundle args = new Bundle(); |
|
|
Bundle args = new Bundle(); |
|
@ -161,6 +158,9 @@ public class FragmentSetup extends Fragment { |
|
|
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("identity"); |
|
|
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("identity"); |
|
|
fragmentTransaction.commit(); |
|
|
fragmentTransaction.commit(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
btnIdentity.setEnabled(true); |
|
|
|
|
|
pbIdentity.setVisibility(View.GONE); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|