Skip to content
This repository was archived by the owner on May 19, 2023. It is now read-only.

Commit abedda2

Browse files
hashworkshashworks
committed
Add ability to set a custom server
Resolves #6.
1 parent 3fbcf7e commit abedda2

File tree

16 files changed

+71
-15
lines changed

16 files changed

+71
-15
lines changed

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
.DS_Store
22

3+
build
4+
.gradle
5+
6+
.idea
7+
38

‎CorrectorSoftcatala/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ android {
3232

3333
dependencies {
3434
implementation 'com.android.support:appcompat-v7:26.+'
35-
implementation 'com.android.support.constraint:constraint-layout:+'
35+
implementation 'com.android.support.constraint:constraint-layout:1.+'
3636
}

‎CorrectorSoftcatala/src/main/java/org/softcatala/corrector/Configuration.java

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,19 @@
2020
package org.softcatala.corrector;
2121

2222
import android.content.SharedPreferences;
23-
import android.os.Build;
2423
import android.preference.PreferenceManager;
2524

2625
import java.util.Date;
2726

2827
public class Configuration {
28+
private static final String SoftcatalaServer = "https://lt.softcatala.org";
2929

3030
private static volatile Configuration instance = null;
31-
private static String PREF_DIALECT = "corrector.softcatala.dialect";
31+
private static String PREF_SERVER = "corrector.softcatala.server";
32+
//private static String PREF_DIALECT = "corrector.softcatala.dialect";
3233
private static int HttpConnections = 0;
3334
private static Date LastConnection = null;
34-
//public static SpellCheckerSettingsActivity SettingsActivity;
35+
public static SpellCheckerSettingsActivity SettingsActivity;
3536

3637
public static synchronized Configuration getInstance() {
3738
if (instance == null) {
@@ -59,6 +60,23 @@ public void setDialect(Boolean dialect)
5960
spref.edit().putBoolean(PREF_DIALECT, dialect).commit();
6061
}*/
6162

63+
public String getServer()
64+
{
65+
SharedPreferences spref = PreferenceManager.getDefaultSharedPreferences(SettingsActivity);
66+
return spref.getString(PREF_SERVER, SoftcatalaServer);
67+
}
68+
69+
public String setServer(String server)
70+
{
71+
if (server.isEmpty()) {
72+
server = SoftcatalaServer;
73+
}
74+
75+
SharedPreferences spref = PreferenceManager.getDefaultSharedPreferences(SettingsActivity);
76+
spref.edit().putString(PREF_SERVER, server).apply();
77+
return server;
78+
}
79+
6280
public int getHttpConnections() {
6381
return HttpConnections;
6482
}

‎CorrectorSoftcatala/src/main/java/org/softcatala/corrector/LanguageToolRequest.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.io.DataOutputStream;
2323
import java.io.InputStreamReader;
2424
import java.io.UnsupportedEncodingException;
25+
import java.net.HttpURLConnection;
2526
import java.net.URL;
2627
import java.net.URLEncoder;
2728
import java.io.BufferedReader;
@@ -30,12 +31,8 @@
3031

3132
import android.util.Log;
3233

33-
import javax.net.ssl.HttpsURLConnection;
34-
3534
public class LanguageToolRequest {
3635

37-
//private static final String SERVER_URL = "https://www.softcatala.org/languagetool/api/";
38-
private static final String SERVER_URL = "https://lt.softcatala.org/v2/check";
3936
private static final String ENCODING = "UTF-8";
4037
private static final String TAG = LanguageToolRequest.class.getSimpleName();
4138
private static final String m_sessionId = GetSessionID();
@@ -103,9 +100,10 @@ private String sendPost(String text) {
103100
try {
104101

105102
String url = BuildURL();
103+
Log.d("softcatala", "URL: " + url);
106104

107105
URL obj = new URL(url);
108-
HttpsURLConnection con = (HttpsURLConnection) obj.openConnection();
106+
HttpURLConnection con = (HttpURLConnection) obj.openConnection();
109107
con.setRequestMethod("POST");
110108

111109
String urlParameters = GetFillPostFields(text);
@@ -158,11 +156,10 @@ public Suggestion[] Request(String text) {
158156
}
159157

160158
private String BuildURL() {
161-
StringBuilder sb = new StringBuilder();
162-
sb.append(SERVER_URL);
163-
/* Parameter to help to track requests from the same IP */
164-
sb.append(AddQueryParameter("?", "sessionID", m_sessionId));
165-
return sb.toString();
159+
return Configuration.getInstance().getServer() +
160+
"/v2/check" +
161+
/* Parameter to help to track requests from the same IP */
162+
AddQueryParameter("?", "sessionID", m_sessionId);
166163
}
167164

168165
String AddQueryParameter(String separator, String key, String value) {

‎CorrectorSoftcatala/src/main/java/org/softcatala/corrector/SpellCheckerSettingsActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class SpellCheckerSettingsActivity extends PreferenceActivity {
3131
@Override
3232
public Intent getIntent() {
3333
final Intent modIntent = new Intent(super.getIntent());
34-
//Configuration.SettingsActivity = this;
34+
Configuration.SettingsActivity = this;
3535
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, SpellCheckerSettingsFragment.class.getName());
3636
modIntent.putExtra(EXTRA_NO_HEADERS, true);
3737
return modIntent;

‎CorrectorSoftcatala/src/main/java/org/softcatala/corrector/SpellCheckerSettingsFragment.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import android.os.Bundle;
2323
import android.preference.CheckBoxPreference;
2424
import android.preference.Preference;
25+
import android.preference.EditTextPreference;
2526
import android.preference.PreferenceFragment;
2627
import android.util.Log;
2728

@@ -47,6 +48,7 @@ public void onCreate(final Bundle savedInstanceState) {
4748

4849
setHttpConnections();
4950
setVersion();
51+
setServer();
5052
//setDialect();
5153
}
5254

@@ -65,6 +67,21 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
6567
});*/
6668
}
6769

70+
private void setServer() {
71+
EditTextPreference server = ((EditTextPreference) findPreference("server"));
72+
server.setSummary(Configuration.getInstance().getServer());
73+
74+
server.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
75+
public boolean onPreferenceChange(Preference preference, Object newValue) {
76+
String newServer = newValue.toString();
77+
newServer = Configuration.getInstance().setServer(newServer);
78+
EditTextPreference server = ((EditTextPreference) preference);
79+
server.setSummary(newServer);
80+
return true;
81+
}
82+
});
83+
}
84+
6885
private void setVersion() {
6986
Date buildDate = BuildConfig.buildTime;
7087
Preference version = findPreference("version");

‎CorrectorSoftcatala/src/main/res/values-br/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<string name="spellchecker_name">Adlenner LanguageTool</string>
55
<string name="sample_settings">Perzhioù</string>
66
<string name="version">Stumm</string>
7+
<string name="server">Servijer</string>
78
<string name="requests">Goulennoù savet da servijer an adlenner </string>
89
<!--%s is the version number and %s the date (e.g Sun Feb 28)-->
910
<string name="version_text" formatted="false">%s (savet war %s)</string>

‎CorrectorSoftcatala/src/main/res/values-ca/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<string name="spellchecker_name">Revisió de text LanguageTool</string>
55
<string name="sample_settings">Preferències</string>
66
<string name="version">Versió</string>
7+
<string name="server">Servidor</string>
78
<string name="requests">Sol·licituds al servidor</string>
89
<!--%s is the version number and %s the date (e.g Sun Feb 28)-->
910
<string name="version_text" formatted="false">%s (compilat el %s)</string>

‎CorrectorSoftcatala/src/main/res/values-de/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<string name="spellchecker_name">LanguageTool Textprüfer</string>
55
<string name="sample_settings">Einstellungen</string>
66
<string name="version">Version</string>
7+
<string name="server">Server</string>
78
<string name="requests">Anfragen an den Textprüfungs-Server</string>
89
<!--%s is the version number and %s the date (e.g Sun Feb 28)-->
910
<string name="version_text" formatted="false">%s (gebaut am %s)</string>

‎CorrectorSoftcatala/src/main/res/values-eo/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<string name="spellchecker_name">Kontrolilo Lingvoilo/LanguageTool</string>
55
<string name="sample_settings">Agordoj</string>
66
<string name="version">Versio</string>
7+
<string name="server">Servilo</string>
78
<string name="requests">Petoj al la servilo de kontrolado</string>
89
<!--%s is the version number and %s the date (e.g Sun Feb 28)-->
910
<string name="version_text" formatted="false">%s (kunmetita ĉe %s)</string>

‎CorrectorSoftcatala/src/main/res/values-fr/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<string name="spellchecker_name">Correcteur LanguageTool</string>
55
<string name="sample_settings">Préférences</string>
66
<string name="version">Version</string>
7+
<string name="server">Serveur</string>
78
<string name="requests">Requêtes au serveur de correction</string>
89
<!--%s is the version number and %s the date (e.g Sun Feb 28)-->
910
<string name="version_text" formatted="false">%s (généré sur %s)</string>

‎CorrectorSoftcatala/src/main/res/values-pt-rBR/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<string name="spellchecker_name">Revisor LanguageTool</string>
55
<string name="sample_settings">Configurações</string>
66
<string name="version">Versão</string>
7+
<string name="server">Servidor</string>
78
<string name="requests">Pedidos ao servidor do revisor</string>
89
<string name="version_text" formatted="false">%s (feito em %s)</string>
910
<string name="connections" formatted="false">%d (último %s)</string>

‎CorrectorSoftcatala/src/main/res/values-ru/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<string name="spellchecker_name">Корректор LanguageTool </string>
55
<string name="sample_settings">Настройки</string>
66
<string name="version">Версия</string>
7+
<string name="server">Cерверу</string>
78
<string name="requests">Объём запросов к серверу проверки</string>
89
<!--%s is the version number and %s the date (e.g Sun Feb 28)-->
910
<string name="version_text" formatted="false">%s (сборка от %s)</string>

‎CorrectorSoftcatala/src/main/res/values-uk/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<string name="spellchecker_name">Коректор LanguageTool</string>
55
<string name="sample_settings">Налаштування</string>
66
<string name="version">Версія</string>
7+
<string name="server">Cервера</string>
78
<string name="requests">Запити до сервера коректора</string>
89
<!--%s is the version number and %s the date (e.g Sun Feb 28)-->
910
<string name="version_text" formatted="false">%s (побудовано на %s)</string>

‎CorrectorSoftcatala/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<string name="subtype_generic" translatable="false">%s</string>
2626
<string name="sample_settings">Preferences</string>
2727
<string name="version">Version</string>
28+
<string name="server">Server</string>
2829
<string name="requests">Requests to the proofreader server</string>
2930
<!-- %s is the version number and %s the date (e.g Sun Feb 28) -->
3031
<string name="version_text" formatted="false">%s (built on %s)</string>

‎CorrectorSoftcatala/src/main/res/xml/spell_checker_settings.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,14 @@
3737
android:key="version"
3838
android:title="@string/version"
3939
android:summary="" />
40+
41+
<EditTextPreference
42+
android:selectable="true"
43+
android:enabled="true"
44+
android:selectAllOnFocus="true"
45+
android:inputType="textUri"
46+
android:singleLine="true"
47+
android:key="server"
48+
android:title="@string/server"
49+
android:summary="" />
4050
</PreferenceScreen>

0 commit comments

Comments
 (0)