Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes translator

This commit is contained in:
stom79 2017-11-18 18:28:11 +01:00
parent 9a28cdb053
commit 69533ab712
3 changed files with 106 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/TranslateAsyncTask.java Normal file
View File

@ -0,0 +1,95 @@
/* Copyright 2017 Thomas Schneider
*
* This file is a part of Mastalab
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* Mastalab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with Mastalab; if not,
* see <http://www.gnu.org/licenses>. */
package fr.gouv.etalab.mastodon.asynctasks;
import android.os.AsyncTask;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import fr.gouv.etalab.mastodon.client.HttpsConnection;
import fr.gouv.etalab.mastodon.helper.Helper;
import fr.gouv.etalab.mastodon.interfaces.OnTranslatedInterface;
import fr.gouv.etalab.mastodon.translation.Translate;
/**
* Created by Thomas on 29/04/2017.
* Makes actions for post calls
*/
public class TranslateAsyncTask extends AsyncTask<Void, Void, Void> {
private OnTranslatedInterface listener;
private static final String BASE_URL = "https://translate.yandex.net/api/v1.5/tr.json/translate?";
private static final String YANDEX_KEY = "trnsl.1.1.20170703T074828Z.a95168c920f61b17.699437a40bbfbddc4cd57f345a75c83f0f30c420";
private String text, toLanguage;
private Translate translate;
private Helper.targetField target;
public enum typeInter{
TRANSLATED,
TRANSLATEDTEXTVIEW
}
private typeInter type;
private String str_response;
private fr.gouv.etalab.mastodon.client.Entities.Status status;
public TranslateAsyncTask(final Translate translate, Helper.targetField target, fr.gouv.etalab.mastodon.client.Entities.Status status, String text, String toLanguage, typeInter type, OnTranslatedInterface onTranslatedInterface){
this.listener = onTranslatedInterface;
this.type = type;
this.text = text;
this.toLanguage = toLanguage;
this.translate = translate;
this.target = target;
this.status = status;
}
@Override
protected Void doInBackground(Void... params) {
try {
str_response = new HttpsConnection().get(getAbsoluteUrl(text, toLanguage), 30, null, null );
} catch (Exception e) {
if( type == typeInter.TRANSLATED)
listener.onTranslatedTextview(translate, status, null, true);
else if( type == typeInter.TRANSLATEDTEXTVIEW)
listener.onTranslated(translate, target, "", false);
}
return null;
}
@Override
protected void onPostExecute(Void result) {
if( type == typeInter.TRANSLATED)
listener.onTranslated(translate, target, str_response, false);
else if( type == typeInter.TRANSLATEDTEXTVIEW)
listener.onTranslatedTextview(translate, status, str_response, false);
}
private static String getAbsoluteUrl(String content, String toLanguage) {
String key = "key=" + YANDEX_KEY + "&";
toLanguage = toLanguage.replace("null","");
String lang = "lang=" + toLanguage + "&";
String text;
try {
text = "text=" + URLEncoder.encode(content, "utf-8") + "&";
} catch (UnsupportedEncodingException e) {
text = "text=" + content + "&";
e.printStackTrace();
}
String format = "format=html&";
return BASE_URL + key + lang +format + text ;
}
}

9
app/src/main/java/fr/gouv/etalab/mastodon/client/HttpsConnection.java
View File

@ -16,6 +16,8 @@ package fr.gouv.etalab.mastodon.client;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Build;
import android.util.Log;
import org.json.JSONObject;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
@ -114,6 +116,7 @@ public class HttpsConnection {
for (int c; (c = in.read()) >= 0; )
sb.append((char) c);
httpsURLConnection.disconnect();
Log.v(Helper.TAG,httpsURLConnection.getResponseCode() + " - sb.toString(): " + sb.toString());
throw new HttpsConnectionException(httpsURLConnection.getResponseCode(), sb.toString());
}
}
@ -274,7 +277,7 @@ public class HttpsConnection {
httpsURLConnection.setRequestProperty("Connection", "Keep-Alive");
httpsURLConnection.setRequestProperty("Cache-Control", "no-cache");
httpsURLConnection.setRequestProperty("Content-Type", "multipart/form-data;boundary="+ boundary);
httpsURLConnection.setChunkedStreamingMode(-1);
DataOutputStream request = new DataOutputStream(httpsURLConnection.getOutputStream());
@ -286,7 +289,7 @@ public class HttpsConnection {
int totalSize = pixels.length;
int bytesTransferred = 0;
int chunkSize = 2000;
int chunkSize = 2048;
while (bytesTransferred < totalSize) {
int nextChunkSize = totalSize - bytesTransferred;
@ -301,7 +304,7 @@ public class HttpsConnection {
public void run() {
listener.onUpdateProgress(progress);
}});
request.flush();
}
request.writeBytes(lineEnd);
request.writeBytes(twoHyphens + boundary + twoHyphens + lineEnd);

49
app/src/main/java/fr/gouv/etalab/mastodon/translation/YandexQuery.java
View File

@ -14,12 +14,10 @@
* see <http://www.gnu.org/licenses>. */
package fr.gouv.etalab.mastodon.translation;
import android.os.AsyncTask;
import org.json.JSONException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import fr.gouv.etalab.mastodon.asynctasks.TranslateAsyncTask;
import fr.gouv.etalab.mastodon.client.Entities.Status;
import fr.gouv.etalab.mastodon.client.HttpsConnection;
import fr.gouv.etalab.mastodon.helper.Helper;
import fr.gouv.etalab.mastodon.interfaces.OnTranslatedInterface;
@ -33,57 +31,20 @@ class YandexQuery {
YandexQuery(OnTranslatedInterface listenner) {
this.listener = listenner;
}
private static final String BASE_URL = "https://translate.yandex.net/api/v1.5/tr.json/translate?";
private static final String YANDEX_KEY = "trnsl.1.1.20170703T074828Z.a95168c920f61b17.699437a40bbfbddc4cd57f345a75c83f0f30c420";
void getYandexTextview(final Translate translate, final Status status, final String text, final String toLanguage) throws JSONException {
if( text != null && text.length() > 0) {
new Thread(new Runnable() {
@Override
public void run() {
try {
String str_response = new HttpsConnection().get(getAbsoluteUrl(text, toLanguage), 30, null, null );
listener.onTranslatedTextview(translate, status, str_response, false);
} catch (Exception e) {
listener.onTranslatedTextview(translate, status, null, true);
}
}
}).start();
new TranslateAsyncTask(translate, null, status, text, toLanguage, TranslateAsyncTask.typeInter.TRANSLATEDTEXTVIEW, listener).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}else {
listener.onTranslatedTextview(translate, status, "", false);
}
}
void getYandexTranslation(final Translate translate, final Helper.targetField target, final String content, final String toLanguage) throws JSONException {
if( content != null && content.length() > 0) {
new Thread(new Runnable() {
@Override
public void run() {
try {
String str_response = new HttpsConnection().get(getAbsoluteUrl(content, toLanguage), 30, null, null );
listener.onTranslated(translate, target, str_response, false);
} catch (Exception e) {
listener.onTranslated(translate, target, "", false);
}
}
}).start();
new TranslateAsyncTask(translate, target, null, content, toLanguage, TranslateAsyncTask.typeInter.TRANSLATEDTEXTVIEW, listener).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}else{
listener.onTranslated(translate, target, "", false);
}
}
private static String getAbsoluteUrl(String content, String toLanguage) {
String key = "key=" + YANDEX_KEY + "&";
toLanguage = toLanguage.replace("null","");
String lang = "lang=" + toLanguage + "&";
String text;
try {
text = "text=" + URLEncoder.encode(content, "utf-8") + "&";
} catch (UnsupportedEncodingException e) {
text = "text=" + content + "&";
e.printStackTrace();
}
String format = "format=html&";
return BASE_URL + key + lang +format + text ;
}
}