wzray/tt9
1
0
Fork 0
Code Activity

'full' and 'lite' flavors

Browse source
This commit is contained in:
sspanak 2024-06-12 12:48:55 +03:00 • committed by Dimo Karaivanov
parent 11e042e707
commit 6670bccc50
16 changed files with 182 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/lite/AndroidManifest.xml Normal file
View file

@ -0,0 +1,3 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET"/> <!-- allows dictionary download -->
</manifest>

16
app/src/main/java/io/github/sspanak/tt9/db/DictionaryLoader.java
View file

@ -68,7 +68,7 @@ public class DictionaryLoader {
}
public boolean load(ArrayList<Language> languages) {
public boolean load(Context context, ArrayList<Language> languages) {
if (isRunning()) {
return false;
}
@ -91,7 +91,7 @@ public class DictionaryLoader {
if (isInterrupted()) {
break;
}
importAll(lang);
importAll(context, lang);
currentFile++;
}
}
@ -105,7 +105,7 @@ public class DictionaryLoader {
public static void load(Context context, Language language) {
DictionaryLoadingBar progressBar = DictionaryLoadingBar.getInstance(context);
getInstance(context).setOnStatusChange(status -> progressBar.show(context, status));
self.load(new ArrayList<Language>() {{ add(language); }});
self.load(context, new ArrayList<Language>() {{ add(language); }});
}
@ -129,7 +129,7 @@ public class DictionaryLoader {
load(context, language);
}
// or if the database is outdated, compared to the dictionary file, ask for confirmation and load
else if (!hash.equals(new WordFile(language.getDictionaryFile(), self.assets).getHash())) {
else if (!hash.equals(new WordFile(context, language.getDictionaryFile(), self.assets).getHash())) {
new DictionaryUpdateNotification(context, language).show();
}
},
@ -151,7 +151,7 @@ public class DictionaryLoader {
}
private void importAll(Language language) {
private void importAll(Context context, Language language) {
if (language == null) {
Logger.e(LOG_TAG, "Failed loading a dictionary for NULL language.");
sendError(InvalidLanguageException.class.getSimpleName(), -1);
@ -178,7 +178,7 @@ public class DictionaryLoader {
sendProgressMessage(language, ++progress, SettingsStore.DICTIONARY_IMPORT_PROGRESS_UPDATE_TIME);
logLoadingStep("Letters imported", language, Timer.restart());
importWordFile(language, lettersCount, progress, 88);
importWordFile(context, language, lettersCount, progress, 88);
progress = 88;
sendProgressMessage(language, progress, SettingsStore.DICTIONARY_IMPORT_PROGRESS_UPDATE_TIME);
logLoadingStep("Dictionary file imported", language, Timer.restart());
@ -252,8 +252,8 @@ public class DictionaryLoader {
}
private void importWordFile(Language language, int positionShift, float minProgress, float maxProgress) throws Exception {
WordFile wordFile = new WordFile(language.getDictionaryFile(), assets);
private void importWordFile(Context context, Language language, int positionShift, float minProgress, float maxProgress) throws Exception {
WordFile wordFile = new WordFile(context, language.getDictionaryFile(), assets);
WordBatch batch = new WordBatch(language, wordFile.getTotalLines());
int currentLine = 1;
float progressRatio = (maxProgress - minProgress) / wordFile.getTotalLines();

126
app/src/main/java/io/github/sspanak/tt9/db/entities/WordFile.java
View file

@ -1,27 +1,39 @@
package io.github.sspanak.tt9.db.entities;
import android.content.Context;
import android.content.res.AssetManager;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.net.URLConnection;
import java.nio.charset.StandardCharsets;
import io.github.sspanak.tt9.BuildConfig;
import io.github.sspanak.tt9.R;
import io.github.sspanak.tt9.preferences.settings.SettingsStore;
import io.github.sspanak.tt9.util.Logger;
public class WordFile {
private static final String LOG_TAG = WordFile.class.getSimpleName();
private final AssetManager assets;
private final Context context;
private final String name;
private String hash = null;
private String downloadUrl = null;
private int totalLines = -1;
public WordFile(String name, AssetManager assets) {
public WordFile(Context context, String name, AssetManager assets) {
this.assets = assets;
this.context = context;
this.name = name;
}
public static String[] splitLine(String line) {
String[] parts = { line, "" };
@ -38,6 +50,7 @@ public class WordFile {
return parts;
}
public static short getFrequencyFromLineParts(String[] frequencyParts) {
try {
return Short.parseShort(frequencyParts[1]);
@ -46,40 +59,115 @@ public class WordFile {
}
}
public BufferedReader getReader() throws IOException {
return new BufferedReader(new InputStreamReader(assets.open(name), StandardCharsets.UTF_8));
public boolean exists() {
try {
assets.open(name).close();
return true;
} catch (IOException e) {
return false;
}
}
public int getTotalLines() {
if (totalLines < 0) {
String rawTotalLines = getProperty("size");
try {
totalLines = Integer.parseInt(rawTotalLines);
} catch (Exception e) {
Logger.w(LOG_TAG, "Invalid 'size' property of: " + name + ". Expecting an integer, got: '" + rawTotalLines + "'.");
totalLines = 0;
}
public InputStream getRemoteStream() throws IOException {
URLConnection connection = new URL(getDownloadUrl()).openConnection();
connection.setConnectTimeout(SettingsStore.DICTIONARY_DOWNLOAD_CONNECTION_TIMEOUT);
connection.setReadTimeout(SettingsStore.DICTIONARY_DOWNLOAD_READ_TIMEOUT);
return connection.getInputStream();
}
public BufferedReader getReader() throws IOException {
InputStream stream = exists() ? assets.open(name) : getRemoteStream();
return new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8));
}
private String getDownloadUrl() {
if (downloadUrl == null) {
loadProperties();
}
return totalLines;
return downloadUrl;
}
private void setDownloadUrl(String rawProperty, String rawValue) {
if (!rawProperty.equals("revision")) {
return;
}
String revision = rawValue == null || rawValue.isEmpty() ? "" : rawValue;
downloadUrl = revision.isEmpty() ? null : context.getString(R.string.dictionary_url, revision, name);
if (revision.isEmpty()) {
Logger.w(LOG_TAG, "Invalid 'revision' property of: " + name + ". Expecting a string, got: '" + rawValue + "'.");
}
}
public String getHash() {
if (hash == null) {
hash = getProperty("hash");
loadProperties();
}
return hash;
}
private String getProperty(String propertyName) {
String propertyFilename = name + "." + propertyName;
private void setHash(String rawProperty, String rawValue) {
if (!rawProperty.equals("hash")) {
return;
}
hash = rawValue == null || rawValue.isEmpty() ? "" : rawValue;
if (hash.isEmpty()) {
Logger.w(LOG_TAG, "Invalid 'hash' property of: " + name + ". Expecting a string, got: '" + rawValue + "'.");
}
}
public int getTotalLines() {
if (totalLines < 0) {
loadProperties();
}
return totalLines;
}
private void setTotalLines(String rawProperty, String rawValue) {
if (!rawProperty.equals("words")) {
return;
}
try {
totalLines = Integer.parseInt(rawValue);
} catch (Exception e) {
Logger.w(LOG_TAG, "Invalid 'words' property of: " + name + ". Expecting an integer, got: '" + rawValue + "'.");
totalLines = 0;
}
}
private void loadProperties() {
String propertyFilename = name + ".props.yml";
try (BufferedReader reader = new BufferedReader(new InputStreamReader(assets.open(propertyFilename)))) {
return reader.readLine();
for (String line; (line = reader.readLine()) != null; ) {
String[] parts = line.split("\\s*:\\s*");
if (parts.length < 2) {
continue;
}
setDownloadUrl(parts[0], parts[1]);
setHash(parts[0], parts[1]);
setTotalLines(parts[0], parts[1]);
}
} catch (Exception e) {
Logger.w(LOG_TAG, "Could not read the '" + propertyName + "' property of: " + name + " from: " + propertyFilename + ". " + e.getMessage());
return "";
Logger.w(LOG_TAG, "Could not read the property file: " + propertyFilename + ". " + e.getMessage());
}
}
}

2
app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemLoadDictionary.java
View file

@ -70,7 +70,7 @@ class ItemLoadDictionary extends ItemClickable {
ArrayList<Language> languages = LanguageCollection.getAll(activity, activity.getSettings().getEnabledLanguageIds());
setLoadingStatus();
if (!loader.load(languages)) {
if (!loader.load(activity, languages)) {
loader.stop();
setReadyStatus();
}

2
app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsStore.java
View file

@ -9,6 +9,8 @@ public class SettingsStore extends SettingsUI {
/************* internal settings *************/
public final static int DELETE_WORDS_SEARCH_DELAY = 500; // ms
public final static int DICTIONARY_AUTO_LOAD_COOLDOWN_TIME = 1200000; // 20 minutes in ms
public final static int DICTIONARY_DOWNLOAD_CONNECTION_TIMEOUT = 10000; // ms
public final static int DICTIONARY_DOWNLOAD_READ_TIMEOUT = 10000; // ms
public final static int DICTIONARY_IMPORT_BATCH_SIZE = 5000; // words
public final static int DICTIONARY_IMPORT_PROGRESS_UPDATE_TIME = 250; // ms
public final static byte SLOW_QUERY_TIME = 50; // ms

4
app/src/main/java/io/github/sspanak/tt9/ui/notifications/DictionaryLoadingBar.java
View file

@ -5,6 +5,8 @@ import android.os.Bundle;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.SocketException;
import java.net.UnknownHostException;
import java.util.Locale;
import io.github.sspanak.tt9.R;
@ -138,6 +140,8 @@ public class DictionaryLoadingBar extends DictionaryProgressNotification {
message = resources.getString(R.string.add_word_invalid_language);
} else if (errorType.equals(DictionaryImportException.class.getSimpleName()) || errorType.equals(InvalidLanguageCharactersException.class.getSimpleName())) {
message = resources.getString(R.string.dictionary_load_bad_char, word, line, lang.getName());
} else if (errorType.equals(UnknownHostException.class.getSimpleName()) || errorType.equals(SocketException.class.getSimpleName())) {
message = resources.getString(R.string.dictionary_load_no_internet, lang.getName());
} else if (errorType.equals(IOException.class.getSimpleName()) || errorType.equals(FileNotFoundException.class.getSimpleName())) {
message = resources.getString(R.string.dictionary_not_found, lang.getName());
} else {

2
app/src/main/res/values/strings.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string translatable="false" name="dictionary_url">https://raw.githubusercontent.com/sspanak/tt9/%1$s/app/%2$s</string>
<string translatable="false" name="help_url">https://github.com/sspanak/tt9/blob/master/docs/user-manual.md</string>
<string name="app_name" translatable="false">Traditional T9</string>
<string name="app_name_short" translatable="false">TT9</string>
@ -80,6 +81,7 @@
<string name="dictionary_cancel_load">Cancel Loading</string>
<string name="dictionary_load_bad_char">Loading failed. Invalid word \"%1$s\" on line %2$d of language \"%3$s\".</string>
<string name="dictionary_load_error">Failed loading the dictionary for language \"%1$s\" (%2$s).</string>
<string name="dictionary_load_no_internet">Failed downloading the dictionary for language \"%1$s\". Check your Internet connection.</string>
<string name="dictionary_load_cancelled">Dictionary load cancelled.</string>
<string name="dictionary_loaded">Dictionary load completed.</string>
<string name="dictionary_loading">Loading dictionary (%1$s)…</string>