/... which would
+ // conflict with src/ being used by the main source set.
+ // Adding new build types or product flavors should be accompanied
+ // by a similar customization.
+ debug.setRoot('build-types/debug')
+ release.setRoot('build-types/release')
+
+ }
+ // http://stackoverflow.com/a/19130098
+ signingConfigs {
+ release {
+ storeFile file(System.getenv("KEYSTORE"))
+ storePassword project.ext.keyStorePass
+ keyAlias System.getenv("KEYALIAS")
+ keyPassword project.ext.keyPass
+ }
+ }
+
+ buildTypes {
+ release {
+ signingConfig android.signingConfigs.release
+ }
+ }
}
+
+
+task getDictSizes {
+ inputs.files 'assets/en-utf8.txt', 'assets/ru-utf8.txt'
+ outputs.file "assets/dict.properties"
+ doLast {
+ ant.echo("Deleting old file...")
+
+ delete 'assets/dict.properties'
+
+ ant.echo("Calculating dict size...")
+
+ FileCollection dicts = files("assets/en-utf8.txt", "assets/ru-utf8.txt")
+
+ dicts.each {File file ->
+ ant.propertyfile(file:"assets/dict.properties") {
+ entry(key: "size."+ file.name, value: file.length())
+ }
+ }
+ }
+}
+
+task readPasswordFromInput << {
+ android.signingConfigs.release.storePassword = String.valueOf(System.console().readPassword("\nKeyStore Password: "))
+ android.signingConfigs.release.keyPassword = String.valueOf(System.console().readPassword("\nKey Password: "))
+}
+
+//http://stackoverflow.com/a/17484331
+tasks.whenTaskAdded { task ->
+ if (task.name == 'packageRelease') {
+ task.dependsOn readPasswordFromInput
+ }
+}
+
+preBuild.dependsOn getDictSizes
+preBuild.mustRunAfter getDictSizes
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 861eddc3..56c8ec2c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Mon Jan 13 17:37:00 EST 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-all.zip
diff --git a/res/drawable/bggradient.xml b/res/drawable/bggradient.xml
index 59baebf9..52ca3c9f 100644
--- a/res/drawable/bggradient.xml
+++ b/res/drawable/bggradient.xml
@@ -1,9 +1,9 @@
-
-
-
\ No newline at end of file
+
+
+
diff --git a/res/drawable/button_custom.xml b/res/drawable/button_custom.xml
index 68d391a0..2f3497c4 100644
--- a/res/drawable/button_custom.xml
+++ b/res/drawable/button_custom.xml
@@ -1,8 +1,8 @@
- - English
- - Text
- - Number
-
-
- - 0
- - 1
- - 2
-
-
\ No newline at end of file
+
+ - Dictionary
+ - Text
+ - Number
+
+
+ - 0
+ - 1
+ - 2
+
+
+
+ - 0
+
+
+ - English
+ - Russian
+
+
+ - 0
+ - 1
+
+
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 33912d8f..2db951e4 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,13 +1,13 @@
- #FF000000
- #FFE35900
- #ff808080
- #bbffffff
- #FFFCBE2B
- #FF2A9AEB
- #FFA8A8A8
- #FFFFFFFF
- #FF000000
- #FFFFFFFF
-
\ No newline at end of file
+ #FF000000
+ #FFE35900
+ #ff808080
+ #bbffffff
+ #FFFCBE2B
+ #FF2A9AEB
+ #FFA8A8A8
+ #FFFFFFFF
+ #FF000000
+ #FFFFFFFF
+
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f9ec51de..85f2c3dc 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -1,29 +1,29 @@
- 50dip
- 16sp
- 6sp
- 16dp
- 16dp
+ 50dip
+ 16sp
+ 6sp
+ 16dp
+ 16dp
-
\ No newline at end of file
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4ae1c45d..c48a150c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,54 +1,73 @@
+ https://github.com/Clam-/TraditionalT9/wiki/Traditional-T9-keypad-IME-for-Android
+ Traditional T9
+ Traditional T9
+ English
+ Numbers
+ Default Input Mode
+ Default mode used for \'normal\' text entry
+ Traditional T9 Settings
+ Insert symbol
+ Add word
+ Done
+ Commit
+ Cycle Mode
+ Options
+ Add word?
+ Hold Icon
+ Next Page
+ Prev Page
+ Add word
+ OK
+ Close
+ Blank word not added.
+ Cannot add word with unmappable symbol for %1$s.
+ Word (%1$s) already in DB.
+ Word (%1$s) already in DB for %2$s.
+ Cancel
+ Add Word
+ Settings
+ Database unavailable.
- Traditional T9
- Traditional T9
- English
- Numbers
- Default Input Mode
- Default mode used for \'normal\' text entry
- Traditional T9 Settings
- Insert symbol
- Add word
- Done
- Commit
- Cycle Mode
- Change IME
- Add word?
- Hold Icon
- Next Page
- Prev Page
- Add word
- OK
- Blank word not added.
- Cannot add word with unmappable symbol.
- Word (
- ) already in DB.
- Cancel
- Add Word
- Settings
-
- Load dictionary
- Nuke dictionary
- Backup dictionary
- Restore dictionary
- Query test
-
- Loading dictionary…
- Restoring dictionary…
- Backing up dictionary…
- Nuking dictionary… Please wait…
-
- Warning: An existing database backup exists. Do you wish to overwrite?
- Backup IME database
- Error: No external storage available for backup. Backup will not continue.
- Backup database entries will overwrite existing database entries. Entries not in the backup will be retained. If that is not desired behaviour select \"%1$s\" before selecting this option.
- Restore IME database
- Error: No external storage available for restoring. Restore will not continue.
- Error: Backup file not found.
- Warning: This will delete your entire dictionary. Do you wish to continue?
- Nuke IME dictionary
-
- Hello world!
+ Warning: No keypad/keyboard
+ This device does not have a hardware keyboard/keypad, therefore it will not function in any useful way.
+Sorry for the inconvenience.
-
\ No newline at end of file
+ Updating dictionary database...
+ Updating dictionary database, this might take a while.
+ Updating dictionary database complete.
+ Updating dictionary database, word input unavailable at this time.
+
+ Multilingual support...
+ "Show help
+ Load dictionary
+ Load user dictionary
+ SDcard/traditionalt9/user.lang.dict (lang: en/ru)
+ Nuke dictionary
+ Backup dictionary
+ Restore dictionary
+ Query test
+ Test func
+
+ Loading dictionary…
+ Loading user dictionary…
+ Load IME dictionary
+ Restoring dictionary…
+ Backing up dictionary…
+ Nuking dictionary… Please wait…
+ Dictionary for %1$s not found. Not loading.
+
+ Warning: An existing database backup exists. Do you wish to overwrite?
+ Backup IME database
+ Error: No external storage available for backup. Backup will not continue.
+ Backup database entries will overwrite existing database entries. Entries not in the backup will be retained. If that is not desired behaviour select \"%1$s\" before selecting this option.
+ Restore IME database
+ Error: No external storage available for restoring. Restore will not continue.
+ Error: Backup file not found.
+ Warning: This will delete your entire dictionary. Do you wish to continue?
+ Nuke IME dictionary
+
+ Hello world!
+
+
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4a10ca49..d10f8464 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,20 +1,20 @@
-
-
+
+
-
-
+
+
-
\ No newline at end of file
+
diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
index a9106fc2..69fcf3a3 100644
--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -1,18 +1,27 @@
-
-
-
-
-
-
-
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="first_preferencescreen">
+
+
+
+
+
+
+
+
+
+
diff --git a/src/com/stackoverflow/answer/UnicodeBOMInputStream.java b/src/com/stackoverflow/answer/UnicodeBOMInputStream.java
new file mode 100644
index 00000000..34aeda71
--- /dev/null
+++ b/src/com/stackoverflow/answer/UnicodeBOMInputStream.java
@@ -0,0 +1,315 @@
+/* ____________________________________________________________________________
+ *
+ * File: UnicodeBOMInputStream.java
+ * Author: Gregory Pakosz.
+ * Date: 02 - November - 2005
+ * ____________________________________________________________________________
+ */
+package com.stackoverflow.answer;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PushbackInputStream;
+
+/**
+ * The UnicodeBOMInputStream class wraps any
+ * InputStream and detects the presence of any Unicode BOM
+ * (Byte Order Mark) at its beginning, as defined by
+ * RFC 3629 - UTF-8, a transformation format of ISO 10646
+ *
+ * The
+ * Unicode FAQ
+ * defines 5 types of BOMs:
+ * 00 00 FE FF = UTF-32, big-endian
FF FE 00 00 = UTF-32, little-endian
FE FF = UTF-16, big-endian
FF FE = UTF-16, little-endian
EF BB BF = UTF-8
+ *
+ * Use the {@link #getBOM()} method to know whether a BOM has been detected
+ * or not.
+ *
+ * Use the {@link #skipBOM()} method to remove the detected BOM from the
+ * wrapped InputStream object.
+ */
+public class UnicodeBOMInputStream extends InputStream
+{
+ /**
+ * Type safe enumeration class that describes the different types of Unicode
+ * BOMs.
+ */
+ public static final class BOM
+ {
+ /**
+ * NONE.
+ */
+ public static final BOM NONE = new BOM(new byte[]{},"NONE");
+
+ /**
+ * UTF-8 BOM (EF BB BF).
+ */
+ public static final BOM UTF_8 = new BOM(new byte[]{(byte)0xEF,
+ (byte)0xBB,
+ (byte)0xBF},
+ "UTF-8");
+
+ /**
+ * UTF-16, little-endian (FF FE).
+ */
+ public static final BOM UTF_16_LE = new BOM(new byte[]{ (byte)0xFF,
+ (byte)0xFE},
+ "UTF-16 little-endian");
+
+ /**
+ * UTF-16, big-endian (FE FF).
+ */
+ public static final BOM UTF_16_BE = new BOM(new byte[]{ (byte)0xFE,
+ (byte)0xFF},
+ "UTF-16 big-endian");
+
+ /**
+ * UTF-32, little-endian (FF FE 00 00).
+ */
+ public static final BOM UTF_32_LE = new BOM(new byte[]{ (byte)0xFF,
+ (byte)0xFE,
+ (byte)0x00,
+ (byte)0x00},
+ "UTF-32 little-endian");
+
+ /**
+ * UTF-32, big-endian (00 00 FE FF).
+ */
+ public static final BOM UTF_32_BE = new BOM(new byte[]{ (byte)0x00,
+ (byte)0x00,
+ (byte)0xFE,
+ (byte)0xFF},
+ "UTF-32 big-endian");
+
+ /**
+ * Returns a String representation of this BOM
+ * value.
+ */
+ public final String toString()
+ {
+ return description;
+ }
+
+ /**
+ * Returns the bytes corresponding to this BOM value.
+ */
+ public final byte[] getBytes()
+ {
+ final int length = bytes.length;
+ final byte[] result = new byte[length];
+
+ // Make a defensive copy
+ System.arraycopy(bytes,0,result,0,length);
+
+ return result;
+ }
+
+ private BOM(final byte bom[], final String description)
+ {
+ assert(bom != null) : "invalid BOM: null is not allowed";
+ assert(description != null) : "invalid description: null is not allowed";
+ assert(description.length() != 0) : "invalid description: empty string is not allowed";
+
+ this.bytes = bom;
+ this.description = description;
+ }
+
+ final byte bytes[];
+ private final String description;
+
+ } // BOM
+
+ /**
+ * Constructs a new UnicodeBOMInputStream that wraps the
+ * specified InputStream.
+ *
+ * @param inputStream an InputStream.
+ *
+ * @throws NullPointerException when inputStream is
+ * null.
+ * @throws IOException on reading from the specified InputStream
+ * when trying to detect the Unicode BOM.
+ */
+ public UnicodeBOMInputStream(final InputStream inputStream) throws NullPointerException,
+ IOException
+
+ {
+ if (inputStream == null)
+ throw new NullPointerException("invalid input stream: null is not allowed");
+
+ in = new PushbackInputStream(inputStream,4);
+
+ final byte bom[] = new byte[4];
+ final int read = in.read(bom);
+
+ switch(read)
+ {
+ case 4:
+ if ((bom[0] == (byte)0xFF) &&
+ (bom[1] == (byte)0xFE) &&
+ (bom[2] == (byte)0x00) &&
+ (bom[3] == (byte)0x00))
+ {
+ this.bom = BOM.UTF_32_LE;
+ break;
+ }
+ else
+ if ((bom[0] == (byte)0x00) &&
+ (bom[1] == (byte)0x00) &&
+ (bom[2] == (byte)0xFE) &&
+ (bom[3] == (byte)0xFF))
+ {
+ this.bom = BOM.UTF_32_BE;
+ break;
+ }
+
+ case 3:
+ if ((bom[0] == (byte)0xEF) &&
+ (bom[1] == (byte)0xBB) &&
+ (bom[2] == (byte)0xBF))
+ {
+ this.bom = BOM.UTF_8;
+ break;
+ }
+
+ case 2:
+ if ((bom[0] == (byte)0xFF) &&
+ (bom[1] == (byte)0xFE))
+ {
+ this.bom = BOM.UTF_16_LE;
+ break;
+ }
+ else
+ if ((bom[0] == (byte)0xFE) &&
+ (bom[1] == (byte)0xFF))
+ {
+ this.bom = BOM.UTF_16_BE;
+ break;
+ }
+
+ default:
+ this.bom = BOM.NONE;
+ break;
+ }
+
+ if (read > 0)
+ in.unread(bom,0,read);
+ }
+
+ /**
+ * Returns the BOM that was detected in the wrapped
+ * InputStream object.
+ *
+ * @return a BOM value.
+ */
+ public final BOM getBOM()
+ {
+ // BOM type is immutable.
+ return bom;
+ }
+
+ /**
+ * Skips the BOM that was found in the wrapped
+ * InputStream object.
+ *
+ * @return this UnicodeBOMInputStream.
+ *
+ * @throws IOException when trying to skip the BOM from the wrapped
+ * InputStream object.
+ */
+ public final synchronized UnicodeBOMInputStream skipBOM() throws IOException
+ {
+ if (!skipped)
+ {
+ in.skip(bom.bytes.length);
+ skipped = true;
+ }
+ return this;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int read() throws IOException
+ {
+ return in.read();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int read(final byte b[]) throws IOException,
+ NullPointerException
+ {
+ return in.read(b,0,b.length);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int read(final byte b[],
+ final int off,
+ final int len) throws IOException,
+ NullPointerException
+ {
+ return in.read(b,off,len);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public long skip(final long n) throws IOException
+ {
+ return in.skip(n);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int available() throws IOException
+ {
+ return in.available();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void close() throws IOException
+ {
+ in.close();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public synchronized void mark(final int readlimit)
+ {
+ in.mark(readlimit);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public synchronized void reset() throws IOException
+ {
+ in.reset();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean markSupported()
+ {
+ return in.markSupported();
+ }
+
+ private final PushbackInputStream in;
+ private final BOM bom;
+ private boolean skipped = false;
+
+} // UnicodeBOMInputStream
diff --git a/src/org/nyanya/android/traditionalt9/AbsSymDialog.java b/src/org/nyanya/android/traditionalt9/AbsSymDialog.java
index 63d82fb4..7a3dac64 100644
--- a/src/org/nyanya/android/traditionalt9/AbsSymDialog.java
+++ b/src/org/nyanya/android/traditionalt9/AbsSymDialog.java
@@ -2,12 +2,15 @@ package org.nyanya.android.traditionalt9;
import android.app.Dialog;
import android.content.Context;
+import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.TextView;
+import java.util.Arrays;
+
public abstract class AbsSymDialog extends Dialog implements
View.OnClickListener {
@@ -20,15 +23,15 @@ public abstract class AbsSymDialog extends Dialog implements
private String title;
private boolean started;
- private static final int[] buttons = {
+ private static final int[] buttons = {
R.id.text_keyone, R.id.text_keytwo,
R.id.text_keythree, R.id.text_keyfour, R.id.text_keyfive,
R.id.text_keysix, R.id.text_keyseven, R.id.text_keyeight,
- R.id.text_keynine, R.id.text_keyzero
+ R.id.text_keynine, R.id.text_keyzero
};
- private static final int[] buttons2 = {
+ private static final int[] buttons2 = {
R.id.text_keystar,
- R.id.text_keypound
+ R.id.text_keypound
};
public AbsSymDialog(Context c, View mv) {
@@ -279,6 +282,11 @@ public abstract class AbsSymDialog extends Dialog implements
win.setAttributes(lp);
win.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
updateButtons();
- show();
+ try {
+ show();
+ } catch (Exception e) {
+ Log.e("AbsSymDialog", "Cannot create Dialog:");
+ Log.e("AbsSymDialog", Arrays.toString(e.getStackTrace()));
+ }
}
}
diff --git a/src/org/nyanya/android/traditionalt9/AddWordAct.java b/src/org/nyanya/android/traditionalt9/AddWordAct.java
index 405de26b..e8946fe6 100644
--- a/src/org/nyanya/android/traditionalt9/AddWordAct.java
+++ b/src/org/nyanya/android/traditionalt9/AddWordAct.java
@@ -1,52 +1,87 @@
package org.nyanya.android.traditionalt9;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
import android.os.Bundle;
import android.app.Activity;
+import android.preference.PreferenceManager;
import android.util.Log;
import android.view.Menu;
import android.view.View;
import android.widget.EditText;
+import android.widget.Toast;
public class AddWordAct extends Activity {
View main;
+ int lang;
+ SharedPreferences pref;
+ String origword;
@Override
protected void onCreate(Bundle savedData) {
super.onCreate(savedData);
View v = getLayoutInflater().inflate(R.layout.addwordview, null);
EditText et = (EditText) v.findViewById(R.id.add_word_text);
- String word = getIntent().getStringExtra("org.nyanya.android.traditionalt9.word");
+ Intent i = getIntent();
+ origword = i.getStringExtra("org.nyanya.android.traditionalt9.word");
+
+ lang = i.getIntExtra("org.nyanya.android.traditionalt9.lang", -1);
+ if (lang == -1) {
+ Log.e("AddWordAct.onCreate", "lang is invalid. How?");
+ }
// Log.d("AddWord", "data.get: " + word);
- et.setText(word);
- et.setSelection(word.length());
+ et.setText(origword);
+ et.setSelection(origword.length());
setContentView(v);
main = v;
+ pref = PreferenceManager.getDefaultSharedPreferences(this);
}
public void addWordButton(View v) {
EditText et = (EditText) main.findViewById(R.id.add_word_text);
// Log.d("AddWordAct", "adding word: " + et.getText());
- if (TraditionalT9.ghettoaccess == null) {
- Log.e("AddWordAct.addWordbutton", "ghettoaccess is null? Oh no.");
- } else {
- TraditionalT9.ghettoaccess.doAddWord(et.getText().toString());
- }
+ doAddWord(et.getText().toString());
this.finish();
}
+ public void doAddWord(String text) {
+ T9DB db = T9DB.getInstance(this);
+ try {
+ db.addWord(text, lang);
+ } catch (DBException e) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ String msg = e.getMessage();
+ //Log.e("AddWord.doAddWord", msg);
+ builder.setMessage(msg).setTitle(R.string.add_word)
+ .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.dismiss();
+ }
+ });
+ AlertDialog dialog = builder.create();
+// Window win = dialog.getWindow();
+// WindowManager.LayoutParams lp = win.getAttributes();
+// lp.token = getWindow().getWindow().getDecorView().getWindowToken();
+// lp.type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
+// win.setAttributes(lp);
+// win.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+ dialog.show();
+ }
+ SharedPreferences.Editor prefedit = pref.edit();
+ prefedit.putString("last_word", text);
+ prefedit.commit();
+ }
+
+
public void cancelButton(View v) {
// Log.d("AddWordAct", "Cancelled...");
- // TraditionalT9.ghettoaccess.addCancel();
this.finish();
}
- @Override
- public void onStop() {
- TraditionalT9.ghettoaccess.addCancel();
- super.onStop();
- }
-
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
diff --git a/src/org/nyanya/android/traditionalt9/CandidateView.java b/src/org/nyanya/android/traditionalt9/CandidateView.java
index 1d547943..9d69958a 100644
--- a/src/org/nyanya/android/traditionalt9/CandidateView.java
+++ b/src/org/nyanya/android/traditionalt9/CandidateView.java
@@ -46,16 +46,15 @@ public class CandidateView extends View {
/**
* Construct a CandidateView for showing suggested words for completion.
- *
+ *
* @param context
- * @param attrs
*/
public CandidateView(Context context) {
super(context);
mSelectionHighlight = context.getResources().getDrawable(
android.R.drawable.list_selector_background);
- mSelectionHighlight.setState(new int[] {
- android.R.attr.state_enabled, android.R.attr.state_focused,
+ mSelectionHighlight.setState(new int[] {
+ android.R.attr.state_enabled, android.R.attr.state_focused,
android.R.attr.state_window_focused, android.R.attr.state_pressed });
Resources r = context.getResources();
diff --git a/src/org/nyanya/android/traditionalt9/CharMap.java b/src/org/nyanya/android/traditionalt9/CharMap.java
index 13c78fe9..e24e89cd 100644
--- a/src/org/nyanya/android/traditionalt9/CharMap.java
+++ b/src/org/nyanya/android/traditionalt9/CharMap.java
@@ -1,5 +1,6 @@
package org.nyanya.android.traditionalt9;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Locale;
@@ -8,77 +9,101 @@ import java.util.Map;
import android.util.Log;
public class CharMap {
- protected static final Map CHARTABLE;
+ protected static final ArrayList> CHARTABLE = new ArrayList>(2);
static {
- Map aMap = new HashMap();
- aMap.put('.', 1); aMap.put(',', 1); aMap.put('!', 1); aMap.put('?', 1);
- aMap.put('-', 1); aMap.put('"', 1); aMap.put('\'', 1); aMap.put('@', 1);
- aMap.put('#', 1); aMap.put('$', 1); aMap.put('%', 1); aMap.put('&', 1);
- aMap.put('*', 1); aMap.put('(', 1); aMap.put(')', 1); aMap.put('1', 1);
- aMap.put(':', 1); aMap.put(';', 1); aMap.put('/', 1); aMap.put('\\', 1);
- aMap.put('+', 1); aMap.put('=', 1); aMap.put('<', 1); aMap.put('>', 1);
- aMap.put('[', 1); aMap.put(']', 1); aMap.put('{', 1); aMap.put('}', 1);
- aMap.put('^', 1); aMap.put('|', 1); aMap.put('_', 1); aMap.put('~', 1);
- aMap.put('`', 1);
- aMap.put('a', 2); aMap.put('\u00e1', 2); aMap.put('\u00e4', 2);
- aMap.put('\u00e2', 2); aMap.put('\u00e0', 2); aMap.put('\u00e5', 2);
- aMap.put('b', 2); aMap.put('c', 2); aMap.put('\u00e7', 2);
- aMap.put('2', 2); aMap.put('d', 3); aMap.put('e', 3);
- aMap.put('\u00e9', 3); aMap.put('\u00eb', 3); aMap.put('\u00e8', 3);
- aMap.put('\u00ea', 3); aMap.put('f', 3); aMap.put('3', 3);
- aMap.put('g', 4); aMap.put('h', 4); aMap.put('i', 4);
- aMap.put('\u00ed', 4); aMap.put('\u00ef', 4); aMap.put('4', 4);
- aMap.put('j', 5); aMap.put('k', 5); aMap.put('l', 5);
- aMap.put('5', 5); aMap.put('m', 6); aMap.put('n', 6);
- aMap.put('\u00f1', 6); aMap.put('o', 6); aMap.put('\u00f3', 6);
- aMap.put('\u00f6', 6); aMap.put('\u00f4', 6); aMap.put('\u00fb', 6);
- aMap.put('6', 6); aMap.put('p', 7); aMap.put('q', 7);
- aMap.put('r', 7); aMap.put('s', 7); aMap.put('7', 7);
- aMap.put('t', 8); aMap.put('u', 8); aMap.put('\u00fc', 8);
- aMap.put('v', 8); aMap.put('8', 8); aMap.put('w', 9);
- aMap.put('x', 9); aMap.put('y', 9); aMap.put('z', 9);
- aMap.put('9', 9); aMap.put('+', 0); aMap.put('0', 0);
- CHARTABLE = Collections.unmodifiableMap(aMap);
+ Map enMap = new HashMap();
+ enMap.put('.', 1); enMap.put(',', 1); enMap.put('!', 1); enMap.put('?', 1);
+ enMap.put('-', 1); enMap.put('"', 1); enMap.put('\'', 1); enMap.put('@', 1);
+ enMap.put('#', 1); enMap.put('$', 1); enMap.put('%', 1); enMap.put('&', 1);
+ enMap.put('*', 1); enMap.put('(', 1); enMap.put(')', 1); enMap.put('1', 1);
+ enMap.put(':', 1); enMap.put(';', 1); enMap.put('/', 1); enMap.put('\\', 1);
+ enMap.put('+', 1); enMap.put('=', 1); enMap.put('<', 1); enMap.put('>', 1);
+ enMap.put('[', 1); enMap.put(']', 1); enMap.put('{', 1); enMap.put('}', 1);
+ enMap.put('^', 1); enMap.put('|', 1); enMap.put('_', 1); enMap.put('~', 1);
+ enMap.put('`', 1);
+ enMap.put('a', 2); enMap.put('\u00e1', 2); enMap.put('\u00e4', 2);
+ enMap.put('\u00e2', 2); enMap.put('\u00e0', 2); enMap.put('\u00e5', 2);
+ enMap.put('b', 2); enMap.put('c', 2); enMap.put('\u00e7', 2);
+ enMap.put('2', 2); enMap.put('d', 3); enMap.put('e', 3);
+ enMap.put('\u00e9', 3); enMap.put('\u00eb', 3); enMap.put('\u00e8', 3);
+ enMap.put('\u00ea', 3); enMap.put('f', 3); enMap.put('3', 3);
+ enMap.put('g', 4); enMap.put('h', 4); enMap.put('i', 4);
+ enMap.put('\u00ed', 4); enMap.put('\u00ef', 4); enMap.put('4', 4);
+ enMap.put('j', 5); enMap.put('k', 5); enMap.put('l', 5);
+ enMap.put('5', 5); enMap.put('m', 6); enMap.put('n', 6);
+ enMap.put('\u00f1', 6); enMap.put('o', 6); enMap.put('\u00f3', 6);
+ enMap.put('\u00f6', 6); enMap.put('\u00f4', 6); enMap.put('\u00fb', 6);
+ enMap.put('6', 6); enMap.put('p', 7); enMap.put('q', 7);
+ enMap.put('r', 7); enMap.put('s', 7); enMap.put('7', 7);
+ enMap.put('t', 8); enMap.put('u', 8); enMap.put('\u00fc', 8);
+ enMap.put('v', 8); enMap.put('8', 8); enMap.put('w', 9);
+ enMap.put('x', 9); enMap.put('y', 9); enMap.put('z', 9);
+ enMap.put('9', 9); enMap.put('+', 0); enMap.put('0', 0);
+ CHARTABLE.add(0, Collections.unmodifiableMap(enMap));
+
+ Map ruMap = new HashMap();
+ ruMap.put('.', 1); ruMap.put(',', 1); ruMap.put('!', 1); ruMap.put('?', 1);
+ ruMap.put('-', 1); ruMap.put('"', 1); ruMap.put('\'', 1); ruMap.put('@', 1);
+ ruMap.put('#', 1); ruMap.put('$', 1); ruMap.put('%', 1); ruMap.put('&', 1);
+ ruMap.put('*', 1); ruMap.put('(', 1); ruMap.put(')', 1); ruMap.put('1', 1);
+ ruMap.put(':', 1); ruMap.put(';', 1); ruMap.put('/', 1); ruMap.put('\\', 1);
+ ruMap.put('+', 1); ruMap.put('=', 1); ruMap.put('<', 1); ruMap.put('>', 1);
+ ruMap.put('[', 1); ruMap.put(']', 1); ruMap.put('{', 1); ruMap.put('}', 1);
+ ruMap.put('^', 1); ruMap.put('|', 1); ruMap.put('_', 1); ruMap.put('~', 1);
+ ruMap.put('`', 1); ruMap.put('1', 1);
+ ruMap.put('а', 2); ruMap.put('б', 2); ruMap.put('в', 2); ruMap.put('г', 2);
+ ruMap.put('2', 2);
+ ruMap.put('д', 3); ruMap.put('е', 3); ruMap.put('ё', 3); ruMap.put('ж', 3);
+ ruMap.put('з', 3); ruMap.put('3', 3);
+ ruMap.put('и', 4); ruMap.put('й', 4); ruMap.put('к', 4); ruMap.put('л', 4);
+ ruMap.put('4', 4);
+ ruMap.put('м', 5); ruMap.put('н', 5); ruMap.put('о', 5); ruMap.put('п', 5);
+ ruMap.put('5', 5);
+ ruMap.put('р', 6); ruMap.put('с', 6); ruMap.put('т', 6); ruMap.put('у', 6);
+ ruMap.put('6', 6);
+ ruMap.put('ф', 7); ruMap.put('х', 7); ruMap.put('ц', 7); ruMap.put('ч', 7);
+ ruMap.put('7', 7);
+ ruMap.put('ш', 8); ruMap.put('щ', 8); ruMap.put('ъ', 8); ruMap.put('ы', 8);
+ ruMap.put('8', 8);
+ ruMap.put('ь', 9); ruMap.put('э', 9); ruMap.put('ю', 9); ruMap.put('я', 9);
+ ruMap.put('9', 9);
+ ruMap.put('+', 0); ruMap.put('0', 0);
+ CHARTABLE.add(1, Collections.unmodifiableMap(ruMap));
}
- protected static final char[][] T9TABLE = { { '0', '+' },
- { '.', ',', '!', '?', '-', '"', '\'', '@', '#', '$', '%', '&', '*', '(', ')', '1' },
- { 'a', 'b', 'c', 'A', 'B', 'C', '2' }, { 'd', 'e', 'f', 'D', 'E', 'F', '3' },
- { 'g', 'h', 'i', 'G', 'H', 'I', '4' }, { 'j', 'k', 'l', 'J', 'K', 'L', '5' },
- { 'm', 'n', 'o', 'M', 'N', 'O', '6' }, { 'p', 'q', 'r', 's', 'P', 'Q', 'R', 'S', '7' },
- { 't', 'u', 'v', 'T', 'U', 'V', '8' }, { 'w', 'x', 'y', 'z', 'W', 'X', 'Y', 'Z', '9' },
- { ' ', '\n' } };
- protected static final int[] T9CAPSTART = { 0, 0, 3, 3, 3, 3, 3, 4, 3, 4, 0 };
+ protected static final char[][] ENT9TABLE = { { '0', '+' },
+ { '.', ',', '?', '!', '"', '\'', '-', '@', '$', '%', '&', '*', '(', ')', '_', '1' },
+ { 'a', 'b', 'c', 'A', 'B', 'C', '2' }, { 'd', 'e', 'f', 'D', 'E', 'F', '3' },
+ { 'g', 'h', 'i', 'G', 'H', 'I', '4' }, { 'j', 'k', 'l', 'J', 'K', 'L', '5' },
+ { 'm', 'n', 'o', 'M', 'N', 'O', '6' }, { 'p', 'q', 'r', 's', 'P', 'Q', 'R', 'S', '7' },
+ { 't', 'u', 'v', 'T', 'U', 'V', '8' }, { 'w', 'x', 'y', 'z', 'W', 'X', 'Y', 'Z', '9' },
+ { ' ', '\n' } };
+ protected static final char[][] RUT9TABLE = { { '0', '+' },
+ { '.', ',', '?', '!', '"', '\'', '-', '@', '$', '%', '&', '*', '(', ')', '_', '1' },
+ { 'а', 'б', 'в', 'г', 'А', 'Б', 'В', 'Г', '2' }, { 'д', 'е', 'ё', 'ж', 'з', 'Д', 'Е', 'Ё', 'Ж', 'З', '3' },
+ { 'и', 'й', 'к', 'л', 'И', 'Й', 'К', 'Л', '4' }, { 'м', 'н', 'о', 'п', 'М', 'Н', 'О', 'П', '5' },
+ { 'р', 'с', 'т', 'у', 'Р', 'С', 'Т', 'У', '6' }, { 'ф', 'х', 'ц', 'ч', 'Ф', 'Х', 'Ц', 'Ч', '7' },
+ { 'ш', 'щ', 'ъ', 'ы', 'Ш', 'Щ', 'Ъ', 'Ы', '8' }, { 'ь', 'э', 'ю', 'я', 'Ь', 'Э', 'Ю', 'Я', '9' },
+ { ' ', '\n' } };
+ protected static final char[][][] T9TABLE = {ENT9TABLE, RUT9TABLE};
- protected static int[] getSequence(String word) {
- int[] intseq = new int[word.length()];
- String tword = word.toLowerCase(Locale.ENGLISH);
- for (int i = 0; i < word.length(); i++) {
- char c = tword.charAt(i);
- Integer z = CharMap.CHARTABLE.get(c);
- if (z == null) {
- Log.e("getSequence",
- "ERROR: " + (int) c + " NOT FOUND (" + Integer.toHexString((int) c) + ")");
- throw new NullPointerException();
- }
- intseq[i] = z;
- }
- return intseq;
- }
+ protected static final int[] ENT9CAPSTART = { 0, 0, 3, 3, 3, 3, 3, 4, 3, 4, 0 };
+ protected static final int [] RUT9CAPSTART = {0, 0, 4, 5, 4, 4, 4, 4, 4, 4, 0};
+ protected static final int[][] T9CAPSTART = {ENT9CAPSTART, RUT9CAPSTART};
- protected static String getStringSequence(String word) {
- StringBuilder seq = new StringBuilder();
- String tword = word.toLowerCase(Locale.ENGLISH);
- for (int i = 0; i < word.length(); i++) {
- char c = tword.charAt(i);
- Integer z = CharMap.CHARTABLE.get(c);
- if (z == null) {
- Log.e("getStringSequence",
- "ERROR: " + (int) c + " NOT FOUND (" + Integer.toHexString((int) c) + ")");
- throw new NullPointerException();
- }
- seq.append(z.toString());
- }
- return seq.toString();
- }
+ protected static String getStringSequence(String word, int lang) {
+ StringBuilder seq = new StringBuilder();
+ String tword = word.toLowerCase(LangHelper.LOCALES[lang]);
+ for (int i = 0; i < word.length(); i++) {
+ char c = tword.charAt(i);
+ Integer z = CharMap.CHARTABLE.get(lang).get(c);
+ if (z == null) {
+ Log.e("getStringSequence",
+ "ERROR: " + (int) c + " NOT FOUND FOR [" + lang + "] (" + Integer.toHexString((int) c) + ") Index: " + i);
+ throw new NullPointerException();
+ }
+ seq.append(z.toString());
+ }
+ return seq.toString();
+ }
}
diff --git a/src/org/nyanya/android/traditionalt9/DBUpdateService.java b/src/org/nyanya/android/traditionalt9/DBUpdateService.java
new file mode 100644
index 00000000..93236b05
--- /dev/null
+++ b/src/org/nyanya/android/traditionalt9/DBUpdateService.java
@@ -0,0 +1,71 @@
+package org.nyanya.android.traditionalt9;
+
+import android.app.IntentService;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.database.sqlite.SQLiteDatabase;
+import android.os.Handler;
+import android.util.Log;
+import android.widget.Toast;
+
+public class DBUpdateService extends IntentService {
+ private static final int UPDATING_NOTIFICATION_ID = 9640142;
+
+ private Handler mHandler;
+
+ // http://stackoverflow.com/a/20690225
+ public class DisplayToast implements Runnable {
+ private final Context mContext;
+ CharSequence mText;
+
+ public DisplayToast(Context mContext, CharSequence text){
+ this.mContext = mContext;
+ mText = text;
+ }
+
+ public void run(){
+ Toast.makeText(mContext, mText, Toast.LENGTH_SHORT).show();
+ }
+ }
+
+
+ public DBUpdateService() {
+ super("DBUpdateService");
+ mHandler = new Handler();
+ }
+
+ /**
+ * The IntentService calls this method from the default worker thread with
+ * the intent that started the service. When this method returns, IntentService
+ * stops the service, as appropriate.
+ */
+ @Override
+ protected void onHandleIntent(Intent intent) {
+ // do things
+ T9DB dbhelper = T9DB.getInstance(this);
+ if (dbhelper.getSQLDB(this) != null) {
+ return;
+ }
+ Log.d("T9DBUpdate.onHandle", "Update pass check.");
+ // do real things
+ Notification notification = new Notification(R.drawable.ime_en_lang_lower, getText(R.string.updating_database_title),
+ System.currentTimeMillis());
+ Intent notificationIntent = new Intent(this, DBUpdateService.class);
+ PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
+ notification.setLatestEventInfo(this, getText(R.string.updating_database_title),
+ getText(R.string.updating_database), pendingIntent);
+ startForeground(UPDATING_NOTIFICATION_ID, notification);
+
+
+
+ //put this in a thread
+ mHandler.post(new DisplayToast(this, getText(R.string.updating_database)));
+
+ SQLiteDatabase tdb = dbhelper.getWritableDatabase();
+ dbhelper.setSQLDB(tdb);
+ mHandler.post(new DisplayToast(this, getText(R.string.updating_database_done)));
+ Log.d("T9DBUpdate.onHandle", "done.");
+ }
+}
diff --git a/src/org/nyanya/android/traditionalt9/InterfaceHandler.java b/src/org/nyanya/android/traditionalt9/InterfaceHandler.java
index 6cf7d7c8..d0e1fae4 100644
--- a/src/org/nyanya/android/traditionalt9/InterfaceHandler.java
+++ b/src/org/nyanya/android/traditionalt9/InterfaceHandler.java
@@ -126,8 +126,7 @@ public class InterfaceHandler implements View.OnClickListener, View.OnLongClickL
parent.showAddWord();
break;
case R.id.main_right:
- ((InputMethodManager) parent.getSystemService(Context.INPUT_METHOD_SERVICE))
- .showInputMethodPicker();
+ parent.launchOptions();
break;
default:
return false;
diff --git a/src/org/nyanya/android/traditionalt9/LangHelper.java b/src/org/nyanya/android/traditionalt9/LangHelper.java
new file mode 100644
index 00000000..fef38d33
--- /dev/null
+++ b/src/org/nyanya/android/traditionalt9/LangHelper.java
@@ -0,0 +1,34 @@
+package org.nyanya.android.traditionalt9;
+
+import java.util.Locale;
+
+public class LangHelper {
+ protected static final Locale RUSSIAN = new Locale("ru","RU");
+ protected static final int EN = 0;
+ protected static final int RU = 1;
+ protected static final Locale[] LOCALES = {Locale.ENGLISH, RUSSIAN};
+ protected static final String[] LANGS = {"EN", "RU"};
+
+ protected static final int NLANGS = LANGS.length;
+
+ protected static String getString(int lang) {
+ return LANGS[lang];
+ }
+
+ //[LANG][MODE][CAPSMODE] = iconref
+ // first group en, first line LANG, second line TEXT, last line NUM
+ protected static final int[][][] ICONMAP = {
+ {
+ //English resources
+ {R.drawable.ime_en_lang_lower, R.drawable.ime_en_lang_single, R.drawable.ime_en_lang_upper},
+ {R.drawable.ime_en_text_lower, R.drawable.ime_en_text_single, R.drawable.ime_en_text_upper},
+ {R.drawable.ime_number},
+ },
+ {
+ // Russian resources
+ {R.drawable.ime_ru_lang_lower, R.drawable.ime_ru_lang_single, R.drawable.ime_ru_lang_upper}, //LANG
+ {R.drawable.ime_ru_text_lower, R.drawable.ime_ru_text_single, R.drawable.ime_ru_text_upper}, //TEXT
+ {R.drawable.ime_number}, //NUM
+ }
+ };
+}
diff --git a/src/org/nyanya/android/traditionalt9/T9DB.java b/src/org/nyanya/android/traditionalt9/T9DB.java
index 3c81a344..59e9bb46 100644
--- a/src/org/nyanya/android/traditionalt9/T9DB.java
+++ b/src/org/nyanya/android/traditionalt9/T9DB.java
@@ -1,11 +1,16 @@
package org.nyanya.android.traditionalt9;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Iterator;
import java.util.Locale;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.app.Service;
import android.content.ContentValues;
import android.content.Context;
+import android.content.Intent;
import android.content.res.Resources;
import android.database.Cursor;
import android.database.sqlite.SQLiteConstraintException;
@@ -13,11 +18,15 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.provider.BaseColumns;
import android.util.Log;
+import android.widget.Toast;
public class T9DB {
+ private static volatile T9DB instance = null;
+ protected boolean ready = true;
+
protected static final String DATABASE_NAME = "t9dict.db";
- protected static final int DATABASE_VERSION = 1;
+ protected static final int DATABASE_VERSION = 2;
protected static final String WORD_TABLE_NAME = "word";
protected static final String FREQ_TRIGGER_NAME = "freqtrigger";
// 50k, 10k
@@ -25,11 +34,15 @@ public class T9DB {
private static final int FREQ_DIV = 10000;
protected static final String COLUMN_ID = BaseColumns._ID;
+ protected static final String COLUMN_LANG = "lang";
protected static final String COLUMN_SEQ = "seq";
-
protected static final String COLUMN_WORD = "word";
protected static final String COLUMN_FREQUENCY = "freq";
+ private static final String QUERY1 = "SELECT " + COLUMN_ID + ", " + COLUMN_WORD + " FROM " + WORD_TABLE_NAME +
+ " WHERE " + COLUMN_LANG + "=? AND " + COLUMN_SEQ + "=?" +
+ " ORDER BY " + COLUMN_FREQUENCY + " DESC";
+
private static final int MAX_RESULTS = 8;
private static final int CAPS_OFF = 0;
@@ -39,78 +52,157 @@ public class T9DB {
private DatabaseHelper mOpenHelper;
private SQLiteDatabase db;
- private Context parent;
+ private Context mContext;
public T9DB(Context caller) {
// create db
- parent = caller;
+ mContext = caller;
mOpenHelper = new DatabaseHelper(caller);
}
- public static SQLiteDatabase getSQLDB(Context caller) {
- return new DatabaseHelper(caller).getWritableDatabase();
+ public static T9DB getInstance(Context caller) {
+ if (instance == null) {
+ synchronized (T9DB.class){
+ if (instance == null) {
+ instance = new T9DB (caller);
+ instance.init();
+ }
+ }
+ }
+ return instance;
}
- public void init() {
- db = mOpenHelper.getWritableDatabase();
- // mOpenHelper.onUpgrade(db, 0, DATABASE_VERSION);
+ public static SQLiteDatabase getSQLDB(Context caller) {
+ T9DB t9dbhelper = getInstance(caller);
+ //Log.d("T9DB.getSQLDB", "db:" + t9dbhelper.db.isOpen());
+ return t9dbhelper.db;
+ }
+
+ private void init() {
+ if (mOpenHelper.needsUpgrading() ) {
+ ready = false;
+ Log.i("T9.init", "needsUpgrading");
+ // start updating service
+ if (db != null) {
+ try {
+ db.close();
+ } catch (NullPointerException e) { }
+ db = null;
+ }
+ Intent intent = new Intent(mContext, DBUpdateService.class);
+ Log.i("T9.init", "Invoking update service...");
+ mContext.startService(intent);
+
+ } else {
+ db = mOpenHelper.getWritableDatabase();
+ }
+ }
+
+ protected boolean checkReady() {
+ if (ready) {
+ if (db == null) {
+ db = getWritableDatabase();
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ protected SQLiteDatabase getWritableDatabase() {
+ return mOpenHelper.getWritableDatabase();
+ }
+
+ protected void setSQLDB(SQLiteDatabase tdb) {
+ synchronized (T9DB.class){
+ db = tdb;
+ ready = true;
+ }
}
public void close() {
- db.close();
- }
-
- public void nuke() {
- init();
- mOpenHelper.onUpgrade(db, 0, DATABASE_VERSION);
- db.close();
+ try { db.close(); }
+ catch (NullPointerException e) { }
db = null;
}
- public void addWord(String iword) throws DBException {
- Resources r = parent.getResources();
+ public void nuke() {
+ Log.i("T9DB.nuke", "Deleting database...");
+ synchronized (T9DB.class){
+ if (db != null) {
+ db.close();
+ }
+ if (!mContext.deleteDatabase(DATABASE_NAME)) {
+ Log.e("T9DB", "Couldn't delete database.");
+ }
+ Log.i("T9DB.nuke", "Preparing database...");
+ getWritableDatabase().close();
+
+ db = null;
+ ready = true;
+ init();
+ }
+ Log.i("T9DB.nuke", "Done...");
+ }
+
+ public void addWord(String iword, int lang) throws DBException {
+ Resources r = mContext.getResources();
if (iword.equals("")) {
throw new DBException(r.getString(R.string.add_word_blank));
}
// get int sequence
String seq;
try {
- seq = CharMap.getStringSequence(iword);
+ seq = CharMap.getStringSequence(iword, lang);
} catch (NullPointerException e) {
- throw new DBException(r.getString(R.string.add_word_badchar));
+ throw new DBException(r.getString(R.string.add_word_badchar, LangHelper.LANGS[lang]));
}
// add int sequence into num table
ContentValues values = new ContentValues();
values.put(COLUMN_SEQ, seq);
+ values.put(COLUMN_LANG, lang);
// add word into word
values.put(COLUMN_WORD, iword);
values.put(COLUMN_FREQUENCY, 1);
+ if (!checkReady()) {
+ Log.e("T9DB.addWord", "not ready");
+ Toast.makeText(mContext, R.string.database_notready, Toast.LENGTH_SHORT).show();
+ return;
+ }
try {
db.insertOrThrow(WORD_TABLE_NAME, null, values);
} catch (SQLiteConstraintException e) {
- String msg = r.getString(R.string.add_word_exist1) + iword
- + r.getString(R.string.add_word_exist2);
+ String msg = r.getString(R.string.add_word_exist2, iword, LangHelper.LANGS[lang]);
Log.w("T9DB.addWord", msg);
throw new DBException(msg);
}
}
public void incrementWord(int id) {
+ if (!checkReady()) {
+ Log.e("T9DB.incrementWord", "not ready");
+ Toast.makeText(mContext, R.string.database_notready, Toast.LENGTH_SHORT).show();
+ return;
+ }
db.execSQL(
- "UPDATE " + WORD_TABLE_NAME +
- " SET " + COLUMN_FREQUENCY + " = " + COLUMN_FREQUENCY + "+ 1" +
- " WHERE " + COLUMN_ID + " = \"" + id + "\"");
- // if id's freq is greater than X we should normalise those with the
- // same seq
+ "UPDATE " + WORD_TABLE_NAME +
+ " SET " + COLUMN_FREQUENCY + " = " + COLUMN_FREQUENCY + "+ 1" +
+ " WHERE " + COLUMN_ID + " = \"" + id + "\"");
+ // if id's freq is greater than FREQ_MAX, it gets normalized with trigger
}
- protected String getWord(String is) {
+ protected String getWord(String is, int lang) {
String result = null;
- String q =
- "SELECT " + COLUMN_WORD + " FROM " + WORD_TABLE_NAME +
- " WHERE " + COLUMN_SEQ + "=?" +
- " ORDER BY " + COLUMN_FREQUENCY + " DESC";
- Cursor cur = db.rawQuery(q, new String[] { is });
+ String q =
+ "SELECT " + COLUMN_WORD + " FROM " + WORD_TABLE_NAME +
+ " WHERE " + COLUMN_LANG + "=? AND " + COLUMN_SEQ + "=?" +
+ " ORDER BY " + COLUMN_FREQUENCY + " DESC";
+ if (!checkReady()) {
+ Log.e("T9DB.getWord", "not ready");
+ Toast.makeText(mContext, R.string.database_notready, Toast.LENGTH_SHORT).show();
+ return "";
+ }
+ Cursor cur = db.rawQuery(q, new String[] { is, String.valueOf(lang) });
int hits = 0;
if (cur.moveToFirst()) {
result = cur.getString(0);
@@ -122,15 +214,15 @@ public class T9DB {
int islen = is.length();
char c = is.charAt(islen - 1);
c++;
- q = "SELECT " + COLUMN_WORD + " FROM " + WORD_TABLE_NAME +
- " WHERE " + COLUMN_SEQ + " >= '" + is + "1" + "' AND " + COLUMN_SEQ + " < '"
- + is.substring(0, islen - 1) + c + "'" +
- " ORDER BY " + COLUMN_FREQUENCY + " DESC, " + COLUMN_SEQ + " ASC" +
- " LIMIT " + (MAX_RESULTS - hits);
- cur = db.rawQuery(q, null);
+ q = "SELECT " + COLUMN_WORD + " FROM " + WORD_TABLE_NAME +
+ " WHERE " + COLUMN_LANG + "=? AND " + COLUMN_SEQ + " >= '" + is + "1" +
+ "' AND " + COLUMN_SEQ + " < '" + is.substring(0, islen - 1) + c + "'" +
+ " ORDER BY " + COLUMN_FREQUENCY + " DESC, " + COLUMN_SEQ + " ASC" +
+ " LIMIT " + (MAX_RESULTS - hits);
+ cur = db.rawQuery(q, new String[] { String.valueOf(lang) });
if (cur.moveToFirst()) {
- result = cur.getString(1);
+ result = cur.getString(0);
}
if (result == null) {
result = "";
@@ -139,50 +231,48 @@ public class T9DB {
}
return result;
}
-
+
public void updateWords(String is, ArrayList stringList, ArrayList intList,
- int capsMode) {
+ int capsMode, int lang) {
stringList.clear();
intList.clear();
// String[] sa = packInts(stringToInts(is), true);
int islen = is.length();
- String q =
- "SELECT " + COLUMN_ID + ", " + COLUMN_WORD + " FROM " + WORD_TABLE_NAME +
- " WHERE " + COLUMN_SEQ + "=?" +
- " ORDER BY " + COLUMN_FREQUENCY + " DESC";
- Cursor cur = db.rawQuery(q, new String[] { is });
+
+ if (!checkReady()) {
+ Log.e("T9DB.updateWords", "not ready");
+ Toast.makeText(mContext, R.string.database_notready, Toast.LENGTH_SHORT).show();
+ return;
+ }
+ Cursor cur = db.rawQuery(QUERY1, new String[] { String.valueOf(lang), is });
+
int hits = 0;
for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) {
intList.add(cur.getInt(0));
stringList.add(cur.getString(1));
- if (hits >= 15) {
- break;
- }
+// if (hits >= 15) {
+// break;
+// }
hits++;
}
cur.close();
- if (hits < 4) {
+
+ // TODO: profile this and if it takes too long to only do it when hits is super low...
+ if (hits < 10) {
char c = is.charAt(islen - 1);
c++;
- // q = "SELECT " + COLUMN_WORD +", " + COLUMN_FREQUENCY +
- // " FROM " + WORD_TABLE_NAME +
- // " WHERE " + COLUMN_SEQ + " LIKE ?" +
- // " ORDER BY " + COLUMN_SEQ + " ASC, " + COLUMN_FREQUENCY +
- // " DESC;";
- // c = db.rawQuery(q, new String[] {is + "_%"});
- // above is hella slow below is gotta query fast
- q = "SELECT " + COLUMN_ID + ", " + COLUMN_WORD +
- " FROM " + WORD_TABLE_NAME +
- " WHERE " + COLUMN_SEQ + " >= '" + is + "1" + "' AND " + COLUMN_SEQ + " < '"
- + is.substring(0, islen - 1) + c + "'" +
- " ORDER BY " + COLUMN_FREQUENCY + " DESC, " + COLUMN_SEQ + " ASC" +
- " LIMIT " + (MAX_RESULTS - hits);
- cur = db.rawQuery(q, null);
+ String q = "SELECT " + COLUMN_ID + ", " + COLUMN_WORD +
+ " FROM " + WORD_TABLE_NAME +
+ " WHERE " + COLUMN_LANG + "=? AND " + COLUMN_SEQ + " >= '" + is + "1" +
+ "' AND " + COLUMN_SEQ + " < '" + is.substring(0, islen - 1) + c + "'" +
+ " ORDER BY " + COLUMN_FREQUENCY + " DESC, " + COLUMN_SEQ + " ASC" +
+ " LIMIT " + (MAX_RESULTS - hits);
+ cur = db.rawQuery(q, new String[] { String.valueOf(lang) });
for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) {
intList.add(cur.getInt(0));
stringList.add(cur.getString(1));
- if (hits >= 10) {
+ if (hits >= 20) {
break;
}
hits++;
@@ -203,36 +293,36 @@ public class T9DB {
while (iter.hasNext()) {
word = iter.next();
switch (capsMode) {
- case CAPS_ALL:
- wordtemp = word.toUpperCase(Locale.US);
- if (wordtemp.equals(word)) {
- index++;
- continue;
- } else if (stringList.contains(wordtemp)) {
- // remove this entry
- iter.remove();
- removed = true;
- } else {
- stringList.set(index, wordtemp);
- }
- break;
- case CAPS_SINGLE:
- if (word.length() > 1) {
- wordtemp = word.substring(0, 1).toUpperCase(Locale.US) + word.substring(1);
- } else {
- wordtemp = word.toUpperCase(Locale.US);
- }
- if (wordtemp.equals(word)) {
- index++;
- continue;
- } else if (stringList.contains(wordtemp)) {
- // remove this entry
- iter.remove();
- removed = true;
- } else {
- stringList.set(index, wordtemp);
- }
- break;
+ case CAPS_ALL:
+ wordtemp = word.toUpperCase(LangHelper.LOCALES[lang]);
+ if (wordtemp.equals(word)) {
+ index++;
+ continue;
+ } else if (stringList.contains(wordtemp)) {
+ // remove this entry
+ iter.remove();
+ removed = true;
+ } else {
+ stringList.set(index, wordtemp);
+ }
+ break;
+ case CAPS_SINGLE:
+ if (word.length() > 1) {
+ wordtemp = word.substring(0, 1).toUpperCase(LangHelper.LOCALES[lang]) + word.substring(1);
+ } else {
+ wordtemp = word.toUpperCase(LangHelper.LOCALES[lang]);
+ }
+ if (wordtemp.equals(word)) {
+ index++;
+ continue;
+ } else if (stringList.contains(wordtemp)) {
+ // remove this entry
+ iter.remove();
+ removed = true;
+ } else {
+ stringList.set(index, wordtemp);
+ }
+ break;
}
if (removed) {
intList.remove(index);
@@ -241,21 +331,27 @@ public class T9DB {
index++;
}
}
+ //Log.d("T9DB.updateWords", "i:" + is + " words:" + Arrays.toString(stringList.toArray()));
return;
}
protected void updateWordsW(String is, ArrayList stringList,
- ArrayList intList, ArrayList freq) {
+ ArrayList intList, ArrayList freq, int lang) {
stringList.clear();
intList.clear();
freq.clear();
// String[] sa = packInts(stringToInts(is), true);
int islen = is.length();
- String q = "SELECT " + COLUMN_ID + ", " + COLUMN_WORD + ", " + COLUMN_FREQUENCY +
- " FROM " + WORD_TABLE_NAME +
- " WHERE " + COLUMN_SEQ + "=?" +
- " ORDER BY " + COLUMN_FREQUENCY + " DESC";
- Cursor cur = db.rawQuery(q, new String[] { is });
+ String q = "SELECT " + COLUMN_ID + ", " + COLUMN_WORD + ", " + COLUMN_FREQUENCY +
+ " FROM " + WORD_TABLE_NAME +
+ " WHERE " + COLUMN_LANG + "=? AND " + COLUMN_SEQ + "=?" +
+ " ORDER BY " + COLUMN_FREQUENCY + " DESC";
+ if (!checkReady()) {
+ Log.e("T9DB.updateWordsW", "not ready");
+ Toast.makeText(mContext, R.string.database_notready, Toast.LENGTH_SHORT).show();
+ return;
+ }
+ Cursor cur = db.rawQuery(q, new String[] { is, String.valueOf(lang) });
int hits = 0;
for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) {
intList.add(cur.getInt(0));
@@ -270,20 +366,13 @@ public class T9DB {
if (hits < 4) {
char c = is.charAt(islen - 1);
c++;
- // q = "SELECT " + COLUMN_WORD +", " + COLUMN_FREQUENCY +
- // " FROM " + WORD_TABLE_NAME +
- // " WHERE " + COLUMN_SEQ + " LIKE ?" +
- // " ORDER BY " + COLUMN_SEQ + " ASC, " + COLUMN_FREQUENCY +
- // " DESC;";
- // c = db.rawQuery(q, new String[] {is + "_%"});
- // above is hella slow
- q = "SELECT " + COLUMN_ID + ", " + COLUMN_WORD + ", " + COLUMN_FREQUENCY +
- " FROM " + WORD_TABLE_NAME +
- " WHERE " + COLUMN_SEQ + " >= '" + is + "' AND " + COLUMN_SEQ
- + " < '" + is.substring(0, islen - 1) + c + "'" +
- " ORDER BY " + COLUMN_FREQUENCY + " DESC, " + COLUMN_SEQ + " ASC" +
- " LIMIT " + (MAX_RESULTS - hits);
- cur = db.rawQuery(q, null);
+ q = "SELECT " + COLUMN_ID + ", " + COLUMN_WORD + ", " + COLUMN_FREQUENCY +
+ " FROM " + WORD_TABLE_NAME +
+ " WHERE " + COLUMN_LANG + "=? AND " + COLUMN_SEQ + " >= '" + is +
+ "' AND " + COLUMN_SEQ + " < '" + is.substring(0, islen - 1) + c + "'" +
+ " ORDER BY " + COLUMN_FREQUENCY + " DESC, " + COLUMN_SEQ + " ASC" +
+ " LIMIT " + (MAX_RESULTS - hits);
+ cur = db.rawQuery(q, new String[] { String.valueOf(lang) });
for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) {
intList.add(cur.getInt(0));
@@ -301,37 +390,64 @@ public class T9DB {
private static class DatabaseHelper extends SQLiteOpenHelper {
+ Context mContext = null;
+
DatabaseHelper(Context context) {
super(context, DATABASE_NAME, null, DATABASE_VERSION);
+ mContext = context;
}
+ // partial code from parent class SQLiteOpenHelper
+ protected boolean needsUpgrading() {
+ //quick and dirty check to see if an existing database exists.
+ if (mContext.databaseList().length > 0) {
+ SQLiteDatabase db = mContext.openOrCreateDatabase(DATABASE_NAME, 0, null);
+ int version = db.getVersion();
+ db.close();
+ if (version < DATABASE_VERSION) {
+ return true;
+ }
+ else {
+ return false;
+ }
+ } else {
+ return false;
+ }
+ }
@Override
public void onCreate(SQLiteDatabase db) {
- db.execSQL("CREATE TABLE " + WORD_TABLE_NAME + " (" +
- COLUMN_ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
- COLUMN_SEQ + " TEXT, " +
- COLUMN_WORD + " TEXT UNIQUE, " +
- COLUMN_FREQUENCY + " INTEGER" + ")");
+ db.execSQL("CREATE TABLE IF NOT EXISTS " + WORD_TABLE_NAME + " (" +
+ COLUMN_ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
+ COLUMN_LANG + " INTEGER, " +
+ COLUMN_SEQ + " TEXT, " +
+ COLUMN_WORD + " TEXT, " +
+ COLUMN_FREQUENCY + " INTEGER, " +
+ "UNIQUE(" + COLUMN_LANG + ", " + COLUMN_WORD + ") )");
db.execSQL("CREATE INDEX idx ON " + WORD_TABLE_NAME + "("
- + COLUMN_SEQ + " ASC, " + COLUMN_FREQUENCY + " DESC )");
- db.execSQL("CREATE TRIGGER " + FREQ_TRIGGER_NAME +
- " AFTER UPDATE ON " + WORD_TABLE_NAME +
- " WHEN NEW." + COLUMN_FREQUENCY + " > " + FREQ_MAX +
- " BEGIN" +
+ + COLUMN_LANG + ", " + COLUMN_SEQ + " ASC, " + COLUMN_FREQUENCY + " DESC )");
+ db.execSQL("CREATE TRIGGER IF NOT EXISTS " + FREQ_TRIGGER_NAME +
+ " AFTER UPDATE ON " + WORD_TABLE_NAME +
+ " WHEN NEW." + COLUMN_FREQUENCY + " > " + FREQ_MAX +
+ " BEGIN" +
" UPDATE " + WORD_TABLE_NAME + " SET " + COLUMN_FREQUENCY + " = "
- + COLUMN_FREQUENCY + " / " + FREQ_DIV +
- " WHERE " + COLUMN_SEQ + " = NEW." + COLUMN_SEQ + ";" +
- " END;");
+ + COLUMN_FREQUENCY + " / " + FREQ_DIV +
+ " WHERE " + COLUMN_SEQ + " = NEW." + COLUMN_SEQ + ";" +
+ " END;");
}
@Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
- Log.w("T9DB", "Upgrading database from version " + oldVersion + " to " + newVersion
- + ", which will destroy all old data");
- db.execSQL("DROP TABLE IF EXISTS " + WORD_TABLE_NAME);
- db.execSQL("DROP INDEX IF EXISTS idx");
- onCreate(db);
- Log.w("T9DB", "Done.");
+ Log.i("T9DB.onUpgrade", "Upgrading database from version " + oldVersion + " to " + newVersion);
+ if (oldVersion == 1) {
+ db.execSQL("ALTER TABLE " + WORD_TABLE_NAME + " ADD COLUMN " +
+ COLUMN_LANG + " INTEGER");
+ db.execSQL("DROP INDEX IF EXISTS idx");
+ onCreate(db);
+ ContentValues updatedata = new ContentValues();
+ updatedata.put(COLUMN_LANG, 0);
+ db.update(WORD_TABLE_NAME, updatedata, null, null);
+ }
+ Log.i("T9DB.onUpgrade", "Done.");
}
}
}
diff --git a/src/org/nyanya/android/traditionalt9/TraditionalT9.java b/src/org/nyanya/android/traditionalt9/TraditionalT9.java
index 31c868fd..cfbe377a 100644
--- a/src/org/nyanya/android/traditionalt9/TraditionalT9.java
+++ b/src/org/nyanya/android/traditionalt9/TraditionalT9.java
@@ -1,16 +1,13 @@
package org.nyanya.android.traditionalt9;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
-import org.nyanya.android.traditionalt9.CandidateView;
-import org.nyanya.android.traditionalt9.R;
-
-import android.app.AlertDialog;
import android.content.Context;
-import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
import android.inputmethodservice.InputMethodService;
import android.inputmethodservice.KeyboardView;
import android.os.Handler;
@@ -20,15 +17,17 @@ import android.text.TextUtils;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
-import android.view.Window;
import android.view.WindowManager;
import android.view.inputmethod.CompletionInfo;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager;
+import android.widget.Toast;
+
+import pl.wavesoftware.widget.MultiSelectListPreference;
public class TraditionalT9 extends InputMethodService implements
- KeyboardView.OnKeyboardActionListener {
+ KeyboardView.OnKeyboardActionListener {
private CandidateView mCandidateView;
private InterfaceHandler interfacehandler = null;
@@ -45,6 +44,8 @@ public class TraditionalT9 extends InputMethodService implements
private static final int EDITING_NOSHOW = 2;
private int mEditing = NON_EDIT;
+ private boolean mGaveUpdateWarn = false;
+
private boolean mFirstPress = false;
private boolean mIgnoreDPADKeyUp = false;
@@ -59,12 +60,20 @@ public class TraditionalT9 extends InputMethodService implements
private int mPrevious;
private int mCharIndex;
+ private String mPreviousWord = "";
+
private int mCapsMode;
+ private int mLang;
+ private int mLangIndex;
+
+ private int[] mLangsAvailable = null;
+
private static final int CAPS_OFF = 0;
private static final int CAPS_SINGLE = 1;
private static final int CAPS_ALL = 2;
private final static int[] CAPS_CYCLE = { CAPS_OFF, CAPS_SINGLE, CAPS_ALL };
+ private final static int T9DELAY = 1200;
final Handler t9releasehandler = new Handler();
Runnable mt9release = new Runnable() {
@Override
@@ -75,14 +84,13 @@ public class TraditionalT9 extends InputMethodService implements
private T9DB db;
- protected static TraditionalT9 ghettoaccess;
-
- public static final int MODE_EN = 0;
+ public static final int MODE_LANG = 0;
public static final int MODE_TEXT = 1;
public static final int MODE_NUM = 2;
- private static final int[] MODE_CYCLE = { MODE_EN, MODE_TEXT, MODE_NUM };
+ private static final int[] MODE_CYCLE = { MODE_LANG, MODE_TEXT, MODE_NUM };
private int mKeyMode;
+ private SharedPreferences pref;
/**
* Main initialization of the input method component. Be sure to call to
* super class.
@@ -90,18 +98,44 @@ public class TraditionalT9 extends InputMethodService implements
@Override
public void onCreate() {
super.onCreate();
-
mPrevious = -1;
mCharIndex = 0;
- db = new T9DB(this);
- db.init();
+ db = T9DB.getInstance(this);
+
+ pref = PreferenceManager.getDefaultSharedPreferences(this);
+ buildLangs();
if (interfacehandler == null) {
interfacehandler = new InterfaceHandler(getLayoutInflater().inflate(R.layout.mainview,
- null), this);
+ null), this);
}
}
+ //build and filter Langs
+ private void buildLangs() {
+
+ int[] ia = MultiSelectListPreference.defaultunpack2Int(pref.getString("pref_lang_support", null));
+ int num = 0;
+ int i;
+ //calc size of filtered array
+ for (int x=0; x= 0 && i < LangHelper.NLANGS) {
+ num++;
+ }
+ }
+ int[] ian = new int[num];
+ int iansize = 0;
+ for (int x=0; x= 0 && i < LangHelper.NLANGS) {
+ ian[iansize] = i;
+ iansize++;
+ }
+ }
+ mLangsAvailable = ian;
+ }
+
@Override
public boolean onEvaluateInputViewShown() {
if (mEditing == EDITING_NOSHOW) {
@@ -121,7 +155,7 @@ public class TraditionalT9 extends InputMethodService implements
updateKeyMode();
View v = getLayoutInflater().inflate(R.layout.mainview, null);
interfacehandler.changeView(v);
- if (mKeyMode == MODE_EN) {
+ if (mKeyMode == MODE_LANG) {
interfacehandler.showHold(true);
} else {
interfacehandler.showHold(false);
@@ -142,7 +176,7 @@ public class TraditionalT9 extends InputMethodService implements
protected void showSymbolPage() {
if (mSymbolPopup == null) {
mSymbolPopup = new SymbolDialog(this, getLayoutInflater().inflate(R.layout.symbolview,
- null));
+ null));
}
mSymbolPopup.doShow(getWindow().getWindow().getDecorView());
}
@@ -150,52 +184,59 @@ public class TraditionalT9 extends InputMethodService implements
protected void showSmileyPage() {
if (mSmileyPopup == null) {
mSmileyPopup = new SmileyDialog(this, getLayoutInflater().inflate(R.layout.symbolview,
- null));
+ null));
}
mSmileyPopup.doShow(getWindow().getWindow().getDecorView());
}
+ private void clearState() {
+ mSuggestionStrings.clear();
+ mSuggestionInts.clear();
+ mSuggestionSym.clear();
+ mPreviousWord = "";
+ mComposing.setLength(0);
+ mComposingI.setLength(0);
+ mWordFound = true;
+ }
protected void showAddWord() {
- if (mKeyMode == MODE_EN) {
- ghettoaccess = this;
+ if (mKeyMode == MODE_LANG) {
Intent awintent = new Intent(this, AddWordAct.class);
awintent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
awintent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
awintent.putExtra("org.nyanya.android.traditionalt9.word", mComposing.toString());
+ awintent.putExtra("org.nyanya.android.traditionalt9.lang", mLang);
+ clearState();
+ InputConnection ic = getCurrentInputConnection();
+ ic.setComposingText("", 0);
+ ic.finishComposingText();
+ updateCandidates();
+ //onFinishInput();
+ mWordFound = true;
startActivity(awintent);
}
}
- public void doAddWord(String text) {
- try {
- db.addWord(text);
- } catch (DBException e) {
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setMessage(e.getMessage()).setTitle(R.string.add_word)
- .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- dialog.dismiss();
- }
- });
- AlertDialog dialog = builder.create();
- // so many ghettos to display dialogs from IME
- Window win = dialog.getWindow();
- WindowManager.LayoutParams lp = win.getAttributes();
- lp.token = getWindow().getWindow().getDecorView().getWindowToken();
- lp.type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
- win.setAttributes(lp);
- win.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
-
- dialog.show();
+ // sanitize lang and set index for cycling lang
+ // Need to check if last lang is available, if not, set index to -1 and set lang to default to 0
+ private int sanitizeLang(int lang) {
+ if (mLangsAvailable.length < 1 || lang == -1) {
+ Log.w("T9.sanitizeLang", "This shouldn't happen.");
+ return 0;
+ }
+ if (lang >= LangHelper.NLANGS) {
+ Log.w("T9.sanitizeLang", "Previous lang not supported: " + lang + " langs: " + Arrays.toString(LangHelper.LANGS));
+ return mLangsAvailable[0];
+ } else {
+ int index = Arrays.asList(mLangsAvailable).indexOf(lang);
+ if (index == -1) {
+ mLangIndex = 0;
+ return mLangsAvailable[mLangIndex];
+ } else {
+ mLangIndex = index;
+ return lang;
+ }
}
}
-
- protected void addCancel() {
- interfacehandler.showNotFound(false);
- ghettoaccess = null;
- }
-
/**
* This is the main point where we do our initialization of the input method
* to begin operating on an application. At this point we have been bound to
@@ -205,8 +246,10 @@ public class TraditionalT9 extends InputMethodService implements
@Override
public void onStartInput(EditorInfo attribute, boolean restarting) {
super.onStartInput(attribute, restarting);
- // Log.d("onStartInput", "attribute.inputType: " + attribute.inputType +
- // " restarting? " + restarting);
+// Log.d("onStartInput", "attribute.inputType: " + attribute.inputType +
+// " restarting? " + restarting);
+ //Utils.printFlags(attribute.inputType);
+
if (attribute.inputType == 0) {
// don't do anything when not in any kind of edit field.
// should also turn off input screen and stuff
@@ -220,13 +263,11 @@ public class TraditionalT9 extends InputMethodService implements
// Reset our state. We want to do this even if restarting, because
// the underlying state of the text editor could have changed in any
// way.
- mSuggestionStrings.clear();
- mSuggestionInts.clear();
- mSuggestionSym.clear();
- mComposing.setLength(0);
- mComposingI.setLength(0);
+ clearState();
+
+ buildLangs();
+ mLang = sanitizeLang(pref.getInt("last_lang", 0));
- SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
updateCandidates();
if (!restarting) {
@@ -238,74 +279,79 @@ public class TraditionalT9 extends InputMethodService implements
// We are now going to initialize our state based on the type of
// text being edited.
switch (attribute.inputType & InputType.TYPE_MASK_CLASS) {
- case InputType.TYPE_CLASS_NUMBER:
- case InputType.TYPE_CLASS_DATETIME:
- // Numbers and dates default to the symbols keyboard, with
- // no extra features.
- mKeyMode = MODE_NUM;
- break;
+ case InputType.TYPE_CLASS_NUMBER:
+ case InputType.TYPE_CLASS_DATETIME:
+ // Numbers and dates default to the symbols keyboard, with
+ // no extra features.
+ mKeyMode = MODE_NUM;
+ break;
- case InputType.TYPE_CLASS_PHONE:
- // Phones will also default to the symbols keyboard, though
- // often you will want to have a dedicated phone keyboard.
- mKeyMode = MODE_NUM;
- break;
+ case InputType.TYPE_CLASS_PHONE:
+ // Phones will also default to the symbols keyboard, though
+ // often you will want to have a dedicated phone keyboard.
+ mKeyMode = MODE_NUM;
+ break;
- case InputType.TYPE_CLASS_TEXT:
- // This is general text editing. We will default to the
- // normal alphabetic keyboard, and assume that we should
- // be doing predictive text (showing candidates as the
- // user types).
- mKeyMode = Integer.parseInt(pref.getString("pref_inputmode", "0"));
-
- // We now look for a few special variations of text that will
- // modify our behavior.
- int variation = attribute.inputType & InputType.TYPE_MASK_VARIATION;
- if (variation == InputType.TYPE_TEXT_VARIATION_PASSWORD
- || variation == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) {
- // Do not display predictions / what the user is typing
- // when they are entering a password.
- mKeyMode = MODE_TEXT;
- }
-
- if (variation == InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
- || variation == InputType.TYPE_TEXT_VARIATION_URI
- || variation == InputType.TYPE_TEXT_VARIATION_FILTER) {
- // Our predictions are not useful for e-mail addresses
- // or URIs.
- mKeyMode = MODE_TEXT;
- }
-
- if ((attribute.inputType & InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE) != 0) {
- // If this is an auto-complete text view, then our predictions
- // will not be shown and instead we will allow the editor
- // to supply their own. We only show the editor's
- // candidates when in fullscreen mode, otherwise relying
- // own it displaying its own UI.
- // ????
+ case InputType.TYPE_CLASS_TEXT:
+ // This is general text editing. We will default to the
+ // normal alphabetic keyboard, and assume that we should
+ // be doing predictive text (showing candidates as the
+ // user types).
mKeyMode = Integer.parseInt(pref.getString("pref_inputmode", "0"));
- }
- // handle filter list cases... do not hijack DPAD center and make
- // sure back's go through proper
- if ((attribute.inputType & InputType.TYPE_TEXT_VARIATION_FILTER) != 0) {
- mEditing = EDITING_NOSHOW;
- }
+ // We now look for a few special variations of text that will
+ // modify our behavior.
+ int variation = attribute.inputType & InputType.TYPE_MASK_VARIATION;
+ if (variation == InputType.TYPE_TEXT_VARIATION_PASSWORD
+ || variation == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) {
+ // Do not display predictions / what the user is typing
+ // when they are entering a password.
+ mKeyMode = MODE_TEXT;
+ }
- // We also want to look at the current state of the editor
- // to decide whether our alphabetic keyboard should start out
- // shifted.
- updateShiftKeyState(attribute);
- break;
+ if (variation == InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
+ || variation == InputType.TYPE_TEXT_VARIATION_URI
+ || variation == InputType.TYPE_TEXT_VARIATION_FILTER) {
+ // Our predictions are not useful for e-mail addresses
+ // or URIs.
+ mKeyMode = MODE_TEXT;
+ }
- default:
- Log.d("onStartInput", "defaulting");
- // For all unknown input types, default to the alphabetic
- // keyboard with no special features.
- updateShiftKeyState(attribute);
+ if ((attribute.inputType & InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE) != 0) {
+ // If this is an auto-complete text view, then our predictions
+ // will not be shown and instead we will allow the editor
+ // to supply their own. We only show the editor's
+ // candidates when in fullscreen mode, otherwise relying
+ // own it displaying its own UI.
+ // ????
+ mKeyMode = Integer.parseInt(pref.getString("pref_inputmode", "0"));
+ }
+
+ // handle filter list cases... do not hijack DPAD center and make
+ // sure back's go through proper
+ if ((attribute.inputType & InputType.TYPE_TEXT_VARIATION_FILTER) != 0) {
+ mEditing = EDITING_NOSHOW;
+ }
+
+ // We also want to look at the current state of the editor
+ // to decide whether our alphabetic keyboard should start out
+ // shifted.
+ updateShiftKeyState(attribute);
+ break;
+
+ default:
+ Log.d("onStartInput", "defaulting");
+ // For all unknown input types, default to the alphabetic
+ // keyboard with no special features.
+ updateShiftKeyState(attribute);
}
+ // Special case for Softbank Sharp 007SH phone book.
+ if (attribute.inputType == 65633) {
+ mKeyMode = MODE_TEXT;
+ }
+ String prevword = null;
if (attribute.privateImeOptions != null
- && attribute.privateImeOptions.equals("org.nyanya.android.traditionalt9.addword=true")) {
+ && attribute.privateImeOptions.equals("org.nyanya.android.traditionalt9.addword=true")) {
mAddingWord = true;
// mAddingSkipInput = true;
// Log.d("onStartInput", "ADDING WORD");
@@ -313,6 +359,13 @@ public class TraditionalT9 extends InputMethodService implements
} else {
mAddingWord = false;
// Log.d("onStartInput", "not adding word");
+ prevword = pref.getString("last_word", null);
+ if (prevword != null) {
+ onText(prevword);
+ Editor prefedit = pref.edit();
+ prefedit.remove("last_word");
+ prefedit.commit();
+ }
}
// Update the label on the enter key, depending on what the application
@@ -339,6 +392,9 @@ public class TraditionalT9 extends InputMethodService implements
public void onFinishInput() {
super.onFinishInput();
// Log.d("onFinishInput", "When is this called?");
+ Editor prefedit = pref.edit();
+ prefedit.putInt("last_lang", mLang);
+ prefedit.commit();
if (mEditing == EDITING) {
commitTyped();
finish();
@@ -353,8 +409,7 @@ public class TraditionalT9 extends InputMethodService implements
// Log.d("finish", "why?");
// Clear current composing text and candidates.
pickSelectedCandidate(getCurrentInputConnection());
- mComposing.setLength(0);
- mComposingI.setLength(0);
+ clearState();
// updateCandidates();
// We only hide the candidates window when finishing input on
@@ -387,14 +442,14 @@ public class TraditionalT9 extends InputMethodService implements
*/
@Override
public void onUpdateSelection(int oldSelStart, int oldSelEnd, int newSelStart, int newSelEnd,
- int candidatesStart, int candidatesEnd) {
+ int candidatesStart, int candidatesEnd) {
super.onUpdateSelection(oldSelStart, oldSelEnd, newSelStart, newSelEnd, candidatesStart,
- candidatesEnd);
+ candidatesEnd);
// If the current selection in the text view changes, we should
// clear whatever candidate text we have.
if ((mComposing.length() > 0 || mComposingI.length() > 0)
- && (newSelStart != candidatesEnd || newSelEnd != candidatesEnd)) {
+ && (newSelStart != candidatesEnd || newSelEnd != candidatesEnd)) {
mComposing.setLength(0);
mComposingI.setLength(0);
updateCandidates();
@@ -423,8 +478,8 @@ public class TraditionalT9 extends InputMethodService implements
*/
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
- // Log.d("onKeyDown", "Key: " + event + " repeat?: " +
- // event.getRepeatCount() + " long-time: " + event.isLongPress());
+// Log.d("onKeyDown", "Key: " + event + " repeat?: " +
+// event.getRepeatCount() + " long-time: " + event.isLongPress());
if (mEditing == NON_EDIT) {
// // catch for UI weirdness on up event thing
return false;
@@ -434,48 +489,48 @@ public class TraditionalT9 extends InputMethodService implements
// Log.d("onKeyDown", "Key: " + keyCode);
// TODO: remove emulator special keys
switch (keyCode) {
- case 75:
- keyCode = KeyEvent.KEYCODE_POUND;
- break;
- case 74:
- keyCode = KeyEvent.KEYCODE_STAR;
- break;
- case 72:
- keyCode = KeyEvent.KEYCODE_SOFT_RIGHT;
- break;
- case 71:
- keyCode = KeyEvent.KEYCODE_SOFT_LEFT;
- break;
+ case 75:
+ keyCode = KeyEvent.KEYCODE_POUND;
+ break;
+ case 74:
+ keyCode = KeyEvent.KEYCODE_STAR;
+ break;
+ case 72:
+ keyCode = KeyEvent.KEYCODE_SOFT_RIGHT;
+ break;
+ case 71:
+ keyCode = KeyEvent.KEYCODE_SOFT_LEFT;
+ break;
}
switch (keyCode) {
- case KeyEvent.KEYCODE_DPAD_CENTER:
- if (interfacehandler != null) {
- interfacehandler.setPressed(keyCode, true);
- } // pass-through
- case KeyEvent.KEYCODE_DPAD_DOWN:
- case KeyEvent.KEYCODE_DPAD_UP:
- case KeyEvent.KEYCODE_DPAD_LEFT:
- case KeyEvent.KEYCODE_DPAD_RIGHT:
- if (mEditing == EDITING_NOSHOW) {
- return false;
- }
- return handleDPAD(keyCode, event, true);
+ case KeyEvent.KEYCODE_DPAD_CENTER:
+ if (interfacehandler != null) {
+ interfacehandler.setPressed(keyCode, true);
+ } // pass-through
+ case KeyEvent.KEYCODE_DPAD_DOWN:
+ case KeyEvent.KEYCODE_DPAD_UP:
+ case KeyEvent.KEYCODE_DPAD_LEFT:
+ case KeyEvent.KEYCODE_DPAD_RIGHT:
+ if (mEditing == EDITING_NOSHOW) {
+ return false;
+ }
+ return handleDPAD(keyCode, event, true);
- case KeyEvent.KEYCODE_SOFT_RIGHT:
- case KeyEvent.KEYCODE_SOFT_LEFT:
- if (!isInputViewShown()) {
- return super.onKeyDown(keyCode, event);
- }
- break;
+ case KeyEvent.KEYCODE_SOFT_RIGHT:
+ case KeyEvent.KEYCODE_SOFT_LEFT:
+ if (!isInputViewShown()) {
+ return super.onKeyDown(keyCode, event);
+ }
+ break;
- case KeyEvent.KEYCODE_DEL:
- // Special handling of the delete key: if we currently are
- // composing text for the user, we want to modify that instead
- // of let the application to the delete itself.
- // if (mComposing.length() > 0) {
- onKey(keyCode, null);
- return true;
+ case KeyEvent.KEYCODE_DEL:
+ // Special handling of the delete key: if we currently are
+ // composing text for the user, we want to modify that instead
+ // of let the application to the delete itself.
+ // if (mComposing.length() > 0) {
+ onKey(keyCode, null);
+ return true;
// }
// break;
}
@@ -488,52 +543,63 @@ public class TraditionalT9 extends InputMethodService implements
t9releasehandler.removeCallbacks(mt9release);
}
switch (keyCode) {
- case KeyEvent.KEYCODE_BACK:
- // The InputMethodService already takes care of the back
- // key for us, to dismiss the input method if it is shown.
- // but we will manage it ourselves because native Android handling
- // of the input view is ... flakey at best.
- // Log.d("onKeyDown", "back pres");
- if (isInputViewShown()) {
- // Log.d("inKeyDown", "input shown");
- return true;
- }
- return false;
+ case KeyEvent.KEYCODE_BACK:
+ // The InputMethodService already takes care of the back
+ // key for us, to dismiss the input method if it is shown.
+ // but we will manage it ourselves because native Android handling
+ // of the input view is ... flakey at best.
+ // Log.d("onKeyDown", "back pres");
+ if (isInputViewShown()) {
+ // Log.d("inKeyDown", "input shown");
+ return true;
+ }
+ return false;
- case KeyEvent.KEYCODE_ENTER:
- // Let the underlying text editor always handle these.
- return false;
+ case KeyEvent.KEYCODE_ENTER:
+ // Let the underlying text editor always handle these.
+ return false;
// special case for softkeys
- case KeyEvent.KEYCODE_SOFT_RIGHT:
- case KeyEvent.KEYCODE_SOFT_LEFT:
- if (interfacehandler != null) {
- interfacehandler.setPressed(keyCode, true);
- }
- // pass-through
- case KeyEvent.KEYCODE_0:
- case KeyEvent.KEYCODE_1:
- case KeyEvent.KEYCODE_2:
- case KeyEvent.KEYCODE_3:
- case KeyEvent.KEYCODE_4:
- case KeyEvent.KEYCODE_5:
- case KeyEvent.KEYCODE_6:
- case KeyEvent.KEYCODE_7:
- case KeyEvent.KEYCODE_8:
- case KeyEvent.KEYCODE_9:
- case KeyEvent.KEYCODE_POUND:
- case KeyEvent.KEYCODE_STAR:
- event.startTracking();
- return true;
- default:
- // KeyCharacterMap.load(KeyCharacterMap.BUILT_IN_KEYBOARD).getNumber(keyCode)
- // Log.w("onKeyDown", "Unhandled Key: " + keyCode + "(" +
- // event.toString() + ")");
+ case KeyEvent.KEYCODE_SOFT_RIGHT:
+ case KeyEvent.KEYCODE_SOFT_LEFT:
+ if (interfacehandler != null) {
+ interfacehandler.setPressed(keyCode, true);
+ }
+ // pass-through
+ case KeyEvent.KEYCODE_0:
+ case KeyEvent.KEYCODE_1:
+ case KeyEvent.KEYCODE_2:
+ case KeyEvent.KEYCODE_3:
+ case KeyEvent.KEYCODE_4:
+ case KeyEvent.KEYCODE_5:
+ case KeyEvent.KEYCODE_6:
+ case KeyEvent.KEYCODE_7:
+ case KeyEvent.KEYCODE_8:
+ case KeyEvent.KEYCODE_9:
+ case KeyEvent.KEYCODE_POUND:
+ case KeyEvent.KEYCODE_STAR:
+ event.startTracking();
+ return true;
+ default:
+ // KeyCharacterMap.load(KeyCharacterMap.BUILT_IN_KEYBOARD).getNumber(keyCode)
+ // Log.w("onKeyDown", "Unhandled Key: " + keyCode + "(" +
+ // event.toString() + ")");
}
Log.w("onKeyDown", "Unhandled Key: " + keyCode + "(" + event.toString() + ")");
+ commitReset();
return super.onKeyDown(keyCode, event);
}
+ protected void launchOptions() {
+ Intent awintent = new Intent(this, TraditionalT9Settings.class);
+ awintent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ awintent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
+ if (interfacehandler != null) {
+ interfacehandler.setPressed(KeyEvent.KEYCODE_SOFT_RIGHT, false);
+ }
+ hideWindow();
+ startActivity(awintent);
+ }
@Override
public boolean onKeyLongPress(int keyCode, KeyEvent event) {
// consume since we will assume we have already handled the long press
@@ -543,60 +609,68 @@ public class TraditionalT9 extends InputMethodService implements
}
// TODO: remove emulator special keys
switch (keyCode) {
- case 75:
- keyCode = KeyEvent.KEYCODE_POUND;
- break;
- case 74:
- keyCode = KeyEvent.KEYCODE_STAR;
- break;
- case 72:
- keyCode = KeyEvent.KEYCODE_SOFT_RIGHT;
- break;
- case 71:
- keyCode = KeyEvent.KEYCODE_SOFT_LEFT;
- break;
+ case 75:
+ keyCode = KeyEvent.KEYCODE_POUND;
+ break;
+ case 74:
+ keyCode = KeyEvent.KEYCODE_STAR;
+ break;
+ case 72:
+ keyCode = KeyEvent.KEYCODE_SOFT_RIGHT;
+ break;
+ case 71:
+ keyCode = KeyEvent.KEYCODE_SOFT_LEFT;
+ break;
}
// Log.d("onLongPress", "LONG PRESS: " + keyCode);
// HANDLE SPECIAL KEYS
switch (keyCode) {
- case KeyEvent.KEYCODE_POUND:
- commitReset();
- onText("\n");
- return true;
- case KeyEvent.KEYCODE_STAR:
- if (mKeyMode != MODE_NUM) {
- showSmileyPage();
+ case KeyEvent.KEYCODE_POUND:
+ commitReset();
+ onText("\n");
return true;
- }
- break;
- case KeyEvent.KEYCODE_SOFT_LEFT:
- if (interfacehandler != null) {
- interfacehandler.setPressed(keyCode, false);
- }
- if (mKeyMode == MODE_EN) {
- if (mWordFound) {
- showAddWord();
- } else {
- showSymbolPage();
+ case KeyEvent.KEYCODE_STAR:
+ if (mKeyMode != MODE_NUM) {
+ if (mLangsAvailable.length > 1){
+ nextLang();
+ } else {
+ showSmileyPage(); // TODO: replace with lang select if lang thing
+ }
+ return true;
}
- }
- break;
- case KeyEvent.KEYCODE_SOFT_RIGHT:
- if (interfacehandler != null) {
- interfacehandler.setPressed(keyCode, false);
- }
- ((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE))
- .showInputMethodPicker();
- // show IME
- return true;
+ break;
+ case KeyEvent.KEYCODE_SOFT_LEFT:
+ if (interfacehandler != null) {
+ interfacehandler.setPressed(keyCode, false);
+ }
+ if (mKeyMode == MODE_LANG) {
+ if (mWordFound) {
+ showAddWord();
+ } else {
+ showSymbolPage();
+ }
+ }
+ break;
+ case KeyEvent.KEYCODE_SOFT_RIGHT:
+ if (interfacehandler != null) {
+ interfacehandler.setPressed(keyCode, false);
+ }
+ launchOptions();
+ // show Options
+ return true;
}
if (keyCode >= KeyEvent.KEYCODE_0 && keyCode <= KeyEvent.KEYCODE_9) {
- if (mKeyMode == MODE_EN) {
-
+ if (mKeyMode == MODE_LANG) {
+ commitTyped();
+ onText(String.valueOf(keyCode - KeyEvent.KEYCODE_0));
} else if (mKeyMode == MODE_TEXT) {
commitReset();
onText(String.valueOf(keyCode - KeyEvent.KEYCODE_0));
+ } else if (mKeyMode == MODE_NUM) {
+ if (keyCode == KeyEvent.KEYCODE_0) {
+ onText("+");
+ }
}
}
return true;
@@ -609,8 +683,8 @@ public class TraditionalT9 extends InputMethodService implements
*/
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
- // Log.d("onKeyUp", "Key: " + keyCode + " repeat?: " +
- // event.getRepeatCount());
+// Log.d("onKeyUp", "Key: " + keyCode + " repeat?: " +
+// event.getRepeatCount());
if (mEditing == NON_EDIT) {
// if (mButtonClose) {
// //handle UI weirdness on up event
@@ -626,99 +700,96 @@ public class TraditionalT9 extends InputMethodService implements
// TODO: remove emulator special keys
switch (keyCode) {
- case 75:
- keyCode = KeyEvent.KEYCODE_POUND;
- break;
- case 74:
- keyCode = KeyEvent.KEYCODE_STAR;
- break;
- case 72:
- keyCode = KeyEvent.KEYCODE_SOFT_RIGHT;
- break;
- case 71:
- keyCode = KeyEvent.KEYCODE_SOFT_LEFT;
- break;
+ case 75:
+ keyCode = KeyEvent.KEYCODE_POUND;
+ break;
+ case 74:
+ keyCode = KeyEvent.KEYCODE_STAR;
+ break;
+ case 72:
+ keyCode = KeyEvent.KEYCODE_SOFT_RIGHT;
+ break;
+ case 71:
+ keyCode = KeyEvent.KEYCODE_SOFT_LEFT;
+ break;
}
switch (keyCode) {
- case KeyEvent.KEYCODE_DPAD_CENTER:
- if (interfacehandler != null) {
- interfacehandler.setPressed(keyCode, false);
- }
- case KeyEvent.KEYCODE_DPAD_DOWN:
- case KeyEvent.KEYCODE_DPAD_UP:
- case KeyEvent.KEYCODE_DPAD_LEFT:
- case KeyEvent.KEYCODE_DPAD_RIGHT:
- if (mEditing == EDITING_NOSHOW) {
- return false;
- }
- return handleDPAD(keyCode, event, false);
+ case KeyEvent.KEYCODE_DPAD_CENTER:
+ if (interfacehandler != null) {
+ interfacehandler.setPressed(keyCode, false);
+ }
+ case KeyEvent.KEYCODE_DPAD_DOWN:
+ case KeyEvent.KEYCODE_DPAD_UP:
+ case KeyEvent.KEYCODE_DPAD_LEFT:
+ case KeyEvent.KEYCODE_DPAD_RIGHT:
+ if (mEditing == EDITING_NOSHOW) {
+ return false;
+ }
+ return handleDPAD(keyCode, event, false);
- case KeyEvent.KEYCODE_SOFT_RIGHT:
- case KeyEvent.KEYCODE_SOFT_LEFT:
- if (!isInputViewShown()) {
- return super.onKeyDown(keyCode, event);
- }
- break;
+ case KeyEvent.KEYCODE_SOFT_RIGHT:
+ case KeyEvent.KEYCODE_SOFT_LEFT:
+ if (!isInputViewShown()) {
+ return super.onKeyDown(keyCode, event);
+ }
+ break;
}
- // Log.d("onKeyUp", "Key: " + keyCode);
- // Log.d("onKeyUp", "Key: " + event + " cancelled?: " +
- // event.isCanceled());
+
if (event.isCanceled()) {
return true;
}
switch (keyCode) {
- case KeyEvent.KEYCODE_BACK:
- // Log.d("onKeyUp", "back pres");
- if (isInputViewShown()) {
- // Log.d("onKeyUp", "input shown");
- hideWindow();
+ case KeyEvent.KEYCODE_BACK:
+ if (isInputViewShown()) {
+ hideWindow();
+ return true;
+ }
+ return false;
+ case KeyEvent.KEYCODE_DEL:
return true;
- }
- return false;
- case KeyEvent.KEYCODE_DEL:
- break;
- case KeyEvent.KEYCODE_ENTER:
- return false;
+ case KeyEvent.KEYCODE_ENTER:
+ return false;
// special case for softkeys
- case KeyEvent.KEYCODE_SOFT_RIGHT:
- case KeyEvent.KEYCODE_SOFT_LEFT:
- // if (mAddingWord){
- // Log.d("onKeyUp", "key: " + keyCode + " skip: " +
- // mAddingSkipInput);
- // if (mAddingSkipInput) {
- // //mAddingSkipInput = false;
- // return true;
- // }
- // }
- if (interfacehandler != null) {
- interfacehandler.setPressed(keyCode, false);
- }
- // pass-through
- case KeyEvent.KEYCODE_0:
- case KeyEvent.KEYCODE_1:
- case KeyEvent.KEYCODE_2:
- case KeyEvent.KEYCODE_3:
- case KeyEvent.KEYCODE_4:
- case KeyEvent.KEYCODE_5:
- case KeyEvent.KEYCODE_6:
- case KeyEvent.KEYCODE_7:
- case KeyEvent.KEYCODE_8:
- case KeyEvent.KEYCODE_9:
- case KeyEvent.KEYCODE_POUND:
- case KeyEvent.KEYCODE_STAR:
- // if (!isInputViewShown()){
- // Log.d("onKeyUp", "showing window.");
- // //showWindow(true);
- // }
- onKey(keyCode, null);
- return true;
- default:
- // KeyCharacterMap.load(KeyCharacterMap.BUILT_IN_KEYBOARD).getNumber(keyCode)
- Log.w("onKeyUp", "Unhandled Key: " + keyCode + "(" + event.toString() + ")");
+ case KeyEvent.KEYCODE_SOFT_RIGHT:
+ case KeyEvent.KEYCODE_SOFT_LEFT:
+ // if (mAddingWord){
+ // Log.d("onKeyUp", "key: " + keyCode + " skip: " +
+ // mAddingSkipInput);
+ // if (mAddingSkipInput) {
+ // //mAddingSkipInput = false;
+ // return true;
+ // }
+ // }
+ if (interfacehandler != null) {
+ interfacehandler.setPressed(keyCode, false);
+ }
+ // pass-through
+ case KeyEvent.KEYCODE_0:
+ case KeyEvent.KEYCODE_1:
+ case KeyEvent.KEYCODE_2:
+ case KeyEvent.KEYCODE_3:
+ case KeyEvent.KEYCODE_4:
+ case KeyEvent.KEYCODE_5:
+ case KeyEvent.KEYCODE_6:
+ case KeyEvent.KEYCODE_7:
+ case KeyEvent.KEYCODE_8:
+ case KeyEvent.KEYCODE_9:
+ case KeyEvent.KEYCODE_POUND:
+ case KeyEvent.KEYCODE_STAR:
+ // if (!isInputViewShown()){
+ // Log.d("onKeyUp", "showing window.");
+ // //showWindow(true);
+ // }
+ onKey(keyCode, null);
+ return true;
+ default:
+ // KeyCharacterMap.load(KeyCharacterMap.BUILT_IN_KEYBOARD).getNumber(keyCode)
+ Log.w("onKeyUp", "Unhandled Key: " + keyCode + "(" + event.toString() + ")");
}
+ commitReset();
return super.onKeyUp(keyCode, event);
}
@@ -732,13 +803,10 @@ public class TraditionalT9 extends InputMethodService implements
private void commitTyped(InputConnection ic) {
if (interfacehandler != null) {
interfacehandler.midButtonUpdate(false);
+ interfacehandler.showNotFound(false);
}
pickSelectedCandidate(ic);
- mComposing.setLength(0);
- mSuggestionStrings.clear();
- mSuggestionInts.clear();
- mSuggestionSym.clear();
- mComposingI.setLength(0);
+ clearState();
updateCandidates();
setCandidatesViewShown(false);
}
@@ -778,10 +846,10 @@ public class TraditionalT9 extends InputMethodService implements
private void keyDownUp(int keyEventCode) {
InputConnection ic = getCurrentInputConnection();
KeyEvent kv = KeyEvent.changeFlags(new KeyEvent(KeyEvent.ACTION_DOWN, keyEventCode),
- KeyEvent.FLAG_SOFT_KEYBOARD);
+ KeyEvent.FLAG_SOFT_KEYBOARD);
ic.sendKeyEvent(kv);
kv = KeyEvent.changeFlags(new KeyEvent(KeyEvent.ACTION_UP, keyEventCode),
- KeyEvent.FLAG_SOFT_KEYBOARD);
+ KeyEvent.FLAG_SOFT_KEYBOARD);
ic.sendKeyEvent(kv);
}
@@ -793,40 +861,40 @@ public class TraditionalT9 extends InputMethodService implements
// Log.d("onKey", "START Cm: " + mCapsMode);
// HANDLE SPECIAL KEYS
switch (keyCode) {
- case KeyEvent.KEYCODE_DEL:
- handleBackspace();
- break;
- // change case
- case KeyEvent.KEYCODE_STAR:
- if (mKeyMode == MODE_NUM) {
- handleCharacter(KeyEvent.KEYCODE_STAR);
- } else {
- handleShift();
- }
- break;
- case KeyEvent.KEYCODE_BACK:
- handleClose();
- break;
- // space
- case KeyEvent.KEYCODE_POUND:
- handleCharacter(KeyEvent.KEYCODE_POUND);
- break;
- case KeyEvent.KEYCODE_SOFT_LEFT:
- if (mWordFound) {
- showSymbolPage();
- } else {
- showAddWord();
- }
- break;
- case KeyEvent.KEYCODE_SOFT_RIGHT:
- nextKeyMode();
- break;
- default:
- if (keyCode >= KeyEvent.KEYCODE_0 && keyCode <= KeyEvent.KEYCODE_9) {
- handleCharacter(keyCode);
- } else {
- Log.e("onKey", "This shouldn't happen, unknown key");
- }
+ case KeyEvent.KEYCODE_DEL:
+ handleBackspace();
+ break;
+ // change case
+ case KeyEvent.KEYCODE_STAR:
+ if (mKeyMode == MODE_NUM) {
+ handleCharacter(KeyEvent.KEYCODE_STAR);
+ } else {
+ handleShift();
+ }
+ break;
+ case KeyEvent.KEYCODE_BACK:
+ handleClose();
+ break;
+ // space
+ case KeyEvent.KEYCODE_POUND:
+ handleCharacter(KeyEvent.KEYCODE_POUND);
+ break;
+ case KeyEvent.KEYCODE_SOFT_LEFT:
+ if (mWordFound) {
+ showSymbolPage();
+ } else {
+ showAddWord();
+ }
+ break;
+ case KeyEvent.KEYCODE_SOFT_RIGHT:
+ nextKeyMode();
+ break;
+ default:
+ if (keyCode >= KeyEvent.KEYCODE_0 && keyCode <= KeyEvent.KEYCODE_9) {
+ handleCharacter(keyCode);
+ } else {
+ Log.e("onKey", "This shouldn't happen, unknown key");
+ }
}
// Log.d("onKey", "END Cm: " + mCapsMode);
}
@@ -856,16 +924,16 @@ public class TraditionalT9 extends InputMethodService implements
}
if (mComposing.length() > 0) {
switch (mKeyMode) {
- case MODE_EN:
- commitTyped();
- break;
- case MODE_TEXT:
- commitTyped();
- charReset();
- break;
- case MODE_NUM:
- // shouldn't happen
- break;
+ case MODE_LANG:
+ commitTyped();
+ break;
+ case MODE_TEXT:
+ commitTyped();
+ charReset();
+ break;
+ case MODE_NUM:
+ // shouldn't happen
+ break;
}
} else {
hideWindow();
@@ -874,26 +942,39 @@ public class TraditionalT9 extends InputMethodService implements
/**
* Update the list of available candidates from the current composing text.
- * This will need to be filled in by however you are determining candidates.
+ * Do a lot of complicated stuffs.
*/
private void updateCandidates() {
- if (mKeyMode == MODE_EN) {
+ updateCandidates(false);
+ }
+ private void updateCandidates(boolean backspace) {
+ if (mKeyMode == MODE_LANG) {
int len = mComposingI.length();
if (len > 0) {
if (mComposingI.charAt(len - 1) == '1') {
- boolean nosuggestion = mSuggestionStrings.isEmpty();
+ boolean suggestions = !mSuggestionStrings.isEmpty();
String prefix = "";
- if (!nosuggestion) {
- prefix = mSuggestionStrings.get(mCandidateView.mSelectedIndex);
- } else if (len > 1) {
- prefix = db.getWord(mComposingI.substring(0, len - 1));
+ if (mPreviousWord.length() == 0) {
+ if (suggestions && !backspace) {
+ prefix = mPreviousWord = mSuggestionStrings.get(mCandidateView.mSelectedIndex);
+ }
+ } else {
+ if (backspace) {
+ prefix = mPreviousWord;
+ } else {
+ if (suggestions) {
+ prefix = mPreviousWord = mSuggestionStrings.get(mCandidateView.mSelectedIndex);
+ } else {
+ prefix = mPreviousWord;
+ }
+ }
}
mSuggestionInts.clear();
mSuggestionStrings.clear();
mSuggestionSym.clear();
- db.updateWords("1", mSuggestionSym, mSuggestionInts, mCapsMode);
+ db.updateWords("1", mSuggestionSym, mSuggestionInts, mCapsMode, mLang);
for (String a : mSuggestionSym) {
- if (prefix != "") {
+ if (!prefix.equals("")) {
mSuggestionStrings.add(prefix + a);
} else {
mSuggestionStrings.add(String.valueOf(a));
@@ -903,7 +984,7 @@ public class TraditionalT9 extends InputMethodService implements
}
} else {
db.updateWords(mComposingI.toString(), mSuggestionStrings, mSuggestionInts,
- mCapsMode);
+ mCapsMode, mLang);
}
if (!mSuggestionStrings.isEmpty()) {
mWordFound = true;
@@ -931,7 +1012,7 @@ public class TraditionalT9 extends InputMethodService implements
} else if (mKeyMode == MODE_TEXT) {
if (mComposing.length() > 0) {
mSuggestionStrings.clear();
- char[] ca = CharMap.T9TABLE[mPrevious];
+ char[] ca = CharMap.T9TABLE[mLang][mPrevious];
for (int i = 0; i < ca.length; i++) {
mSuggestionStrings.add(String.valueOf(ca[i]));
}
@@ -961,13 +1042,23 @@ public class TraditionalT9 extends InputMethodService implements
}
setCandidatesViewShown(false);
}
-
- if (length > 1 || length2 > 1) {
- // Log.d("BS", "comp: " + length + " compI: " + length2);
- mComposing.delete(length - 1, length);
+ if (length2 > 1) {
+ if (mComposingI.charAt(length2-1) == '1' ) {
+ // revert previous word
+ mPreviousWord = mPreviousWord.substring(0, mPreviousWord.length()-1);
+ }
mComposingI.delete(length2 - 1, length2);
- mSuggestionStrings.clear();
- updateCandidates();
+ if (length2-1 > 1) {
+ if (mComposingI.charAt(length2-2) != '1') {
+ if (mComposingI.indexOf("1") == -1) {
+ // no longer contains punctuation so we no longer care
+ mPreviousWord = "";
+ }
+ }
+ } else {
+ mPreviousWord = "";
+ }
+ updateCandidates(true);
getCurrentInputConnection().setComposingText(mComposing, 1);
} else if (length > 0 || length2 > 0) {
mComposing.setLength(0);
@@ -975,9 +1066,11 @@ public class TraditionalT9 extends InputMethodService implements
interfacehandler.midButtonUpdate(false);
interfacehandler.showNotFound(false);
mSuggestionStrings.clear();
+ mPreviousWord = "";
getCurrentInputConnection().commitText("", 0);
updateCandidates();
} else {
+ mPreviousWord = "";
keyDownUp(KeyEvent.KEYCODE_DEL);
}
updateShiftKeyState(getCurrentInputEditorInfo());
@@ -994,7 +1087,7 @@ public class TraditionalT9 extends InputMethodService implements
mCapsMode++;
}
- if (mKeyMode == MODE_EN && mComposing.length() > 0) {
+ if (mKeyMode == MODE_LANG && mComposing.length() > 0) {
updateCandidates();
getCurrentInputConnection().setComposingText(mComposing, 1);
}
@@ -1003,102 +1096,97 @@ public class TraditionalT9 extends InputMethodService implements
/**
* handle input of a character. Precondition: ONLY 0-9 AND *# ARE ALLOWED
- *
+ *
* @param keyCode
*/
private void handleCharacter(int keyCode) {
- // if (mInputView.isShifted()) {
- // primaryCode = Character.toUpperCase(primaryCode);
- // }
switch (mKeyMode) {
- case MODE_EN:
- // it begins
- // on POUND commit and space
- if (keyCode == KeyEvent.KEYCODE_POUND) {
- if (mComposing.length() > 0) {
- commitTyped();
+ case MODE_LANG:
+ // it begins
+ // on POUND commit and space
+ if (keyCode == KeyEvent.KEYCODE_POUND) {
+ if (mComposing.length() > 0) {
+ commitTyped();
+ }
+ onText(" ");
+ } else {
+ // do things
+ if (interfacehandler != null) {
+ interfacehandler.midButtonUpdate(true);
+ }
+ keyCode = keyCode - KeyEvent.KEYCODE_0;
+ mComposingI.append(keyCode);
+ updateCandidates();
+ getCurrentInputConnection().setComposingText(mComposing, 1);
}
- // Log.d("handleChar", "SENDING SPACE?");
- onText(" ");
- } else {
- // do things
- if (interfacehandler != null) {
- interfacehandler.midButtonUpdate(true);
+
+ break;
+
+ case MODE_TEXT:
+ t9releasehandler.removeCallbacks(mt9release);
+ if (keyCode == KeyEvent.KEYCODE_POUND) {
+ keyCode--;
}
keyCode = keyCode - KeyEvent.KEYCODE_0;
- mComposingI.append(keyCode);
- updateCandidates();
- getCurrentInputConnection().setComposingText(mComposing, 1);
- }
+ // Log.d("handleChar", "PRIMARY CODE (num): " + keyCode);
- break;
-
- case MODE_TEXT:
- t9releasehandler.removeCallbacks(mt9release);
- if (keyCode == KeyEvent.KEYCODE_POUND) {
- keyCode--;
- }
- keyCode = keyCode - KeyEvent.KEYCODE_0;
- // Log.d("handleChar", "PRIMARY CODE (num): " + keyCode);
-
- boolean newChar = false;
- if (mPrevious == keyCode) {
- mCharIndex++;
- } else {
- commitTyped(getCurrentInputConnection());
- // updateShiftKeyState(getCurrentInputEditorInfo());
- newChar = true;
- mCharIndex = 0;
- mPrevious = keyCode;
- }
-
- // start at caps if CapMode
- // Log.d("handleChar", "Cm: " + mCapsMode);
- if (mCharIndex == 0 && mCapsMode != CAPS_OFF) {
- mCharIndex = CharMap.T9CAPSTART[keyCode];
- }
-
- // private int mPrevious;
- // private int mCharindex;
- mComposing.setLength(0);
- mComposingI.setLength(0);
- char[] ca = CharMap.T9TABLE[keyCode];
- if (mCharIndex >= ca.length) {
- mCharIndex = 0;
- }
-
- mComposing.append(ca[mCharIndex]);
- mComposingI.append(keyCode);
- getCurrentInputConnection().setComposingText(mComposing, 1);
-
- t9releasehandler.postDelayed(mt9release, 1500);
- if (newChar) {
- // consume single caps
- if (mCapsMode == CAPS_SINGLE) {
- mCapsMode = CAPS_OFF;
+ boolean newChar = false;
+ if (mPrevious == keyCode) {
+ mCharIndex++;
+ } else {
+ commitTyped(getCurrentInputConnection());
+ // updateShiftKeyState(getCurrentInputEditorInfo());
+ newChar = true;
+ mCharIndex = 0;
+ mPrevious = keyCode;
}
- }
- updateCandidates();
- updateShiftKeyState(getCurrentInputEditorInfo());
- break;
- case MODE_NUM:
- switch (keyCode) {
- // Manual this
- case KeyEvent.KEYCODE_POUND:
- onText("#");
+ // start at caps if CapMode
+ // Log.d("handleChar", "Cm: " + mCapsMode);
+ if (mCharIndex == 0 && mCapsMode != CAPS_OFF) {
+ mCharIndex = CharMap.T9CAPSTART[mLang][keyCode];
+ }
+
+ // private int mPrevious;
+ // private int mCharindex;
+ mComposing.setLength(0);
+ mComposingI.setLength(0);
+ char[] ca = CharMap.T9TABLE[mLang][keyCode];
+ if (mCharIndex >= ca.length) {
+ mCharIndex = 0;
+ }
+
+ mComposing.append(ca[mCharIndex]);
+ mComposingI.append(keyCode);
+ getCurrentInputConnection().setComposingText(mComposing, 1);
+
+ t9releasehandler.postDelayed(mt9release, T9DELAY);
+ if (newChar) {
+ // consume single caps
+ if (mCapsMode == CAPS_SINGLE) {
+ mCapsMode = CAPS_OFF;
+ }
+ }
+ updateCandidates();
+ updateShiftKeyState(getCurrentInputEditorInfo());
break;
- case KeyEvent.KEYCODE_STAR:
- onText("*");
+
+ case MODE_NUM:
+ switch (keyCode) {
+ // Manual this
+ case KeyEvent.KEYCODE_POUND:
+ onText("#");
+ break;
+ case KeyEvent.KEYCODE_STAR:
+ onText("*");
+ break;
+ default:
+ onText(String.valueOf(keyCode - KeyEvent.KEYCODE_0));
+ }
break;
+
default:
- onText(String.valueOf(keyCode - KeyEvent.KEYCODE_0));
-
- }
- break;
-
- default:
- Log.e("handleCharacter", "Unknown input?");
+ Log.e("handleCharacter", "Unknown input?");
}
}
@@ -1136,29 +1224,33 @@ public class TraditionalT9 extends InputMethodService implements
} else {
if (mKeyMode != MODE_NUM && mComposing.length() > 0) {
switch (keyCode) {
- case KeyEvent.KEYCODE_DPAD_DOWN:
- mCandidateView.scrollSuggestion(1);
- return true;
- case KeyEvent.KEYCODE_DPAD_UP:
- mCandidateView.scrollSuggestion(-1);
- return true;
- case KeyEvent.KEYCODE_DPAD_LEFT:
- case KeyEvent.KEYCODE_DPAD_RIGHT:
- commitTyped();
- // getCurrentInputConnection().sendKeyEvent(mDPADkeyEvent);
- // return super.onKeyUp(keyCode, event);
- return true;
+ case KeyEvent.KEYCODE_DPAD_DOWN:
+ mCandidateView.scrollSuggestion(1);
+ return true;
+ case KeyEvent.KEYCODE_DPAD_UP:
+ mCandidateView.scrollSuggestion(-1);
+ return true;
+ case KeyEvent.KEYCODE_DPAD_LEFT:
+ case KeyEvent.KEYCODE_DPAD_RIGHT:
+ if (mKeyMode == MODE_LANG) {
+ commitTyped();
+ } else if (mKeyMode == MODE_TEXT) {
+ commitReset();
+ }
+ // getCurrentInputConnection().sendKeyEvent(mDPADkeyEvent);
+ // return super.onKeyUp(keyCode, event);
+ return true;
}
}
switch (keyCode) {
- case KeyEvent.KEYCODE_DPAD_CENTER:
- handleMidButton();
- return true;
- default:
- // Send stored event to input connection then pass current
- // event onto super
- getCurrentInputConnection().sendKeyEvent(mDPADkeyEvent);
- return super.onKeyUp(keyCode, event);
+ case KeyEvent.KEYCODE_DPAD_CENTER:
+ handleMidButton();
+ return true;
+ default:
+ // Send stored event to input connection then pass current
+ // event onto super
+ getCurrentInputConnection().sendKeyEvent(mDPADkeyEvent);
+ return super.onKeyUp(keyCode, event);
}
}
}
@@ -1187,14 +1279,25 @@ public class TraditionalT9 extends InputMethodService implements
}
protected void nextKeyMode() {
- if (mKeyMode == MODE_CYCLE.length - 1)
+ if (mKeyMode == MODE_CYCLE.length - 1) {
mKeyMode = 0;
- else
+ }
+ else {
mKeyMode++;
+ }
updateKeyMode();
resetKeyMode();
}
+ private void nextLang() {
+ mLangIndex++;
+ if (mLangIndex == mLangsAvailable.length) {
+ mLangIndex = 0;
+ }
+ mLang = mLangsAvailable[mLangIndex];
+ updateKeyMode();
+ }
+
private void resetKeyMode() {
charReset();
if (mKeyMode != MODE_NUM) {
@@ -1213,45 +1316,39 @@ public class TraditionalT9 extends InputMethodService implements
int icon = 0;
switch (mKeyMode) {
- case MODE_TEXT:
- interfacehandler.showHold(false);
- switch (mCapsMode) {
- case CAPS_OFF:
- icon = R.drawable.ime_text_lower;
- break;
- case CAPS_ALL:
- icon = R.drawable.ime_text_upper;
- break;
- case CAPS_SINGLE:
- icon = R.drawable.ime_text_single;
- break;
- }
- break;
- case MODE_EN:
- if (mAddingWord) {
+ case MODE_TEXT:
interfacehandler.showHold(false);
- } else {
- interfacehandler.showHold(true);
- }
- switch (mCapsMode) {
- case CAPS_ALL:
- icon = R.drawable.ime_en_upper;
+ icon = LangHelper.ICONMAP[mLang][mKeyMode][mCapsMode];
break;
- case CAPS_SINGLE:
- icon = R.drawable.ime_en_single;
+ case MODE_LANG:
+ if (!db.ready) {
+ if (!mGaveUpdateWarn) {
+ Toast.makeText(this, getText(R.string.updating_database_unavailable), Toast.LENGTH_LONG).show();
+ mGaveUpdateWarn = true;
+ }
+ nextKeyMode();
+ return;
+ }
+ if (mLangIndex == -1) {
+ nextKeyMode();
+ return;
+ }
+ if (mAddingWord) {
+ interfacehandler.showHold(false);
+ } else {
+ interfacehandler.showHold(true);
+ }
+ //Log.d("T9.updateKeyMode", "lang: " + mLang + " mKeyMode: " + mKeyMode + " mCapsMode"
+ // + mCapsMode);
+ icon = LangHelper.ICONMAP[mLang][mKeyMode][mCapsMode];
break;
- case CAPS_OFF:
- icon = R.drawable.ime_en_lower;
+ case MODE_NUM:
+ interfacehandler.showHold(false);
+ icon = R.drawable.ime_number;
+ break;
+ default:
+ Log.e("updateKeyMode", "How.");
break;
- }
- break;
- case MODE_NUM:
- interfacehandler.showHold(false);
- icon = R.drawable.ime_number;
- break;
- default:
- Log.e("updateKeyMode", "How.");
- break;
}
showStatusIcon(icon);
}
@@ -1272,14 +1369,14 @@ public class TraditionalT9 extends InputMethodService implements
// mSuggestionStrings.get(mCandidateView.mSelectedIndex));
// get and commit selected suggestion
ic.commitText(mSuggestionStrings.get(mCandidateView.mSelectedIndex), 1);
- if (mKeyMode == MODE_EN) {
+ if (mKeyMode == MODE_LANG) {
// update freq
db.incrementWord(mSuggestionInts.get(mCandidateView.mSelectedIndex));
}
} else {
// commit suggestion index
ic.commitText(mSuggestionStrings.get(index), 1);
- if (mKeyMode == MODE_EN) {
+ if (mKeyMode == MODE_LANG) {
db.incrementWord(mSuggestionInts.get(index));
}
}
diff --git a/src/org/nyanya/android/traditionalt9/TraditionalT9Settings.java b/src/org/nyanya/android/traditionalt9/TraditionalT9Settings.java
index 60bff5ef..f943bd12 100644
--- a/src/org/nyanya/android/traditionalt9/TraditionalT9Settings.java
+++ b/src/org/nyanya/android/traditionalt9/TraditionalT9Settings.java
@@ -14,48 +14,161 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
import java.util.Map;
+import java.util.Properties;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
-import android.content.res.AssetFileDescriptor;
+import android.content.Intent;
+import android.content.SharedPreferences;
import android.content.res.Resources;
import android.database.Cursor;
import android.database.DatabaseUtils.InsertHelper;
import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Environment;
import android.os.SystemClock;
import android.preference.Preference;
import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
import android.util.Log;
+import android.widget.Toast;
+
+import com.stackoverflow.answer.UnicodeBOMInputStream;
+
+import pl.wavesoftware.widget.MultiSelectListPreference;
public class TraditionalT9Settings extends PreferenceActivity implements
- DialogInterface.OnCancelListener {
+ DialogInterface.OnCancelListener {
- ProgressDialog pd = null;
AsyncTask task = null;
- final String dictname = "dict50-utf8.jet";
- final String backupname = "t9backup.txt";
- final String backupdir = "traditionalt9";
+ final static String dictname = "%s-utf8.txt";
+ final static String userdictname = "user.%s.dict";
+ final static String backupname = "t9backup.txt";
+ final static String sddir = "traditionalt9";
final int BACKUP_Q_LIMIT = 1000;
- Context caller = null;
+ Context mContext = null;
+
+ public class LoadException extends Exception {
+ private static final long serialVersionUID = 3323913652550046354L;
+
+ public LoadException() {
+ super();
+ }
+
+ public LoadException(String message) {
+ super(message);
+ }
+
+ public LoadException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public LoadException(Throwable cause) {
+ super(cause);
+ }
+ }
private class Reply {
public boolean status;
- public String message;
+ private List msgs;
protected Reply() {
this.status = true;
- this.message = "None";
+ this.msgs = new LinkedList();
}
+ protected void addMsg(String msg) throws LoadException {
+ msgs.add(msg);
+ if (msgs.size() > 6) {
+ msgs.add("Too many errors, bailing.");
+ throw new LoadException();
+ }
+ }
+ protected void forceMsg(String msg) {
+ msgs.add(msg);
+ }
+
+ }
+
+ private void finishAndShowError(ProgressDialog pd, Reply result, int title){
+ if (pd == null) {
+ // Log.d("onPostExecute", "pd");
+ } else {
+ // Log.d("onPostExecute", "pd");
+ if (pd.isShowing()) {
+ pd.dismiss();
+ }
+ }
+ if (result == null) {
+ // bad thing happened
+ Log.e("onPostExecute", "Bad things happen?");
+ } else {
+ String msg = TextUtils.join("\n", result.msgs);
+ Log.d("onPostExecute", "Result: " + result.status + " " + msg);
+ if (!result.status) {
+ showErrorDialog(getResources().getString(title), msg);
+ }
+ }
+ }
+
+ private long getDictSizes(boolean internal, boolean restore, String[] dicts) {
+ if (internal) {
+ InputStream input;
+ Properties props = new Properties();
+ try {
+ input = getAssets().open("dict.properties");
+ props.load(input);
+ long total = 0;
+ for (int x=0; x= 0 ) {
+ pd.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+ pd.setMax(10000);
+ } else {
+ pd.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+ }
+ pd.show();
+ }
+
@Override
protected Reply doInBackground(String... mode) {
Reply reply = new Reply();
SQLiteDatabase db;
- db = T9DB.getSQLDB(caller);
- long fsize;
- long pos = 0;
- long last = 0;
- File backupfile = new File(Environment.getExternalStorageDirectory(), backupdir);
-
- if (mode[0].equals("backup")) {
- // using external backup
- backupfile = new File(backupfile, backupname);
- fsize = backupfile.length();
- } else {
- // using asset:
- AssetFileDescriptor descriptor;
- try {
- descriptor = getAssets().openFd(dictname);
- fsize = descriptor.getLength();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- reply.status = false;
- reply.message = e.getLocalizedMessage();
- db.close();
- return reply;
- }
+ db = T9DB.getSQLDB(mContext);
+ if (db == null) {
+ reply.forceMsg("Database unavailable at this time. (May be updating)");
+ reply.status = false;
+ return reply;
}
-
db.setLockingEnabled(false);
+ long startnow, endnow;
+ startnow = SystemClock.uptimeMillis();
+
+ // add characters first, then dictionary:
+ Log.d("doInBackground", "Adding characters...");
+ // load characters from supported langs
+ for (int x=0; x entry : CharMap.CHARTABLE.entrySet()) {
- wordhelp.prepareForReplace();
- wordhelp.bind(seqColumn, Integer.toString(entry.getValue()));
+ for (Map.Entry entry : CharMap.CHARTABLE.get(lang).entrySet()) {
+ wordhelp.prepareForReplace();
+ wordhelp.bind(langColumn, Integer.toString(lang));
+ wordhelp.bind(seqColumn, Integer.toString(entry.getValue()));
wordhelp.bind(wordColumn, Character.toString(entry.getKey()));
wordhelp.bind(freqColumn, 0);
wordhelp.execute();
}
- Log.d("doInBakground", "done.");
- Log.d("doInBakground", "Adding dict...");
- BufferedReader br;
- InputStream dictstream = null;
-
- if (mode[0].equals("backup")) {
- try {
- dictstream = new FileInputStream(backupfile);
- } catch (FileNotFoundException e) {
- reply.status = false;
- reply.message = "Backup file not found: " + e.getMessage();
- db.close();
- closeStream(dictstream, reply); // this is silly but it
- // stops IDE nagging at me.
- return reply;
- }
- } else {
- try {
- dictstream = getAssets().open(dictname);
- } catch (IOException e) {
- e.printStackTrace();
- reply.status = false;
- reply.message = "IO Error: " + e.getMessage();
- db.close();
- return reply;
- }
- }
+ }
+ private String getLine(BufferedReader br, Reply rpl, String fname) throws LoadException {
try {
- br = new BufferedReader(new InputStreamReader(dictstream, "UTF-8"));
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- reply.status = false;
- reply.message = "UnsupportedEncodingException Error: " + e.getMessage();
- db.close();
- closeStream(dictstream, reply);
- return reply;
- }
-
- String word;
- String[] ws;
- int freq;
- try {
- word = br.readLine();
+ return br.readLine();
} catch (IOException e) {
e.printStackTrace();
- reply.status = false;
- reply.message = "IO Error: " + e.getMessage();
- db.close();
- closeStream(dictstream, reply);
- return reply;
+ rpl.status = false;
+ rpl.addMsg("IO Error ("+fname+"): " + e.getMessage());
}
+ return null;
+ }
+
+ private Reply processFile(InputStream is, Reply rpl, SQLiteDatabase db, int lang, String fname)
+ throws LoadException, IOException {
+ long last = 0;
+ UnicodeBOMInputStream ubis = new UnicodeBOMInputStream(is);
+
+ BufferedReader br = new BufferedReader(new InputStreamReader(ubis));
+ ubis.skipBOM();
+
+ InsertHelper wordhelp = new InsertHelper(db, T9DB.WORD_TABLE_NAME);
+ final int langColumn = wordhelp.getColumnIndex(T9DB.COLUMN_LANG);
+ final int wordColumn = wordhelp.getColumnIndex(T9DB.COLUMN_WORD);
+ final int freqColumn = wordhelp.getColumnIndex(T9DB.COLUMN_FREQUENCY);
+ final int seqColumn = wordhelp.getColumnIndex(T9DB.COLUMN_SEQ);
+
+ String[] ws;
+ int freq;
String seq;
int linecount = 1;
int wordlen;
+ String word = getLine(br, rpl, fname);
- long startnow, endnow;
- startnow = SystemClock.uptimeMillis();
db.beginTransaction();
+
try {
while (word != null) {
if (isCancelled()) {
- // this is useless because of dumb android bug that
- // doesn't call onCancelled after this method finishes.
- reply.status = false;
- reply.message = "User cancelled.";
+ rpl.status = false;
+ rpl.addMsg("User cancelled.");
break;
}
if (word.contains(" ")) {
@@ -197,38 +391,54 @@ public class TraditionalT9Settings extends PreferenceActivity implements
try {
freq = Integer.parseInt(ws[1]);
} catch (NumberFormatException e) {
- reply.status = false;
- reply.message = "Number error.";
- return reply;
+ rpl.status = false;
+ rpl.addMsg("Number error ("+fname+") at line " + linecount+". Using 0 for frequency.");
+ freq = 0;
+ }
+ if (lang == -1 && ws.length == 3) {
+ try {
+ lang = Integer.parseInt(ws[2]);
+ } catch (NumberFormatException e) {
+ rpl.status = false;
+ rpl.addMsg("Number error ("+fname+") at line " + linecount+". Using 0 (en) for language.");
+ lang = 0;
+ }
+ if (lang >= LangHelper.LANGS.length) {
+ rpl.status = false;
+ rpl.addMsg("Unsupported language ("+fname+") at line " + linecount+". Trying 0 (en) for language.");
+ lang = 0;
+ }
+ } else if (lang == -1) {
+ lang = 0;
}
} else {
freq = 0;
}
- linecount++;
+
try {
wordlen = word.getBytes("UTF-8").length;
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
- reply.status = false;
- reply.message = "UnsupportedEncodingException Error: " + e.getMessage();
- db.close();
- closeStream(dictstream, reply);
- return reply;
+ rpl.status = false;
+ rpl.addMsg("Encoding Error("+fname+") line "+linecount+": " + e.getMessage());
+ wordlen = word.length();
}
pos += wordlen;
+ // replace junk characters:
+ word = word.replace("\uFEFF", "");
try {
- seq = CharMap.getStringSequence(word);
+ seq = CharMap.getStringSequence(word, lang);
} catch (NullPointerException e) {
- reply.status = false;
- reply.message = "Error on word: " + word;
- db.close();
- closeStream(dictstream, reply);
- return reply;
+ rpl.status = false;
+ rpl.addMsg("Error on word ("+word+") line "+
+ linecount+" in (" + fname+"): "+
+ getResources().getString(R.string.add_word_badchar, LangHelper.LANGS[lang]));
+ break;
}
-
+ linecount++;
wordhelp.prepareForReplace();
wordhelp.bind(seqColumn, seq);
-
+ wordhelp.bind(langColumn, lang);
wordhelp.bind(wordColumn, word);
wordhelp.bind(freqColumn, freq);
wordhelp.execute();
@@ -238,33 +448,23 @@ public class TraditionalT9Settings extends PreferenceActivity implements
if ((pos - last) > 4096) {
// Log.d("doInBackground", "line: " + linecount);
// Log.d("doInBackground", "word: " + word);
- publishProgress((int) ((float) pos / fsize * 10000));
+ publishProgress((int) ((float) pos / size * 10000));
last = pos;
}
- try {
- word = br.readLine();
- } catch (IOException e) {
- e.printStackTrace();
- reply.status = false;
- reply.message = "IO Error: " + e.getMessage();
- db.close();
- closeStream(dictstream, reply);
- return reply;
- }
+ word = getLine(br, rpl, fname);
}
publishProgress(10000);
db.setTransactionSuccessful();
} finally {
db.setLockingEnabled(true);
db.endTransaction();
+ br.close();
+ is.close();
+ ubis.close();
+ is.close();
wordhelp.close();
}
- endnow = SystemClock.uptimeMillis();
- Log.d("TIMING", "Excution time: " + (endnow - startnow) + " ms");
- Log.d("doInBackground", "line: " + linecount);
- db.close();
- closeStream(dictstream, reply);
- return reply;
+ return rpl;
}
@Override
@@ -274,58 +474,50 @@ public class TraditionalT9Settings extends PreferenceActivity implements
}
}
- @Override
- protected void onCancelled() {
- // Pointless callback. Thanks android.
- }
-
- /**
- * The system calls this to perform work in the UI thread and delivers
- * the result from doInBackground()
- */
@Override
protected void onPostExecute(Reply result) {
- if (pd == null) {
- // Log.d("onPostExecute", "pd");
+ if (restore) {
+ finishAndShowError(pd, result, R.string.pref_restore_title);
} else {
- // Log.d("onPostExecute", "pd");
- if (pd.isShowing()) {
- pd.dismiss();
- }
- }
- if (result == null) {
- // bad thing happened
- Log.e("onPostExecute", "Bad things happen?");
- } else {
- Log.d("onPostExecute", "Result: " + result.status + " " + result.message);
- if (!result.status) {
- showErrorDialog(caller.getResources().getString(R.string.pref_restore_title),
- result.message);
- }
+ finishAndShowError(pd, result, R.string.pref_load_title);
}
}
}
private class DumpDictTask extends AsyncTask {
- /**
- * The system calls this to perform work in a worker thread and delivers
- * it the parameters given to AsyncTask.execute()
- */
+
+ ProgressDialog pd;
+
+ DumpDictTask(int msgid) {
+ pd = new ProgressDialog(TraditionalT9Settings.this);
+ pd.setMessage(getResources().getString(msgid));
+ pd.setOnCancelListener(TraditionalT9Settings.this);
+ }
+
+ @Override protected void onPreExecute() {
+ pd.show();
+ }
+
@Override
protected Reply doInBackground(String... ignore) {
Reply reply = new Reply();
SQLiteDatabase db;
- db = T9DB.getSQLDB(caller);
+ db = T9DB.getSQLDB(mContext);
+ if (db == null) {
+ reply.forceMsg("Database unavailable at this time. (May be updating)");
+ reply.status = false;
+ return reply;
+ }
long entries;
int current = 0;
int pos = 0;
int last = 0;
File backupfile = new File(new File(Environment.getExternalStorageDirectory(),
- backupdir), backupname);
+ sddir), backupname);
db.setLockingEnabled(false);
- Log.d("doInBakground", "Dumping dict...");
+ Log.d("doInBackground", "Dumping dict...");
BufferedWriter bw;
OutputStream dictstream = null;
@@ -333,10 +525,9 @@ public class TraditionalT9Settings extends PreferenceActivity implements
dictstream = new FileOutputStream(backupfile);
} catch (FileNotFoundException e) {
reply.status = false;
- reply.message = "Backup file error: " + e.getMessage();
- db.close();
+ reply.forceMsg("Backup file error: " + e.getMessage());
closeStream(dictstream, reply); // this is silly but it stops
- // IDE nagging at me.
+ // IDE nagging at me.
return reply;
}
@@ -345,8 +536,7 @@ public class TraditionalT9Settings extends PreferenceActivity implements
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
reply.status = false;
- reply.message = "UnsupportedEncodingException Error: " + e.getMessage();
- db.close();
+ reply.forceMsg("Encoding Error (backupfile): " + e.getMessage());
closeStream(dictstream, reply);
return reply;
}
@@ -359,55 +549,60 @@ public class TraditionalT9Settings extends PreferenceActivity implements
entries = cur.getInt(0);
// pd.setMax((int)entries);
cur.close();
-
- while (current < entries) {
- q = "SELECT " + T9DB.COLUMN_ID + ", " + T9DB.COLUMN_WORD + ", "
- + T9DB.COLUMN_FREQUENCY + " FROM " + T9DB.WORD_TABLE_NAME + " WHERE "
- + T9DB.COLUMN_ID + ">" + current + " ORDER BY " + T9DB.COLUMN_ID + " LIMIT "
- + BACKUP_Q_LIMIT;
- cur = db.rawQuery(q, null);
- for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) {
- if (isCancelled()) {
- // this is useless because of dumb android bug that
- // doesn't
- // call onCancelled after this method finishes.
- reply.status = false;
- reply.message = "User cancelled.";
- break;
- }
- current = cur.getInt(0);
- pos++;
- try {
- bw.write(cur.getString(1));
- bw.write(" ");
- bw.write(Integer.toString(cur.getInt(2)));
- bw.newLine();
- } catch (IOException e) {
- e.printStackTrace();
- reply.status = false;
- reply.message = "IO Error: " + e.getMessage();
- db.close();
- closeStream(dictstream, reply);
- return reply; // why complain? I closed the stream above
- }
- if ((pos - last) > 80) {
- publishProgress((int) ((float) current / entries * 10000));
- last = current;
+ try {
+ while (pos < entries) {
+ q = "SELECT " + T9DB.COLUMN_ID + ", " + T9DB.COLUMN_LANG + ", " +
+ T9DB.COLUMN_WORD + ", " + T9DB.COLUMN_FREQUENCY +
+ " FROM " + T9DB.WORD_TABLE_NAME +
+ " WHERE " + T9DB.COLUMN_ID + ">" + current +
+ " ORDER BY " + T9DB.COLUMN_ID + " LIMIT " + BACKUP_Q_LIMIT;
+ cur = db.rawQuery(q, null);
+ for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) {
+ if (isCancelled()) {
+ reply.status = false;
+ reply.forceMsg("User cancelled.");
+ break;
+ }
+ current = cur.getInt(0);
+ pos++;
+ try {
+ bw.write(cur.getString(2)); // write word
+ bw.write(" ");
+ bw.write(Integer.toString(cur.getInt(3))); // then freq
+ bw.write(" ");
+ bw.write(Integer.toString(cur.getInt(1))); // then lang
+ bw.newLine();
+ } catch (Exception e) {
+ e.printStackTrace();
+ reply.status = false;
+ reply.forceMsg("Error: " + e.getMessage());
+ closeStream(dictstream, reply);
+ }
+ if ((pos - last) > 80) {
+ publishProgress((int) ((float) pos / entries * 10000));
+ last = pos;
+ }
}
+ cur.close();
}
- cur.close();
+ } finally {
+
}
- publishProgress(100);
+ publishProgress(10000);
endnow = SystemClock.uptimeMillis();
- Log.d("TIMING", "Excution time: " + (endnow - startnow) + " ms");
+ Log.d("TIMING", "Execution time: " + (endnow - startnow) + " ms");
Log.d("doInBackground", "entries: " + entries + " last: " + pos);
- db.close();
try {
bw.flush();
} catch (IOException e) {
e.printStackTrace();
}
+ try {
+ bw.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
closeStream(dictstream, reply);
return reply;
}
@@ -419,52 +614,43 @@ public class TraditionalT9Settings extends PreferenceActivity implements
}
}
- @Override
- protected void onCancelled() {
- // Pointless callback. Thanks android.
- }
-
/**
* The system calls this to perform work in the UI thread and delivers
* the result from doInBackground()
*/
@Override
protected void onPostExecute(Reply result) {
- if (pd == null) {
- // Log.d("onPostExecute", "pd");
- } else {
- // Log.d("onPostExecute", "pd");
- pd.dismiss();
- }
- if (result == null) {
- // bad thing happened
- Log.e("onPostExecute", "Bad things happen?");
- } else {
- Log.d("onPostExecute", "Result: " + result.status + " " + result.message);
- if (!result.status) {
- showErrorDialog(caller.getResources().getString(R.string.pref_backup_title),
- result.message);
- }
- }
+ finishAndShowError(pd, result, R.string.pref_backup_title);
}
}
private class NukeDictTask extends AsyncTask {
- /**
- * The system calls this to perform work in a worker thread and delivers
- * it the parameters given to AsyncTask.execute()
- */
+
+ ProgressDialog pd;
+
+ NukeDictTask(int msgid) {
+ pd = new ProgressDialog(TraditionalT9Settings.this);
+ pd.setMessage(getResources().getString(msgid));
+ pd.setCancelable(false);
+ pd.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+
+ }
+
+ @Override protected void onPreExecute() {
+ pd.show();
+ }
+
@Override
protected Reply doInBackground(String... ignore) {
Reply reply = new Reply();
- Log.d("doInBakground", "Nuking dict...");
+ Log.d("doInBackground", "Nuking dict...");
long startnow, endnow;
startnow = SystemClock.uptimeMillis();
- T9DB t9db = new T9DB(caller);
+ T9DB t9db = T9DB.getInstance(mContext);
t9db.nuke();
endnow = SystemClock.uptimeMillis();
- Log.d("TIMING", "Excution time: " + (endnow - startnow) + " ms");
+ Log.d("TIMING", "Execution time: " + (endnow - startnow) + " ms");
return reply;
}
@@ -479,22 +665,7 @@ public class TraditionalT9Settings extends PreferenceActivity implements
*/
@Override
protected void onPostExecute(Reply result) {
- if (pd == null) {
- // Log.d("onPostExecute", "pd");
- } else {
- // Log.d("onPostExecute", "pd");
- pd.dismiss();
- }
- if (result == null) {
- // bad thing happened
- Log.e("onPostExecute", "Bad things happen?");
- } else {
- Log.d("onPostExecute", "Result: " + result.status + " " + result.message);
- if (!result.status) {
- showErrorDialog(caller.getResources().getString(R.string.pref_nuke_title),
- result.message);
- }
- }
+ finishAndShowError(pd, result, R.string.pref_nuke_title);
}
}
@@ -502,16 +673,40 @@ public class TraditionalT9Settings extends PreferenceActivity implements
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.prefs);
- Preference button = getPreferenceManager().findPreference("loaddict");
+
+ Preference button = getPreferenceManager().findPreference("help");
if (button != null) {
button.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference arg0) {
- loadDict();
+ openHelp();
return true;
}
});
}
+
+ button = getPreferenceManager().findPreference("loaddict");
+ if (button != null) {
+ button.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+ @Override
+ public boolean onPreferenceClick(Preference arg0) {
+ preloader(R.string.pref_loadingdict, true, false);
+ return true;
+ }
+ });
+ }
+
+ button = getPreferenceManager().findPreference("loaduserdict");
+ if (button != null) {
+ button.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+ @Override
+ public boolean onPreferenceClick(Preference arg0) {
+ preloader(R.string.pref_loadinguserdict, false, false);
+ return true;
+ }
+ });
+ }
+
button = getPreferenceManager().findPreference("nukedict");
if (button != null) {
button.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@@ -550,66 +745,77 @@ public class TraditionalT9Settings extends PreferenceActivity implements
button.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference arg0) {
- queryTestSingle();
+ test();
return true;
}
});
}
- caller = this;
+ mContext = this;
}
- private void loadDict() {
- preloader(R.string.pref_loadingdict, "");
+ //build and filter Langs. (This should be refactored to a common method for base T9 module, too.
+ private int[] buildLangs(String s) {
+ int[] ia = MultiSelectListPreference.defaultunpack2Int(s);
+ int num = 0;
+ int i;
+ //calc size of filtered array
+ for (int x=0; x= 0 && i < LangHelper.NLANGS) {
+ num++;
+ }
+ }
+ int[] ian = new int[num];
+ int iansize = 0;
+ for (int x=0; x= 0 && i < LangHelper.NLANGS) {
+ ian[iansize] = i;
+ iansize++;
+ }
+ }
+ return ian;
}
- private void preloader(int msgid, String mode) {
- pd = new ProgressDialog(this);
- pd.setMessage(getResources().getString(msgid));
- pd.setOnCancelListener(this);
- pd.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
- pd.setMax(10000);
- pd.show();
- task = new LoadDictTask();
- task.execute(mode);
+ private void openHelp() {
+ Intent i = new Intent(Intent.ACTION_VIEW);
+ i.setData(Uri.parse(getString(R.string.help_url)));
+ startActivity(i);
+ }
+
+ // LoadDictTask(int msgid, boolean intern, boolean restorebackup, CheckBoxPreference setting)
+ private void preloader(int msgid, boolean internal, boolean restorebackup) {
+
+ task = new LoadDictTask(msgid, internal, restorebackup,
+ buildLangs(((MultiSelectListPreference) findPreference("pref_lang_support")).getValue()));
+ task.execute();
}
private void predumper(int msgid) {
- pd = new ProgressDialog(this);
- pd.setMessage(getResources().getString(msgid));
- pd.setOnCancelListener(this);
- // pd.setProgressNumberFormat(null); Why added in API11...
- pd.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
- pd.setMax(10000);
- pd.show();
- task = new DumpDictTask();
- task.execute("");
+ task = new DumpDictTask(msgid);
+ task.execute();
}
private void prenuke(int msgid) {
- pd = new ProgressDialog(this);
- pd.setMessage(getResources().getString(msgid));
- pd.setCancelable(false);
- pd.setProgressStyle(ProgressDialog.STYLE_SPINNER);
- pd.show();
- task = new NukeDictTask();
- task.execute("");
+ task = new NukeDictTask(msgid);
+ task.execute();
}
private void nukeDict() {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(R.string.pref_nuke_warn).setTitle(R.string.pref_nuke_title)
- .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- prenuke(R.string.pref_nukingdict);
- }
- }).setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- dialog.dismiss();
- }
- });
+ .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int id) {
+ prenuke(R.string.pref_nukingdict);
+ }
+ }).setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.dismiss();
+ }
+ });
AlertDialog dialog = builder.create();
dialog.show();
}
@@ -618,7 +824,7 @@ public class TraditionalT9Settings extends PreferenceActivity implements
AlertDialog.Builder builder = new AlertDialog.Builder(this);
if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
- File saveloc = new File(Environment.getExternalStorageDirectory(), backupdir);
+ File saveloc = new File(Environment.getExternalStorageDirectory(), sddir);
saveloc.mkdirs();
if (!saveloc.canWrite()) {
Log.e("backupDict", "can't write : " + saveloc.getAbsolutePath());
@@ -629,17 +835,17 @@ public class TraditionalT9Settings extends PreferenceActivity implements
saveloc = new File(saveloc, backupname);
if (saveloc.exists()) {
builder.setMessage(R.string.pref_backup_warn).setTitle(R.string.pref_backup_title)
- .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- predumper(R.string.pref_savingbackup);
- }
- }).setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- dialog.dismiss();
- }
- });
+ .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int id) {
+ predumper(R.string.pref_savingbackup);
+ }
+ }).setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.dismiss();
+ }
+ });
AlertDialog dialog = builder.create();
dialog.show();
} else {
@@ -656,24 +862,24 @@ public class TraditionalT9Settings extends PreferenceActivity implements
private void showErrorDialog(AlertDialog.Builder builder, String title, String msg) {
builder.setMessage(msg).setTitle(title)
- .setNeutralButton(R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- dialog.dismiss();
- }
- });
+ .setNeutralButton(R.string.ok, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.dismiss();
+ }
+ });
AlertDialog dialog = builder.create();
dialog.show();
}
private void showErrorDialogID(AlertDialog.Builder builder, int titleid, int msgid) {
builder.setMessage(msgid).setTitle(titleid)
- .setNeutralButton(R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- dialog.dismiss();
- }
- });
+ .setNeutralButton(R.string.ok, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.dismiss();
+ }
+ });
AlertDialog dialog = builder.create();
dialog.show();
}
@@ -683,31 +889,31 @@ public class TraditionalT9Settings extends PreferenceActivity implements
// Environment.MEDIA_MOUNTED;
AlertDialog.Builder builder = new AlertDialog.Builder(this);
if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(Environment.getExternalStorageState())
- || Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
- if ((new File(new File(Environment.getExternalStorageDirectory(), backupdir),
- backupname)).exists()) {
+ || Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
+ if ((new File(new File(Environment.getExternalStorageDirectory(), sddir),
+ backupname)).exists()) {
Resources res = getResources();
builder
- .setMessage(
- res.getString(R.string.pref_restore_warn,
- res.getString(R.string.pref_nukedict)))
- .setTitle(R.string.pref_restore_title)
- .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- preloader(R.string.pref_loadingbackup, "backup");
- }
- }).setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- dialog.dismiss();
- }
- });
+ .setMessage(
+ res.getString(R.string.pref_restore_warn,
+ res.getString(R.string.pref_nukedict)))
+ .setTitle(R.string.pref_restore_title)
+ .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int id) {
+ preloader(R.string.pref_loadingbackup, false, true);
+ }
+ }).setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.dismiss();
+ }
+ });
AlertDialog dialog = builder.create();
dialog.show();
} else {
showErrorDialogID(builder, R.string.pref_restore_title,
- R.string.pref_restore_nofile);
+ R.string.pref_restore_nofile);
}
} else {
showErrorDialogID(builder, R.string.pref_restore_title, R.string.pref_restore_noext);
@@ -722,27 +928,25 @@ public class TraditionalT9Settings extends PreferenceActivity implements
startnow = SystemClock.uptimeMillis();
- T9DB tdb = new T9DB(this);
- tdb.init();
+ T9DB tdb = T9DB.getInstance(this);
Log.d("queryTestDebug", "Testing...");
- tdb.updateWords("123", words, ids, 0);
+ tdb.updateWords("123", words, ids, 0, LangHelper.EN);
Log.d("queryTestDebug", "123->" + words.toString());
Log.d("queryTestDebug", "269->");
- tdb.updateWords("269", words, ids, 0);
+ tdb.updateWords("269", words, ids, 0, LangHelper.EN);
Iterator i = words.iterator();
while (i.hasNext()) {
Log.d("queryTestDebug", "word: " + i.next());
}
Log.d("queryTestDebug", "228->");
- tdb.updateWords("228", words, ids, 0);
+ tdb.updateWords("228", words, ids, 0, LangHelper.EN);
i = words.iterator();
while (i.hasNext()) {
Log.d("queryTestDebug", "word: " + i.next());
}
endnow = SystemClock.uptimeMillis();
- Log.d("TIMING", "Excution time: " + (endnow - startnow) + " ms");
- tdb.close();
+ Log.d("TIMING", "Execution time: " + (endnow - startnow) + " ms");
}
@SuppressWarnings("unused")
@@ -750,8 +954,7 @@ public class TraditionalT9Settings extends PreferenceActivity implements
long startnow, endnow;
startnow = SystemClock.uptimeMillis();
- T9DB tdb = new T9DB(this);
- tdb.init();
+ T9DB tdb = T9DB.getInstance(this);
// tdb.getWords("123").iterator();
// tdb.getWords("269").iterator();
@@ -762,8 +965,7 @@ public class TraditionalT9Settings extends PreferenceActivity implements
// tdb.getWords("22637").iterator();
endnow = SystemClock.uptimeMillis();
- Log.d("TIMING", "Excution time: " + (endnow - startnow) + " ms");
- tdb.close();
+ Log.d("TIMING", "Execution time: " + (endnow - startnow) + " ms");
}
private void queryTestSingle() {
@@ -773,10 +975,9 @@ public class TraditionalT9Settings extends PreferenceActivity implements
ArrayList ids = new ArrayList(8);
startnow = SystemClock.uptimeMillis();
- T9DB tdb = new T9DB(this);
- tdb.init();
+ T9DB tdb = T9DB.getInstance(this);
- tdb.updateWords("222", words, ids, 0);
+ tdb.updateWords("222", words, ids, 0, LangHelper.EN);
size = ids.size();
if (size > 0) {
tdb.incrementWord(ids.get(0));
@@ -789,20 +990,25 @@ public class TraditionalT9Settings extends PreferenceActivity implements
}
endnow = SystemClock.uptimeMillis();
- Log.d("TIMING", "Excution time: " + (endnow - startnow) + " ms");
+ Log.d("TIMING", "Execution time: " + (endnow - startnow) + " ms");
ArrayList freqs = new ArrayList(8);
- tdb.updateWordsW("222", words, ids, freqs);
+ tdb.updateWordsW("222", words, ids, freqs, LangHelper.EN);
Log.d("VALUES", "...");
size = freqs.size();
for (int x = 0; x < size; x++) {
Log.d("VALUES",
- "Word: " + words.get(x) + " id: " + ids.get(x) + " freq: " + freqs.get(x));
+ "Word: " + words.get(x) + " id: " + ids.get(x) + " freq: " + freqs.get(x));
}
Log.d("queryTestSingle", "done.");
- tdb.close();
}
-
+ private void test() {
+ SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
+ if ( "".equalsIgnoreCase(pref.getString("pref_lang_support", null)) ) {
+ Log.d("T9Settings.test", "AAAAAAAAAA blank string");
+ }
+ Log.d("T9Settings.test", pref.getString("pref_lang_support", "aaaaaaaaaa"));
+ }
@Override
public void onCancel(DialogInterface dint) {
task.cancel(false);
diff --git a/src/org/nyanya/android/traditionalt9/Utils.java b/src/org/nyanya/android/traditionalt9/Utils.java
new file mode 100644
index 00000000..5bcca381
--- /dev/null
+++ b/src/org/nyanya/android/traditionalt9/Utils.java
@@ -0,0 +1,73 @@
+package org.nyanya.android.traditionalt9;
+
+import android.text.InputType;
+import android.util.Log;
+
+public class Utils {
+
+ public static void printFlags(int inputType) {
+ if ((inputType & InputType.TYPE_CLASS_DATETIME) == InputType.TYPE_CLASS_DATETIME)
+ Log.i("Utils.printFlags", "TYPE_CLASS_DATETIME");
+ if ((inputType & InputType.TYPE_CLASS_NUMBER) == InputType.TYPE_CLASS_NUMBER)
+ Log.i("Utils.printFlags", "TYPE_CLASS_NUMBER");
+ if ((inputType & InputType.TYPE_CLASS_PHONE) == InputType.TYPE_CLASS_PHONE)
+ Log.i("Utils.printFlags", "TYPE_CLASS_PHONE");
+ if ((inputType & InputType.TYPE_CLASS_TEXT) == InputType.TYPE_CLASS_TEXT)
+ Log.i("Utils.printFlags", "TYPE_CLASS_TEXT");
+ if ((inputType & InputType.TYPE_DATETIME_VARIATION_DATE) == InputType.TYPE_DATETIME_VARIATION_DATE)
+ Log.i("Utils.printFlags", "TYPE_DATETIME_VARIATION_DATE");
+ if ((inputType & InputType.TYPE_DATETIME_VARIATION_NORMAL) == InputType.TYPE_DATETIME_VARIATION_NORMAL)
+ Log.i("Utils.printFlags", "TYPE_DATETIME_VARIATION_NORMAL");
+ if ((inputType & InputType.TYPE_DATETIME_VARIATION_TIME) == InputType.TYPE_DATETIME_VARIATION_TIME)
+ Log.i("Utils.printFlags", "YPE_DATETIME_VARIATION_TIME");
+ if ((inputType & InputType.TYPE_NULL) == InputType.TYPE_NULL)
+ Log.i("Utils.printFlags", "TYPE_NULL");
+ if ((inputType & InputType.TYPE_NUMBER_FLAG_DECIMAL) == InputType.TYPE_NUMBER_FLAG_DECIMAL)
+ Log.i("Utils.printFlags", "TYPE_NUMBER_FLAG_DECIMAL");
+ if ((inputType & InputType.TYPE_NUMBER_FLAG_SIGNED) == InputType.TYPE_NUMBER_FLAG_SIGNED)
+ Log.i("Utils.printFlags", "TYPE_NUMBER_FLAG_SIGNED");
+ if ((inputType & InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE) == InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE)
+ Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_AUTO_COMPLETE");
+ if ((inputType & InputType.TYPE_TEXT_FLAG_AUTO_CORRECT) == InputType.TYPE_TEXT_FLAG_AUTO_CORRECT)
+ Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_AUTO_CORRECT");
+ if ((inputType & InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS) == InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS)
+ Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_CAP_CHARACTERS");
+ if ((inputType & InputType.TYPE_TEXT_FLAG_CAP_SENTENCES) == InputType.TYPE_TEXT_FLAG_CAP_SENTENCES)
+ Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_CAP_SENTENCES");
+ if ((inputType & InputType.TYPE_TEXT_FLAG_CAP_WORDS) == InputType.TYPE_TEXT_FLAG_CAP_WORDS)
+ Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_CAP_WORDS");
+ if ((inputType & InputType.TYPE_TEXT_FLAG_IME_MULTI_LINE) == InputType.TYPE_TEXT_FLAG_IME_MULTI_LINE)
+ Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_IME_MULTI_LINE");
+ if ((inputType & InputType.TYPE_TEXT_FLAG_MULTI_LINE) == InputType.TYPE_TEXT_FLAG_MULTI_LINE)
+ Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_MULTI_LINE");
+ if ((inputType & InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS) == InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS)
+ Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_NO_SUGGESTIONS");
+ if ((inputType & InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS) == InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS)
+ Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_EMAIL_ADDRESS");
+ if ((inputType & InputType.TYPE_TEXT_VARIATION_EMAIL_SUBJECT) == InputType.TYPE_TEXT_VARIATION_EMAIL_SUBJECT)
+ Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_EMAIL_SUBJECT");
+ if ((inputType & InputType.TYPE_TEXT_VARIATION_FILTER) == InputType.TYPE_TEXT_VARIATION_FILTER)
+ Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_FILTER");
+ if ((inputType & InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE) == InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE)
+ Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_LONG_MESSAGE");
+ if ((inputType & InputType.TYPE_TEXT_VARIATION_NORMAL) == InputType.TYPE_TEXT_VARIATION_NORMAL)
+ Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_NORMAL");
+ if ((inputType & InputType.TYPE_TEXT_VARIATION_PASSWORD) == InputType.TYPE_TEXT_VARIATION_PASSWORD)
+ Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_PASSWORD");
+ if ((inputType & InputType.TYPE_TEXT_VARIATION_PERSON_NAME) == InputType.TYPE_TEXT_VARIATION_PERSON_NAME)
+ Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_PERSON_NAME");
+ if ((inputType & InputType.TYPE_TEXT_VARIATION_PHONETIC) == InputType.TYPE_TEXT_VARIATION_PHONETIC)
+ Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_PHONETIC");
+ if ((inputType & InputType.TYPE_TEXT_VARIATION_POSTAL_ADDRESS) == InputType.TYPE_TEXT_VARIATION_POSTAL_ADDRESS)
+ Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_POSTAL_ADDRESS");
+ if ((inputType & InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE) == InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE)
+ Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_SHORT_MESSAGE");
+ if ((inputType & InputType.TYPE_TEXT_VARIATION_URI) == InputType.TYPE_TEXT_VARIATION_URI)
+ Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_URI");
+ if ((inputType & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD)
+ Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_VISIBLE_PASSWORD");
+ if ((inputType & InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) == InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT)
+ Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_WEB_EDIT_TEXT");
+
+ }
+}
diff --git a/src/pl/wavesoftware/widget/MultiSelectListPreference.java b/src/pl/wavesoftware/widget/MultiSelectListPreference.java
new file mode 100644
index 00000000..f5f2b216
--- /dev/null
+++ b/src/pl/wavesoftware/widget/MultiSelectListPreference.java
@@ -0,0 +1,198 @@
+package pl.wavesoftware.widget;
+// https://gist.github.com/cardil/4754571/07b4b6ffd37b440bbdec2cafa1ab7411c5ad3873
+// modified to work specifically for this service
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import android.app.AlertDialog.Builder;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnMultiChoiceClickListener;
+import android.content.res.TypedArray;
+import android.preference.ListPreference;
+import android.util.AttributeSet;
+import android.util.Log;
+
+public class MultiSelectListPreference extends ListPreference {
+
+ private String separator;
+ private static final String DEFAULT_SEPARATOR = "\u0001\u0007\u001D\u0007\u0001";
+ private boolean[] entryChecked;
+
+ public MultiSelectListPreference(Context context, AttributeSet attributeSet) {
+ super(context, attributeSet);
+ entryChecked = new boolean[getEntries().length];
+ separator = DEFAULT_SEPARATOR;
+ }
+
+ public MultiSelectListPreference(Context context) {
+ this(context, null);
+ }
+
+ @Override
+ protected void onPrepareDialogBuilder(Builder builder) {
+ CharSequence[] entries = getEntries();
+ CharSequence[] entryValues = getEntryValues();
+ if (entries == null || entryValues == null
+ || entries.length != entryValues.length) {
+ throw new IllegalStateException(
+ "MultiSelectListPreference requires an entries array and an entryValues "
+ + "array which are both the same length");
+ }
+
+ restoreCheckedEntries();
+ OnMultiChoiceClickListener listener = new DialogInterface.OnMultiChoiceClickListener() {
+ public void onClick(DialogInterface dialog, int which, boolean val) {
+ entryChecked[which] = val;
+ }
+ };
+ builder.setMultiChoiceItems(entries, entryChecked, listener);
+ }
+
+ private CharSequence[] unpack(CharSequence val) {
+ if (val == null || "".equals(val)) {
+ return new CharSequence[0];
+ } else {
+ return ((String) val).split(separator);
+ }
+ }
+
+ // added method
+ public static int[] defaultunpack2Int(CharSequence val) {
+ if (val == null || "".equals(val)) {
+ //Log.w("MultiSelectPref.defaultunpack", "val is null or empty");
+ return new int[] {0}; //default pref
+ } else {
+ String[] sa = ((String) val).split(DEFAULT_SEPARATOR);
+ if (sa.length < 1) {
+ Log.w("MultiSelectPref.defaultunpack", "split is less than 1");
+ return new int[] {0}; //default pref
+ }
+ int[] ia = new int[sa.length];
+ for (int x=0;x valuesList = Arrays.asList(vals);
+ for (int i = 0; i < entryValues.length; i++) {
+ CharSequence entry = entryValues[i];
+ entryChecked[i] = valuesList.contains(entry);
+ }
+ }
+ }
+
+ @Override
+ protected void onDialogClosed(boolean positiveResult) {
+ List values = new ArrayList();
+
+ CharSequence[] entryValues = getEntryValues();
+ if (positiveResult && entryValues != null) {
+ for (int i = 0; i < entryValues.length; i++) {
+ if (entryChecked[i] == true) {
+ String val = (String) entryValues[i];
+ values.add(val);
+ }
+ }
+
+ String value = join(values, separator);
+ setSummary(prepareSummary(values));
+ setValueAndEvent(value);
+ }
+ }
+
+ //modified to make sure some sane thing gets stored
+ private void setValueAndEvent(String value) {
+ if (callChangeListener(unpack(value))) {
+ if (value == null || value.length() < 1) {
+ setValue("0"); //default
+ } else {
+ setValue(value);
+ }
+ }
+ }
+
+ private CharSequence prepareSummary(List joined) {
+ List titles = new ArrayList();
+ CharSequence[] entryTitle = getEntries();
+ CharSequence[] entryValues = getEntryValues();
+ int ix = 0;
+ for (CharSequence value : entryValues) {
+ if (joined.contains(value)) {
+ titles.add((String) entryTitle[ix]);
+ }
+ ix += 1;
+ }
+ return join(titles, ", ");
+ }
+
+ @Override
+ protected Object onGetDefaultValue(TypedArray typedArray, int index) {
+ return typedArray.getTextArray(index);
+ }
+
+ @Override
+ protected void onSetInitialValue(boolean restoreValue,
+ Object rawDefaultValue) {
+ String value = null;
+ CharSequence[] defaultValue;
+ if (rawDefaultValue == null) {
+ defaultValue = new CharSequence[0];
+ } else {
+ defaultValue = (CharSequence[]) rawDefaultValue;
+ }
+ List joined = Arrays.asList(defaultValue);
+ String joinedDefaultValue = join(joined, separator);
+ if (restoreValue) {
+ value = getPersistedString(joinedDefaultValue);
+ } else {
+ value = joinedDefaultValue;
+ }
+
+ setSummary(prepareSummary(Arrays.asList(unpack(value))));
+ setValueAndEvent(value);
+ }
+
+ /**
+ * Joins array of object to single string by separator
+ *
+ * Credits to kurellajunior on this post
+ * http://snippets.dzone.com/posts/show/91
+ *
+ * @param iterable
+ * any kind of iterable ex.: ["a", "b", "c"]
+ * @param separator
+ * separetes entries ex.: ","
+ * @return joined string ex.: "a,b,c"
+ */
+ protected static String join(Iterable iterable, String separator) {
+ Iterator oIter;
+ if (iterable == null || (!(oIter = iterable.iterator()).hasNext()))
+ return "";
+ StringBuilder oBuilder = new StringBuilder(String.valueOf(oIter.next()));
+ while (oIter.hasNext())
+ oBuilder.append(separator).append(oIter.next());
+ return oBuilder.toString();
+ }
+
+}