diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java index 0cfd53c..2efeef7 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java @@ -165,8 +165,9 @@ //Integer uid = acanthus.getPreferenceUid(); String name = ((EditText)view.findViewById(R.id.AnimationName)).getText().toString(); //String token = acanthus.getPreferenceToken(); - Integer aid = editViewModel.startWorkEdit(uid, name, token); - acanthus.setAid(aid); + //Integer aid = editViewModel.startWorkEdit(uid, name, token); + editViewModel.startWorkEdit(uid, name, token); + //editViewModel.getAidJson().observe(); transitionPaintActivity(); }); @@ -192,6 +193,7 @@ Acanthus acanthus = (Acanthus) getActivity().getApplication(); Intent intent = new Intent(acanthus, PaintActivity.class); intent.putExtra("AnimationJsonData", animationJson); + acanthus.setAid(animationJson.getAid()); startActivity(intent); } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditViewModel.java index 16f757e..f46ae6b 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditViewModel.java @@ -36,15 +36,13 @@ } //新規作品作成APIの呼び出し - public Integer startWorkEdit(Integer uid, String animationName, String token) { + public void startWorkEdit(Integer uid, String animationName, String token) { Retrofit retrofit = new Retrofit.Builder() .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") .addConverterFactory(JacksonConverterFactory.create()) .build(); final WorkRest workRest = retrofit.create(WorkRest.class); - final Integer[] aid = new Integer[1]; - //作品の新規作成 Call call = workRest.createWork(uid, animationName, token); call.enqueue(new Callback() { @@ -52,7 +50,6 @@ public void onResponse(Call call, Response response) { if (response.isSuccessful()) { if (response.body() != null) { - aid[0] = response.body().getAid(); aidJsonMutableLiveData.setValue(response.body()); } } @@ -64,7 +61,6 @@ } }); - return aid[0]; } //ユーザーの作成した作品の表示APIの呼び出し