Merge pull request #7 from gt945/master

Add default keyboard layout option
whs · Jun 24, 2017 · 76927db · 76927db
2 parents 31a9e65 + 8ccd00f
commit 76927db
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 119 deletions.
diff --git a/app/src/main/java/th/in/whs/k2ausbkbd/KeepassActionReceiver.java b/app/src/main/java/th/in/whs/k2ausbkbd/KeepassActionReceiver.java
@@ -3,10 +3,18 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.widget.Toast;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 import keepass2android.pluginsdk.KeepassDefs;
 import keepass2android.pluginsdk.PluginAccessException;
 import keepass2android.pluginsdk.PluginActionBroadcastReceiver;
 import keepass2android.pluginsdk.Strings;
+import th.in.whs.k2ausbkbd.hid.Keyboard;
+import th.in.whs.k2ausbkbd.layout.KeyboardLayoutFactory;
+import th.in.whs.k2ausbkbd.layout.Layout;
+import java.io.IOException;
+
 
 public class KeepassActionReceiver extends PluginActionBroadcastReceiver {
     @Override
@@ -63,10 +71,19 @@ protected void actionSelected(ActionSelectedAction actionSelected) {
             type.append(actionSelected.getEntryFields().get(fieldKey));
         }
 
-        Intent intent = new Intent(ctx, LayoutPromptActivity.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra("type", type.toString());
-        ctx.startActivity(intent);
+        if (type.length() > 0) {
+            try {
+                SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(ctx);
+                String layout = preferences.getString("default_keyboard", "QWERTY");
+                Layout layoutInstance = KeyboardLayoutFactory.getLayout(layout);
+                Keyboard.getInstance().type(type.toString(), layoutInstance);
+            } catch (IOException | InstantiationException | IllegalAccessException e) {
+                Toast.makeText(null, R.string.error_send, Toast.LENGTH_LONG).show();
+                e.printStackTrace();
+            } catch (UnsupportedOperationException e) {
+                Toast.makeText(null, R.string.error_kernel, Toast.LENGTH_LONG).show();
+            }
+        }
     }
 
 }
diff --git a/app/src/main/java/th/in/whs/k2ausbkbd/LayoutPromptActivity.java b/app/src/main/java/th/in/whs/k2ausbkbd/LayoutPromptActivity.java
diff --git a/app/src/main/java/th/in/whs/k2ausbkbd/dialog/LayoutPromptCancelHandler.java b/app/src/main/java/th/in/whs/k2ausbkbd/dialog/LayoutPromptCancelHandler.java
diff --git a/app/src/main/java/th/in/whs/k2ausbkbd/dialog/LayoutPromptDialog.java b/app/src/main/java/th/in/whs/k2ausbkbd/dialog/LayoutPromptDialog.java
diff --git a/app/src/main/java/th/in/whs/k2ausbkbd/dialog/LayoutPromptHandler.java b/app/src/main/java/th/in/whs/k2ausbkbd/dialog/LayoutPromptHandler.java
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
@@ -8,5 +8,11 @@
         android:key="hide_from_launcher"
         android:title="@string/hide_launcher"
         android:summary="@string/hide_launcher_restore"/>
+    <ListPreference
+        android:defaultValue="QWERTY"
+        android:entries="@array/layout_list"
+        android:entryValues="@array/layout_list"
+        android:key="default_keyboard"
+        android:title="Default Keyboard Layout" />
 
 </PreferenceScreen>