diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/create_pm/CreatePMActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/create_pm/CreatePMActivity.java index e690023b..b6925fba 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/activities/create_pm/CreatePMActivity.java +++ b/app/src/main/java/gr/thmmy/mthmmy/activities/create_pm/CreatePMActivity.java @@ -80,7 +80,7 @@ public class CreatePMActivity extends BaseActivity implements ExternalAsyncTask. SendPMTask sendPMTask = new SendPMTask(includeAppSignature); sendPMTask.setOnTaskStartedListener(this); sendPMTask.setOnTaskFinishedListener(this); - sendPMTask.execute(sendPmUrl, username, subjectInput.getEditText().getText().toString(), + sendPMTask.execute(sendPmUrl, subjectInput.getEditText().getText().toString(), contentEditor.getText().toString()); }); } diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/create_pm/SendPMTask.java b/app/src/main/java/gr/thmmy/mthmmy/activities/create_pm/SendPMTask.java index 875504dc..703e47b9 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/activities/create_pm/SendPMTask.java +++ b/app/src/main/java/gr/thmmy/mthmmy/activities/create_pm/SendPMTask.java @@ -33,7 +33,7 @@ public class SendPMTask extends ExternalAsyncTask { OkHttpClient client = BaseApplication.getInstance().getClient(); Document document; - String seqnum, sc, outbox, createTopicUrl, replied_to, folder; + String seqnum, sc, outbox, createTopicUrl, replied_to, folder, u; try { Response response = client.newCall(request).execute(); document = Jsoup.parse(response.body().string()); @@ -43,6 +43,7 @@ public class SendPMTask extends ExternalAsyncTask { outbox = document.select("input[name=outbox]").first().attr("value"); replied_to = document.select("input[name=replied_to]").first().attr("value"); folder = document.select("input[name=folder]").first().attr("value"); + u = document.select("input[name=u]").first().attr("value"); createTopicUrl = document.select("form").first().attr("action"); final String appSignature = "\n[right][size=7pt][i]sent from [url=https://play.google.com/store/apps/" + @@ -50,11 +51,11 @@ public class SendPMTask extends ExternalAsyncTask { RequestBody postBody = new MultipartBody.Builder() .setType(MultipartBody.FORM) - .addFormDataPart("message", strings[3] + (includeAppSignature ? appSignature : "")) + .addFormDataPart("message", strings[2] + (includeAppSignature ? appSignature : "")) .addFormDataPart("seqnum", seqnum) .addFormDataPart("sc", sc) - .addFormDataPart("u", strings[1]) // recipient - .addFormDataPart("subject", strings[2]) + .addFormDataPart("u", u) // recipient id + .addFormDataPart("subject", strings[1]) .addFormDataPart("outbox", outbox) .addFormDataPart("replied_to", replied_to) .addFormDataPart("folder", folder) @@ -71,7 +72,7 @@ public class SendPMTask extends ExternalAsyncTask { Response response2 = client.newCall(pmRequest).execute(); switch (replyStatus(response2)) { case SUCCESSFUL: - BaseApplication.getInstance().logFirebaseAnalyticsEvent("new_topic_creation", null); + BaseApplication.getInstance().logFirebaseAnalyticsEvent("new_pm_sent", null); return true; default: Timber.e("Malformed pmRequest. Request string: %s", pmRequest.toString());