From cd342d103490139a25b3a9fb3d296e2f5568aad9 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 28 Dec 2022 14:56:49 -0300
Subject: [PATCH] I am trying my best

---
 .../api/requests/accounts/SetPrivateNote.java |  7 ++--
 .../android/fragments/ProfileFragment.java    | 38 +++++++++----------
 .../android/model/PrivateNote.java            |  6 ---
 3 files changed, 21 insertions(+), 30 deletions(-)
 delete mode 100644 mastodon/src/main/java/org/joinmastodon/android/model/PrivateNote.java

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
index ab8b3c52b..e9c9fe764 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
@@ -1,18 +1,17 @@
 package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.PrivateNote;
+import org.joinmastodon.android.model.Relationship;
 
-public class SetPrivateNote extends MastodonAPIRequest<PrivateNote>{
+public class SetPrivateNote extends MastodonAPIRequest<Relationship>{
     public SetPrivateNote(String id, String comment){
-        super(MastodonAPIRequest.HttpMethod.POST, "/accounts/"+id+"/note", PrivateNote.class);
+        super(MastodonAPIRequest.HttpMethod.POST, "/accounts/"+id+"/note", Relationship.class);
         Request req = new Request(comment);
         setRequestBody(req);
     }
 
     private static class Request{
         public String comment;
-
         public Request(String comment){
             this.comment=comment;
         }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index cbe31f242..e2ce35e5d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -54,7 +54,6 @@ import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
 import org.joinmastodon.android.model.Attachment;
-import org.joinmastodon.android.model.PrivateNote;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.SingleImagePhotoViewerListener;
@@ -177,25 +176,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		username=content.findViewById(R.id.username);
 		bio=content.findViewById(R.id.bio);
 		noteEdit=content.findViewById(R.id.note_edit);
-		noteEdit.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-			@Override
-			public void onFocusChange(View v, boolean hasFocus) {
-				if(!hasFocus){
-					Toast.makeText(getActivity(), "Its going here", Toast.LENGTH_LONG).show();
-					currentRequest = new SetPrivateNote(account.id, noteEdit.getText().toString()).setCallback(new Callback<>() {
-						@Override
-						public void onSuccess(PrivateNote result) {
-							Toast.makeText(getActivity(), "Success", Toast.LENGTH_LONG).show();
-						}
-
-						@Override
-						public void onError(ErrorResponse error) {
-							Toast.makeText(getActivity(), "Error, not success", Toast.LENGTH_LONG).show();
-						}
-					});
-				}
-			}
-		});
 //		noteEditConfirm=content.findViewById(R.id.note_edit_confirm);
 //		noteEditConfirm.setOnClickListener(v->onClickNoteSave());
 		noteEditWrapper=content.findViewById(R.id.note_edit_wrap);
@@ -465,6 +445,13 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account);
 
+		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
+			if(!hasFocus){
+//					Toast.makeText(getActivity(), "Its going here", Toast.LENGTH_LONG).show();
+				savePrivateNote();
+			}
+		});
+
 		if(account.locked){
 			ssb=new SpannableStringBuilder("@");
 			ssb.append(account.acct);
@@ -1006,6 +993,17 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		scrollView.smoothScrollTo(0, 0);
 	}
 
+	private void savePrivateNote(){
+		new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new SimpleCallback<>(this) {
+			@Override
+			public void onSuccess(Relationship result) {
+				relationship=result;
+				updateRelationship();
+				Toast.makeText(getActivity(), "Success", Toast.LENGTH_LONG).show();
+			}
+		});
+	}
+
 	private void onFollowersOrFollowingClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/PrivateNote.java b/mastodon/src/main/java/org/joinmastodon/android/model/PrivateNote.java
deleted file mode 100644
index 9e4c7e186..000000000
--- a/mastodon/src/main/java/org/joinmastodon/android/model/PrivateNote.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.joinmastodon.android.model;
-
-public class PrivateNote extends BaseModel{
-    public String id;
-    public String note;
-}