レスポンスモデル更新
This commit is contained in:
parent
b29a98ee3e
commit
96b1a5ea6d
|
@ -2,9 +2,22 @@ package one.nem.kidshift.data.retrofit.model.child.auth;
|
||||||
|
|
||||||
public class ChildAuthResponse {
|
public class ChildAuthResponse {
|
||||||
private String accessToken;
|
private String accessToken;
|
||||||
|
private String childId;
|
||||||
|
|
||||||
public ChildAuthResponse(String accessToken) {
|
public ChildAuthResponse() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public ChildAuthResponse(String accessToken, String childId) {
|
||||||
this.accessToken = accessToken;
|
this.accessToken = accessToken;
|
||||||
|
this.childId = childId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getChildId() {
|
||||||
|
return childId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setChildId(String childId) {
|
||||||
|
this.childId = childId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getAccessToken() {
|
public String getAccessToken() {
|
||||||
|
|
|
@ -11,6 +11,7 @@ import javax.inject.Inject;
|
||||||
import dagger.hilt.android.AndroidEntryPoint;
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
import one.nem.kidshift.data.KSActions;
|
import one.nem.kidshift.data.KSActions;
|
||||||
import one.nem.kidshift.data.RewardData;
|
import one.nem.kidshift.data.RewardData;
|
||||||
|
import one.nem.kidshift.data.UserSettings;
|
||||||
import one.nem.kidshift.utils.FabManager;
|
import one.nem.kidshift.utils.FabManager;
|
||||||
import one.nem.kidshift.utils.KSLogger;
|
import one.nem.kidshift.utils.KSLogger;
|
||||||
import one.nem.kidshift.utils.factory.KSLoggerFactory;
|
import one.nem.kidshift.utils.factory.KSLoggerFactory;
|
||||||
|
@ -19,7 +20,6 @@ import one.nem.kidshift.utils.factory.KSLoggerFactory;
|
||||||
public class WalletContentFragment extends Fragment {
|
public class WalletContentFragment extends Fragment {
|
||||||
|
|
||||||
private static final String ARG_CHILD_ID = "childId";
|
private static final String ARG_CHILD_ID = "childId";
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
KSLoggerFactory loggerFactory;
|
KSLoggerFactory loggerFactory;
|
||||||
@Inject
|
@Inject
|
||||||
|
@ -28,6 +28,9 @@ public class WalletContentFragment extends Fragment {
|
||||||
@Inject
|
@Inject
|
||||||
FabManager fabManager;
|
FabManager fabManager;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
UserSettings userSettings;
|
||||||
|
|
||||||
private KSLogger logger;
|
private KSLogger logger;
|
||||||
private String childId;
|
private String childId;
|
||||||
|
|
||||||
|
@ -45,6 +48,10 @@ public class WalletContentFragment extends Fragment {
|
||||||
return fragment;
|
return fragment;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static WalletContentFragment newInstance() {
|
||||||
|
return new WalletContentFragment();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
@ -53,6 +60,13 @@ public class WalletContentFragment extends Fragment {
|
||||||
}
|
}
|
||||||
logger = loggerFactory.create("WalletMainFragment");
|
logger = loggerFactory.create("WalletMainFragment");
|
||||||
logger.debug("Received parameter: " + childId);
|
logger.debug("Received parameter: " + childId);
|
||||||
|
if (childId == null) {
|
||||||
|
// 単品で呼び出されてる = 子供モードでログインされている
|
||||||
|
childId = userSettings.getAppCommonSetting().getChildId();
|
||||||
|
if (childId == null) {
|
||||||
|
logger.error("Child ID is not set");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue
Block a user