, FilterCommand>();
+ private static Map filterMap = new HashMap();
+ /**
+ Set properties to configure debugging.
+ Format of properties is class => level, e.g.
+
+ cx.ath.matthew.io.TeeOutputStream = INFO
+ cx.ath.matthew.io.DOMPrinter = DEBUG
+
+ The debug level can be one of CRIT, ERR, WARN, INFO, DEBUG or VERBOSE which
+ correspond to all messages up to that level. The special words YES, ALL and TRUE
+ cause all messages to be printed regardless of level. All other terms disable
+ messages for that class. CRIT and ERR messages are always printed if debugging is enabled
+ unless explicitly disabled.
+ The special class name ALL can be used to set the default level for all classes.
+ @param prop Properties object to use.
+ */
+ public static void setProperties(Properties prop)
+ {
+ Debug.prop = prop;
+ }
+ /**
+ Read which class to debug on at which level from the given File.
+ Syntax the same as Java Properties files:
+
+ <class> = <debuglevel>
+
+ E.G.
+
+ cx.ath.matthew.io.TeeOutputStream = INFO
+ cx.ath.matthew.io.DOMPrinter = DEBUG
+
+ The debug level can be one of CRIT, ERR, WARN, INFO, DEBUG or VERBOSE which
+ correspond to all messages up to that level. The special words YES, ALL and TRUE
+ cause all messages to be printed regardless of level. All other terms disable
+ messages for that class. CRIT and ERR messages are always printed if debugging is enabled
+ unless explicitly disabled.
+ The special class name ALL can be used to set the default level for all classes.
+ @param f File to read from.
+ */
+ public static void loadConfig(File f) throws IOException
+ {
+ prop = new Properties();
+ prop.load(new FileInputStream(f));
+ }
+ /** @deprecated In Java 1.5 calling class is automatically identified, no need to pass it in. */
+ //TODO: 1.5 @Deprecated()
+ public static boolean debugging(Class c, int loglevel)
+ {
+ if (debug) {
+ if (null == c) return true;
+ return debugging(c.getName(), loglevel);
+ }
+ return false;
+ }
+ public static boolean debugging(String s, int loglevel)
+ {
+ if (debug) {
+ try {
+ if (null == s) return true;
+ if (null == prop) return loglevel <= DEBUG;
+ String d = prop.getProperty(s);
+ if (null == d || "".equals(d)) d = prop.getProperty("ALL");
+ if (null == d) return loglevel <= ERR;
+ if ("".equals(d)) return loglevel <= ERR;
+ d = d.toLowerCase();
+ if ("true".equals(d)) return true;
+ if ("yes".equals(d)) return true;
+ if ("all".equals(d)) return true;
+ if ("verbose".equals(d)) return loglevel <= VERBOSE;
+ if ("debug".equals(d)) return loglevel <= DEBUG;
+ if ("info".equals(d)) return loglevel <= INFO;
+ if ("warn".equals(d)) return loglevel <= WARN;
+ if ("err".equals(d)) return loglevel <= ERR;
+ if ("crit".equals(d)) return loglevel <= CRIT;
+ int i = Integer.parseInt(d); return i >= loglevel;
+ } catch (Exception e) { return false; }
+ }
+ return false;
+ }
+
+ /**
+ Output to the given Stream */
+ public static void setOutput(PrintStream p) throws IOException
+ {
+ debugout = p;
+ }
+ /**
+ Output to the given file */
+ public static void setOutput(String filename) throws IOException
+ {
+ debugout = new PrintStream(new FileOutputStream(filename, true));
+ }
+
+ /**
+ Output to the default debug.log */
+ public static void setOutput() throws IOException {
+ setOutput("./debug.log");
+ }
+ /**
+ Log at DEBUG
+ @param d The object to log */
+ public static void print(Object d)
+ {
+ if (debug) {
+ if (d instanceof String)
+ print(DEBUG, (String) d);
+ else if (d instanceof Throwable)
+ print(DEBUG, (Throwable) d);
+ else if (d instanceof byte[])
+ print(DEBUG, (byte[]) d);
+ else if (d instanceof Map)
+ printMap(DEBUG, (Map) d);
+ else print(DEBUG, d);
+ }
+ }
+ /**
+ Log at DEBUG
+ @param o The object doing the logging
+ @param d The object to log
+ @deprecated In Java 1.5 calling class is automatically identified, no need to pass it in.
+ */
+ //TODO: 1.5 @Deprecated()
+ public static void print(Object o, Object d)
+ {
+ if (debug) {
+ if (o instanceof Class)
+ saveclass = (Class) o;
+ else
+ saveclass = o.getClass();
+ print(d);
+ }
+ }
+
+ /**
+ Log an Object
+ @param o The object doing the logging
+ @param loglevel The level to log at (DEBUG, WARN, etc)
+ @param d The object to log with d.toString()
+ @deprecated In Java 1.5 calling class is automatically identified, no need to pass it in.
+ */
+ //TODO: 1.5 @Deprecated()
+ public static void print(Object o, int loglevel, Object d)
+ {
+ if (debug) {
+ if (o instanceof Class)
+ saveclass = (Class) o;
+ else
+ saveclass = o.getClass();
+ print(loglevel, d);
+ }
+ }
+ /**
+ Log a String
+ @param o The object doing the logging
+ @param loglevel The level to log at (DEBUG, WARN, etc)
+ @param s The log message
+ @deprecated In Java 1.5 calling class is automatically identified, no need to pass it in.
+ */
+ //TODO: 1.5 @Deprecated()
+ public static void print(Object o, int loglevel, String s)
+ {
+ if (debug) {
+ if (o instanceof Class)
+ saveclass = (Class) o;
+ else
+ saveclass = o.getClass();
+ print(loglevel, s);
+ }
+ }
+ /**
+ Log a Throwable
+ @param o The object doing the logging
+ @param loglevel The level to log at (DEBUG, WARN, etc)
+ @param t The throwable to log with .toString and .printStackTrace
+ @deprecated In Java 1.5 calling class is automatically identified, no need to pass it in.
+ */
+ //TODO: 1.5 @Deprecated()
+ public static void print(Object o, int loglevel, Throwable t)
+ {
+ if (debug) {
+ if (o instanceof Class)
+ saveclass = (Class) o;
+ else
+ saveclass = o.getClass();
+ print(loglevel, t);
+ }
+ }
+
+ /**
+ Log a Throwable
+ @param c The class doing the logging
+ @param loglevel The level to log at (DEBUG, WARN, etc)
+ @param t The throwable to log with .toString and .printStackTrace
+ @deprecated In Java 1.5 calling class is automatically identified, no need to pass it in.
+ */
+ //TODO: 1.5 @Deprecated()
+ public static void print(Class c, int loglevel, Throwable t)
+ {
+ if (debug) {
+ saveclass = c;
+ print(loglevel, t);
+ }
+ }
+ /**
+ Log a Throwable
+ @param loglevel The level to log at (DEBUG, WARN, etc)
+ @param t The throwable to log with .toString and .printStackTrace
+ @see #setThrowableTraces to turn on stack traces.
+ */
+ public static void print(int loglevel, Throwable t)
+ {
+ if (debug) {
+ String timestr = "";
+ String[] data = getTraceElements();
+ if (debugging(data[0], loglevel)) {
+ if (timing) {
+ long now = System.currentTimeMillis();
+ timestr = "{" + (now-last) + "} ";
+ last = now;
+ }
+ String[] lines = null;
+ if (ttrace) {
+ StackTraceElement[] ste = t.getStackTrace();
+ lines = new String[ste.length];
+ for (int i = 0; i < ste.length; i++)
+ lines[i] = "\tat "+ste[i].toString();
+ }
+ _print(t.getClass(), loglevel, data[0]+"."+data[1]+"()" + data[2], timestr, t.toString(), lines);
+ }
+ }
+ }
+
+ /**
+ Log a byte array
+ @param loglevel The level to log at (DEBUG, WARN, etc)
+ @param b The byte array to print.
+ @see #setHexDump to enable hex dumping.
+ @see #setByteArrayCount to change how many bytes are printed.
+ @see #setByteArrayWidth to change the formatting width of hex. */
+ public static void print(int loglevel, byte[] b)
+ {
+ if (debug) {
+ String timestr = "";
+ String[] data = getTraceElements();
+ if (debugging(data[0], loglevel)) {
+ if (timing) {
+ long now = System.currentTimeMillis();
+ timestr = "{" + (now-last) + "} ";
+ last = now;
+ }
+ String[] lines = null;
+ if (hexdump) {
+ if (balen >= b.length)
+ lines = Hexdump.format(b, bawidth).split("\n");
+ else {
+ byte[] buf = new byte[balen];
+ System.arraycopy(b, 0, buf, 0, balen);
+ lines = Hexdump.format(buf, bawidth).split("\n");
+ }
+ }
+ _print(b.getClass(), loglevel, data[0]+"."+data[1]+"()" + data[2], timestr, b.length+" bytes", lines);
+ }
+ }
+ }
+ /**
+ Log a String
+ @param loglevel The level to log at (DEBUG, WARN, etc)
+ @param s The string to log with d.toString()
+ */
+ public static void print(int loglevel, String s)
+ {
+ if (debug)
+ print(loglevel, (Object) s);
+ }
+ /**
+ Log an Object
+ @param c The class doing the logging
+ @param loglevel The level to log at (DEBUG, WARN, etc)
+ @param d The object to log with d.toString()
+ @deprecated In Java 1.5 calling class is automatically identified, no need to pass it in.
+ */
+ //TODO: 1.5 @Deprecated()
+ public static void print(Class c, int loglevel, Object d)
+ {
+ if (debug) {
+ saveclass = c;
+ print(loglevel, d);
+ }
+ }
+ /**
+ Log a String
+ @param c The class doing the logging
+ @param loglevel The level to log at (DEBUG, WARN, etc)
+ @param s The log message
+ @deprecated In Java 1.5 calling class is automatically identified, no need to pass it in.
+ */
+ //TODO: 1.5 @Deprecated()
+ public static void print(Class c, int loglevel, String s)
+ {
+ if (debug) {
+ saveclass = c;
+ print(loglevel, s);
+ }
+ }
+ private static String[] getTraceElements()
+ {
+ String[] data = new String[] { "", "", "" };
+ try {
+ Method m = Thread.class.getMethod("getStackTrace", new Class[0]);
+ StackTraceElement[] stes = (StackTraceElement[]) m.invoke(Thread.currentThread(), new Object[0]);
+ for (StackTraceElement ste: stes) {
+ if (Debug.class.getName().equals(ste.getClassName())) continue;
+ if (Thread.class.getName().equals(ste.getClassName())) continue;
+ if (Method.class.getName().equals(ste.getClassName())) continue;
+ if (ste.getClassName().startsWith("sun.reflect")) continue;
+ data[0] = ste.getClassName();
+ data[1] = ste.getMethodName();
+ if (lines)
+ data[2] = " "+ste.getFileName()+":"+ste.getLineNumber();
+ break;
+ }
+ } catch (NoSuchMethodException NSMe) {
+ if (null != saveclass)
+ data[0] = saveclass.getName();
+ } catch (IllegalAccessException IAe) {
+ } catch (InvocationTargetException ITe) {
+ }
+ return data;
+ }
+ /**
+ Log an Object
+ @param loglevel The level to log at (DEBUG, WARN, etc)
+ @param o The object to log
+ */
+ public static void print(int loglevel, Object o)
+ {
+ if (debug) {
+ String timestr = "";
+ String[] data = getTraceElements();
+ if (debugging(data[0], loglevel)) {
+ if (timing) {
+ long now = System.currentTimeMillis();
+ timestr = "{" + (now-last) + "} ";
+ last = now;
+ }
+ _print(o.getClass(), loglevel, data[0]+"."+data[1]+"()" + data[2], timestr, o.toString(), null);
+ }
+ }
+ }
+
+ /**
+ Log a Map
+ @param o The object doing the logging
+ @param loglevel The level to log at (DEBUG, WARN, etc)
+ @param m The Map to print out
+ @deprecated In Java 1.5 calling class is automatically identified, no need to pass it in.
+ */
+ //TODO: 1.5 @Deprecated()
+ public static void printMap(Object o, int loglevel, Map m)
+ {
+ if (debug) {
+ if (o instanceof Class)
+ saveclass = (Class) o;
+ else
+ saveclass = o.getClass();
+ printMap(loglevel, m);
+ }
+ }
+ /**
+ Log a Map
+ @param c The class doing the logging
+ @param loglevel The level to log at (DEBUG, WARN, etc)
+ @param m The Map to print out
+ @deprecated In Java 1.5 calling class is automatically identified, no need to pass it in.
+ */
+ //TODO: 1.5 @Deprecated()
+ public static void printMap(Class c, int loglevel, Map m)
+ {
+ if (debug) {
+ saveclass = c;
+ printMap(loglevel, m);
+ }
+ }
+ /**
+ Log a Map at DEBUG log level
+ @param m The Map to print out
+ */
+ public static void printMap(Map m)
+ {
+ printMap(DEBUG, m);
+ }
+ /**
+ Log a Map
+ @param loglevel The level to log at (DEBUG, WARN, etc)
+ @param m The Map to print out
+ */
+ public static void printMap(int loglevel, Map m)
+ {
+ if (debug) {
+ String timestr = "";
+ String[] data = getTraceElements();
+ if (debugging(data[0], loglevel)) {
+ if (timing) {
+ long now = System.currentTimeMillis();
+ timestr = "{" + (now-last) + "} ";
+ last = now;
+ }
+ Iterator i = m.keySet().iterator();
+ String[] lines = new String[m.size()];
+ int j = 0;
+ while (i.hasNext()) {
+ Object key = i.next();
+ lines[j++] = "\t\t- "+key+" => "+m.get(key);
+ }
+ _print(m.getClass(), loglevel, data[0]+"."+data[1]+"()" + data[2], timestr, "Map:", lines);
+ }
+ }
+ }
+ /**
+ Enable or disable stack traces in Debuging throwables.
+ */
+ public static void setThrowableTraces(boolean ttrace)
+ {
+ Debug.ttrace = ttrace;
+ }
+ /**
+ Enable or disable timing in Debug messages.
+ */
+ public static void setTiming(boolean timing)
+ {
+ Debug.timing = timing;
+ }
+ /**
+ Enable or disable line numbers.
+ */
+ public static void setLineNos(boolean lines)
+ {
+ Debug.lines = lines;
+ }
+ /**
+ Enable or disable hexdumps.
+ */
+ public static void setHexDump(boolean hexdump)
+ {
+ Debug.hexdump = hexdump;
+ }
+ /**
+ Set the size of hexdumps.
+ (Default: 36)
+ */
+ public static void setByteArrayCount(int count)
+ {
+ Debug.balen = count;
+ }
+ /**
+ Set the formatted width of hexdumps.
+ (Default: 80 chars)
+ */
+ public static void setByteArrayWidth(int width)
+ {
+ Debug.bawidth = width;
+ }
+ /**
+ Add a filter command for a specific type.
+ This command will be called with the output stream
+ and the text to be sent. It should perform any
+ changes necessary to the text and then print the
+ result to the output stream.
+ */
+ public static void addFilterCommand(Class c, FilterCommand f)
+ //TODO 1.5: public static void addFilterCommand(Class c, FilterCommand f)
+ {
+ filterMap.put(c, f);
+ }
+ private static void _print(Class c, int level, String loc, String extra, String message, String[] lines)
+ {
+ //TODO 1.5: FilterCommand f = filterMap.get(c);
+ FilterCommand f = (FilterCommand) filterMap.get(c);
+ if (null == f) {
+ debugout.println("["+loc+"] " +extra + message);
+ if (null != lines)
+ for (String s: lines)
+ debugout.println(s);
+ } else
+ f.filter(debugout, level, loc, extra, message, lines);
+ }
+}
+
+
diff --git a/app/src/main/java/cx/ath/matthew/io/DOMPrinter.java b/app/src/main/java/cx/ath/matthew/io/DOMPrinter.java
new file mode 100644
index 00000000..e61fa779
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/io/DOMPrinter.java
@@ -0,0 +1,114 @@
+/*
+ * Java DOM Printing Library
+ *
+ * Copyright (c) Matthew Johnson 2005
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+
+package cx.ath.matthew.io;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * Print a DOM tree to the given OutputStream
+ */
+public class DOMPrinter
+{
+ /**
+ * Print the given node and all its children.
+ * @param n The Node to print.
+ * @param os The Stream to print to.
+ */
+ public static void printNode(Node n, OutputStream os)
+ {
+ PrintStream p = new PrintStream(os);
+ printNode(n, p);
+ }
+ /**
+ * Print the given node and all its children.
+ * @param n The Node to print.
+ * @param p The Stream to print to.
+ */
+ public static void printNode(Node n, PrintStream p)
+ {
+ if (null != n.getNodeValue()) p.print(n.getNodeValue());
+ else {
+ p.print("<"+n.getNodeName());
+ if (n.hasAttributes()) {
+ NamedNodeMap nnm = n.getAttributes();
+ for (int i = 0; i < nnm.getLength(); i++) {
+ Node attr = nnm.item(i);
+ p.print(" "+attr.getNodeName()+"='"+attr.getNodeValue()+"'");
+ }
+ }
+ if (n.hasChildNodes()) {
+ p.print(">");
+ NodeList nl = n.getChildNodes();
+ for (int i = 0; i < nl.getLength(); i++)
+ printNode(nl.item(i), p);
+ p.print("");
+ } else {
+ p.print("/>");
+ }
+ }
+ }
+ /**
+ * Print the given document and all its children.
+ * @param d The Document to print.
+ * @param p The Stream to print to.
+ */
+ public static void printDOM(Document d, PrintStream p)
+ {
+ DocumentType dt = d.getDoctype();
+ if (null != dt) {
+ p.print("");
+ }
+ Element e = d.getDocumentElement();
+ printNode(e, p);
+ }
+ /**
+ * Print the given document and all its children.
+ * @param d The Document to print.
+ * @param os The Stream to print to.
+ */
+ public static void printDOM(Document d, OutputStream os)
+ {
+ PrintStream p = new PrintStream(os);
+ printDOM(d, p);
+ }
+}
+
diff --git a/app/src/main/java/cx/ath/matthew/io/ExecInputStream.java b/app/src/main/java/cx/ath/matthew/io/ExecInputStream.java
new file mode 100644
index 00000000..517cded8
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/io/ExecInputStream.java
@@ -0,0 +1,142 @@
+/*
+ * Java Exec Pipe Library
+ *
+ * Copyright (c) Matthew Johnson 2005
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+
+package cx.ath.matthew.io;
+
+import java.io.FilterInputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Class to pipe an InputStream through a command using stdin/stdout.
+ * E.g.
+ *
+ * Reader r = new InputStreamReader(new ExecInputStream(new FileInputStream("file"), "command"));
+ *
+ */
+public class ExecInputStream extends FilterInputStream
+{
+ private Process proc;
+ private InputStream stdout;
+ private OutputStream stdin;
+ private InOutCopier copy;
+
+ /**
+ * Create a new ExecInputStream on the given InputStream
+ * using the process to filter the stream.
+ * @param is Reads from this InputStream
+ * @param p Filters data through stdin/out on this Process
+ */
+ public ExecInputStream(InputStream is, Process p) throws IOException
+ {
+ super(is);
+ proc = p;
+ stdin = p.getOutputStream();
+ stdout = p.getInputStream();
+ copy = new InOutCopier(in, stdin);
+ copy.start();
+ }
+ /**
+ * Create a new ExecInputStream on the given InputStream
+ * using the process to filter the stream.
+ * @param is Reads from this InputStream
+ * @param cmd Creates a Process from this string to filter data through stdin/out
+ */
+ public ExecInputStream(InputStream is, String cmd) throws IOException
+ { this(is, Runtime.getRuntime().exec(cmd)); }
+ /**
+ * Create a new ExecInputStream on the given InputStream
+ * using the process to filter the stream.
+ * @param is Reads from this InputStream
+ * @param cmd Creates a Process from this string array (command, arg, ...) to filter data through stdin/out
+ */
+ public ExecInputStream(InputStream is, String[] cmd) throws IOException
+ { this(is, Runtime.getRuntime().exec(cmd)); }
+ /**
+ * Create a new ExecInputStream on the given InputStream
+ * using the process to filter the stream.
+ * @param is Reads from this InputStream
+ * @param cmd Creates a Process from this string to filter data through stdin/out
+ * @param env Setup the environment for the command
+ */
+ public ExecInputStream(InputStream is, String cmd, String[] env) throws IOException
+ { this(is, Runtime.getRuntime().exec(cmd, env)); }
+ /**
+ * Create a new ExecInputStream on the given InputStream
+ * using the process to filter the stream.
+ * @param is Reads from this InputStream
+ * @param cmd Creates a Process from this string array (command, arg, ...) to filter data through stdin/out
+ * @param env Setup the environment for the command
+ */
+ public ExecInputStream(InputStream is, String[] cmd, String[] env) throws IOException
+ { this(is, Runtime.getRuntime().exec(cmd, env)); }
+
+ public void close() throws IOException
+ {
+ try {
+ proc.waitFor();
+ } catch (InterruptedException Ie) {}
+ //copy.close();
+ try {
+ copy.join();
+ } catch (InterruptedException Ie) {}
+ stdin.close();
+ in.close();
+ stdout.close();
+ }
+ public void flush() throws IOException
+ {
+ copy.flush();
+ }
+ public int available() throws IOException
+ { return stdout.available(); }
+ public int read() throws IOException
+ { return stdout.read(); }
+ public int read(byte[] b) throws IOException
+ { return stdout.read(b); }
+ public int read(byte[] b, int off, int len) throws IOException
+ { return stdout.read(b, off, len); }
+ public long skip(long n) throws IOException
+ { return stdout.skip(n); }
+ public void mark(int readlimit)
+ {}
+ public boolean markSupported()
+ { return false; }
+ public void reset()
+ {}
+
+ public void finalize()
+ {
+ try {
+ close();
+ } catch (Exception e) {}
+ }
+}
+
+
+
diff --git a/app/src/main/java/cx/ath/matthew/io/ExecOutputStream.java b/app/src/main/java/cx/ath/matthew/io/ExecOutputStream.java
new file mode 100644
index 00000000..9ee92d6c
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/io/ExecOutputStream.java
@@ -0,0 +1,137 @@
+/*
+ * Java Exec Pipe Library
+ *
+ * Copyright (c) Matthew Johnson 2005
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+
+package cx.ath.matthew.io;
+
+import java.io.FilterOutputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Class to pipe an OutputStream through a command using stdin/stdout.
+ * E.g.
+ *
+ * Writer w = new OutputStreamWriter(new ExecOutputStream(new FileOutputStream("file"), "command"));
+ *
+ */
+public class ExecOutputStream extends FilterOutputStream
+{
+ private Process proc;
+ private InputStream stdout;
+ private OutputStream stdin;
+ private InOutCopier copy;
+
+ /**
+ * Create a new ExecOutputStream on the given OutputStream
+ * using the process to filter the stream.
+ * @param os Writes to this OutputStream
+ * @param p Filters data through stdin/out on this Process
+ */
+ public ExecOutputStream(OutputStream os, Process p) throws IOException
+ {
+ super(os);
+ proc = p;
+ stdin = p.getOutputStream();
+ stdout = p.getInputStream();
+ copy = new InOutCopier(stdout, out);
+ copy.start();
+ }
+ /**
+ * Create a new ExecOutputStream on the given OutputStream
+ * using the process to filter the stream.
+ * @param os Writes to this OutputStream
+ * @param cmd Creates a Process from this string to filter data through stdin/out
+ */
+ public ExecOutputStream(OutputStream os, String cmd) throws IOException
+ { this(os, Runtime.getRuntime().exec(cmd)); }
+ /**
+ * Create a new ExecOutputStream on the given OutputStream
+ * using the process to filter the stream.
+ * @param os Writes to this OutputStream
+ * @param cmd Creates a Process from this string array (command, arg, ...) to filter data through stdin/out
+ */
+ public ExecOutputStream(OutputStream os, String[] cmd) throws IOException
+ { this(os, Runtime.getRuntime().exec(cmd)); }
+ /**
+ * Create a new ExecOutputStream on the given OutputStream
+ * using the process to filter the stream.
+ * @param os Writes to this OutputStream
+ * @param cmd Creates a Process from this string to filter data through stdin/out
+ * @param env Setup the environment for the command
+ */
+ public ExecOutputStream(OutputStream os, String cmd, String[] env) throws IOException
+ { this(os, Runtime.getRuntime().exec(cmd, env)); }
+ /**
+ * Create a new ExecOutputStream on the given OutputStream
+ * using the process to filter the stream.
+ * @param os Writes to this OutputStream
+ * @param cmd Creates a Process from this string array (command, arg, ...) to filter data through stdin/out
+ * @param env Setup the environment for the command
+ */
+ public ExecOutputStream(OutputStream os, String[] cmd, String[] env) throws IOException
+ { this(os, Runtime.getRuntime().exec(cmd, env)); }
+
+ public void close() throws IOException
+ {
+ stdin.close();
+ try {
+ proc.waitFor();
+ } catch (InterruptedException Ie) {}
+ //copy.close();
+ try {
+ copy.join();
+ } catch (InterruptedException Ie) {}
+ stdout.close();
+ out.close();
+ }
+ public void flush() throws IOException
+ {
+ stdin.flush();
+ copy.flush();
+ out.flush();
+ }
+ public void write(byte[] b) throws IOException
+ {
+ stdin.write(b);
+ }
+ public void write(byte[] b, int off, int len) throws IOException
+ {
+ stdin.write(b, off, len);
+ }
+ public void write(int b) throws IOException
+ {
+ stdin.write(b);
+ }
+ public void finalize()
+ {
+ try {
+ close();
+ } catch (Exception e) {}
+ }
+}
+
diff --git a/app/src/main/java/cx/ath/matthew/io/InOutCopier.java b/app/src/main/java/cx/ath/matthew/io/InOutCopier.java
new file mode 100644
index 00000000..49688539
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/io/InOutCopier.java
@@ -0,0 +1,115 @@
+/*
+ * Java Exec Pipe Library
+ *
+ * Copyright (c) Matthew Johnson 2005
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+
+package cx.ath.matthew.io;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Copies from an input stream to an output stream using a Thread.
+ * example:
+ *
+ *
+ * InputStream a = getInputStream();
+ * OutputStream b = getOutputStream();
+ * InOutCopier copier = new InOutCopier(a, b);
+ * copier.start();
+ * <do stuff that writes to the inputstream>
+ *
+ */
+public class InOutCopier extends Thread
+{
+ private static final int BUFSIZE=1024;
+ private static final int POLLTIME=100;
+ private BufferedInputStream is;
+ private OutputStream os;
+ private boolean enable;
+ /**
+ * Create a copier from an inputstream to an outputstream
+ * @param is The stream to copy from
+ * @param os the stream to copy to
+ */
+ public InOutCopier(InputStream is, OutputStream os) throws IOException
+ {
+ this.is = new BufferedInputStream(is);
+ this.os = os;
+ this.enable = true;
+ }
+ /**
+ * Force close the stream without waiting for EOF on the source
+ */
+ public void close()
+ {
+ enable = false;
+ interrupt();
+ }
+ /**
+ * Flush the outputstream
+ */
+ public void flush() throws IOException
+ {
+ os.flush();
+ }
+ /** Start the thread and wait to make sure its really started */
+ public synchronized void start()
+ {
+ super.start();
+ try {
+ wait();
+ } catch (InterruptedException Ie) {}
+ }
+ /**
+ * Copies from the inputstream to the outputstream
+ * until EOF on the inputstream or explicitly closed
+ * @see #close()
+ */
+ public void run()
+ {
+ byte[] buf = new byte[BUFSIZE];
+ synchronized (this) {
+ notifyAll();
+ }
+ while (enable)
+ try {
+ int n = is.read(buf);
+ if (0 > n)
+ break;
+ if (0 < n) {
+ os.write(buf, 0, (n> BUFSIZE? BUFSIZE:n));
+ os.flush();
+ }
+ } catch (IOException IOe) {
+ break;
+ }
+ try { os.close(); } catch (IOException IOe) {}
+ }
+}
+
diff --git a/app/src/main/java/cx/ath/matthew/io/TeeInputStream.java b/app/src/main/java/cx/ath/matthew/io/TeeInputStream.java
new file mode 100644
index 00000000..f769b114
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/io/TeeInputStream.java
@@ -0,0 +1,155 @@
+/*
+ * Java Tee Stream Library
+ *
+ * Copyright (c) Matthew Johnson 2005
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+
+package cx.ath.matthew.io;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FilterInputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Class to copy a stream to a file or another stream as it is being sent through a stream pipe
+ * E.g.
+ *
+ * Reader r = new InputStreamReader(new TeeInputStream(new FileInputStream("file"), new File("otherfile")));
+ *
+ */
+public class TeeInputStream extends FilterInputStream
+{
+ private InputStream in;
+ private OutputStream fos;
+ /**
+ * Create a new TeeInputStream on the given InputStream
+ * and copy the stream to the given File.
+ * @param is Reads from this InputStream
+ * @param tos Write to this OutputStream
+ */
+ public TeeInputStream(InputStream is, OutputStream tos) throws IOException
+ {
+ super(is);
+ this.in = is;
+ this.fos = tos;
+ }
+ /**
+ * Create a new TeeInputStream on the given InputStream
+ * and copy the stream to the given File.
+ * @param is Reads from this InputStream
+ * @param f Write to this File
+ * @param append Append to file not overwrite
+ */
+ public TeeInputStream(InputStream is, File f, boolean append) throws IOException
+ {
+ super(is);
+ this.in = is;
+ this.fos = new FileOutputStream(f, append);
+ }
+ /**
+ * Create a new TeeInputStream on the given InputStream
+ * and copy the stream to the given File.
+ * @param is Reads from this InputStream
+ * @param f Write to this File
+ */
+ public TeeInputStream(InputStream is, File f) throws IOException
+ {
+ super(is);
+ this.in = is;
+ this.fos = new FileOutputStream(f);
+ }
+ /**
+ * Create a new TeeInputStream on the given InputStream
+ * and copy the stream to the given File.
+ * @param is Reads from this InputStream
+ * @param f Write to this File
+ * @param append Append to file not overwrite
+ */
+ public TeeInputStream(InputStream is, String f, boolean append) throws IOException
+ {
+ this(is, new File(f), append);
+ }
+ /**
+ * Create a new TeeInputStream on the given InputStream
+ * and copy the stream to the given File.
+ * @param is Reads from this InputStream
+ * @param f Write to this File
+ */
+ public TeeInputStream(InputStream is, String f) throws IOException
+ {
+ this(is, new File(f));
+ }
+ public void close() throws IOException
+ {
+ in.close();
+ fos.close();
+ }
+ public void flush() throws IOException
+ {
+ fos.flush();
+ }
+ public int available() throws IOException
+ {
+ return in.available();
+ }
+ public int read() throws IOException
+ {
+ int i = in.read();
+ if (-1 != i) fos.write(i);
+ return i;
+ }
+ public int read(byte[] b) throws IOException
+ {
+ int c = in.read(b);
+ if (-1 != c) fos.write(b, 0, c);
+ return c;
+ }
+ public int read(byte[] b, int off, int len) throws IOException
+ {
+ int c = in.read(b, off, len);
+ if (-1 != c) fos.write(b, off, c);
+ return c;
+ }
+ public long skip(long n) throws IOException
+ { return in.skip(n); }
+ public void mark(int readlimit)
+ {}
+ public boolean markSupported()
+ { return false; }
+ public void reset() throws IOException
+ { in.reset(); }
+
+ public void finalize()
+ {
+ try {
+ close();
+ } catch (Exception e) {}
+ }
+}
+
+
+
diff --git a/app/src/main/java/cx/ath/matthew/io/TeeOutputStream.java b/app/src/main/java/cx/ath/matthew/io/TeeOutputStream.java
new file mode 100644
index 00000000..30509230
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/io/TeeOutputStream.java
@@ -0,0 +1,141 @@
+/*
+ * Java Tee Stream Library
+ *
+ * Copyright (c) Matthew Johnson 2005
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+
+package cx.ath.matthew.io;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FilterOutputStream;
+import java.io.OutputStream;
+import java.io.IOException;
+
+/**
+ * Class to copy a stream to another stream or file as it is being sent through a stream pipe
+ * E.g.
+ *
+ * PrintWriter r = new PrintWriter(new TeeOutputStream(new FileOutputStream("file"), new File("otherfile")));
+ *
+ */
+public class TeeOutputStream extends FilterOutputStream
+{
+ private File f;
+ private OutputStream out;
+ private OutputStream fos;
+ /**
+ * Create a new TeeOutputStream on the given OutputStream
+ * and copy the stream to the other OuputStream.
+ * @param os Writes to this OutputStream
+ * @param tos Write to this OutputStream
+ */
+ public TeeOutputStream(OutputStream os, OutputStream tos) throws IOException
+ {
+ super(os);
+ this.out = os;
+ this.fos = tos;
+ }
+ /**
+ * Create a new TeeOutputStream on the given OutputStream
+ * and copy the stream to the given File.
+ * @param os Writes to this OutputStream
+ * @param f Write to this File
+ * @param append Append to file not overwrite
+ */
+ public TeeOutputStream(OutputStream os, File f, boolean append) throws IOException
+ {
+ super(os);
+ this.out = os;
+ this.fos = new FileOutputStream(f, append);
+ }
+ /**
+ * Create a new TeeOutputStream on the given OutputStream
+ * and copy the stream to the given File.
+ * @param os Writes to this OutputStream
+ * @param f Write to this File
+ */
+ public TeeOutputStream(OutputStream os, File f) throws IOException
+ {
+ super(os);
+ this.out = os;
+ this.fos = new FileOutputStream(f);
+ }
+ /**
+ * Create a new TeeOutputStream on the given OutputStream
+ * and copy the stream to the given File.
+ * @param os Writes to this OutputStream
+ * @param f Write to this File
+ * @param append Append to file not overwrite
+ */
+ public TeeOutputStream(OutputStream os, String f, boolean append) throws IOException
+ {
+ this(os, new File(f), append);
+ }
+ /**
+ * Create a new TeeOutputStream on the given OutputStream
+ * and copy the stream to the given File.
+ * @param os Writes to this OutputStream
+ * @param f Write to this File
+ */
+ public TeeOutputStream(OutputStream os, String f) throws IOException
+ {
+ this(os, new File(f));
+ }
+ public void close() throws IOException
+ {
+ out.close();
+ fos.close();
+ }
+ public void flush() throws IOException
+ {
+ fos.flush();
+ out.flush();
+ }
+ public void write(int b) throws IOException
+ {
+ fos.write(b);
+ out.write(b);
+ }
+ public void write(byte[] b) throws IOException
+ {
+ fos.write(b);
+ out.write(b);
+ }
+ public void write(byte[] b, int off, int len) throws IOException
+ {
+ fos.write(b, off, len);
+ out.write(b, off, len);
+ }
+
+ public void finalize()
+ {
+ try {
+ close();
+ } catch (Exception e) {}
+ }
+}
+
+
+
diff --git a/app/src/main/java/cx/ath/matthew/io/test.java b/app/src/main/java/cx/ath/matthew/io/test.java
new file mode 100644
index 00000000..0f3c9e43
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/io/test.java
@@ -0,0 +1,48 @@
+/*
+ * Java IO Library
+ *
+ * Copyright (c) Matthew Johnson 2005
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+
+package cx.ath.matthew.io;
+import java.io.PrintWriter;
+import java.io.OutputStreamWriter;
+class test
+{
+ public static void main(String[] args) throws Exception
+ {
+ PrintWriter out = new PrintWriter(new OutputStreamWriter(new ExecOutputStream(System.out, "xsltproc mcr.xsl -")));///java cx.ath.matthew.io.findeof")));
+
+ out.println("");
+ out.println(" ");
+ out.println(" ");
+ out.println(" TEST ");
+ out.println(" ");
+ out.println("hello, he is helping tie up helen's lemmings");
+ out.println("we are being followed and we break out");
+ out.println(" ");
+ out.println(" ");
+ out.close();
+ }
+}
diff --git a/app/src/main/java/cx/ath/matthew/io/test2.java b/app/src/main/java/cx/ath/matthew/io/test2.java
new file mode 100644
index 00000000..bd7a047d
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/io/test2.java
@@ -0,0 +1,39 @@
+/*
+ * Java IO Library
+ *
+ * Copyright (c) Matthew Johnson 2005
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+
+package cx.ath.matthew.io;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+class test2
+{
+ public static void main(String[] args) throws Exception
+ {
+ BufferedReader in = new BufferedReader(new InputStreamReader(new ExecInputStream(System.in, "xsltproc mcr.xsl -")));
+ String s;
+ while (null != (s = in.readLine())) System.out.println(s);
+ }
+}
diff --git a/app/src/main/java/cx/ath/matthew/io/test3.java b/app/src/main/java/cx/ath/matthew/io/test3.java
new file mode 100644
index 00000000..5d40214b
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/io/test3.java
@@ -0,0 +1,45 @@
+/*
+ * Java IO Library
+ *
+ * Copyright (c) Matthew Johnson 2005
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+
+package cx.ath.matthew.io;
+import java.io.PrintWriter;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+class test3
+{
+ public static void main(String[] args) throws Exception
+ {
+ String file = args[0];
+ PrintWriter p = new PrintWriter(new TeeOutputStream(System.out, file));
+ BufferedReader r = new BufferedReader(new InputStreamReader(System.in));
+ String s;
+ while (null != (s = r.readLine()))
+ p.println(s);
+ p.close();
+ r.close();
+ }
+}
diff --git a/app/src/main/java/cx/ath/matthew/unix/NotConnectedException.java b/app/src/main/java/cx/ath/matthew/unix/NotConnectedException.java
new file mode 100644
index 00000000..7f5c4e75
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/unix/NotConnectedException.java
@@ -0,0 +1,37 @@
+/*
+ * Java Unix Sockets Library
+ *
+ * Copyright (c) Matthew Johnson 2004
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+package cx.ath.matthew.unix;
+
+import java.net.SocketException;
+
+public class NotConnectedException extends SocketException
+{
+ public NotConnectedException()
+ {
+ super("The Socket is Not Connected");
+ }
+}
diff --git a/app/src/main/java/cx/ath/matthew/unix/USInputStream.java b/app/src/main/java/cx/ath/matthew/unix/USInputStream.java
new file mode 100644
index 00000000..95a95e6d
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/unix/USInputStream.java
@@ -0,0 +1,84 @@
+/*
+ * Java Unix Sockets Library
+ *
+ * Copyright (c) Matthew Johnson 2004
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+package cx.ath.matthew.unix;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+public class USInputStream extends InputStream
+{
+ public static final int MSG_DONTWAIT = 0x40;
+ private native int native_recv(int sock, byte[] b, int off, int len, int flags, int timeout) throws IOException;
+ private int sock;
+ boolean closed = false;
+ private byte[] onebuf = new byte[1];
+ private UnixSocket us;
+ private boolean blocking = true;
+ private int flags = 0;
+ private int timeout = 0;
+ public USInputStream(int sock, UnixSocket us)
+ {
+ this.sock = sock;
+ this.us = us;
+ }
+ public void close() throws IOException
+ {
+ closed = true;
+ us.close();
+ }
+ public boolean markSupported() { return false; }
+ public int read() throws IOException
+ {
+ int rv = 0;
+ while (0 >= rv) rv = read(onebuf);
+ if (-1 == rv) return -1;
+ return 0 > onebuf[0] ? -onebuf[0] : onebuf[0];
+ }
+ public int read(byte[] b, int off, int len) throws IOException
+ {
+ if (closed) throw new NotConnectedException();
+ int count = native_recv(sock, b, off, len, flags, timeout);
+ /* Yes, I really want to do this. Recv returns 0 for 'connection shut down'.
+ * read() returns -1 for 'end of stream.
+ * Recv returns -1 for 'EAGAIN' (all other errors cause an exception to be raised)
+ * whereas read() returns 0 for '0 bytes read', so yes, I really want to swap them here.
+ */
+ if (0 == count) return -1;
+ else if (-1 == count) return 0;
+ else return count;
+ }
+ public boolean isClosed() { return closed; }
+ public UnixSocket getSocket() { return us; }
+ public void setBlocking(boolean enable)
+ {
+ flags = enable ? 0 : MSG_DONTWAIT;
+ }
+ public void setSoTimeout(int timeout)
+ {
+ this.timeout = timeout;
+ }
+}
diff --git a/app/src/main/java/cx/ath/matthew/unix/USOutputStream.java b/app/src/main/java/cx/ath/matthew/unix/USOutputStream.java
new file mode 100644
index 00000000..7e06289e
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/unix/USOutputStream.java
@@ -0,0 +1,69 @@
+/*
+ * Java Unix Sockets Library
+ *
+ * Copyright (c) Matthew Johnson 2004
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+package cx.ath.matthew.unix;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class USOutputStream extends OutputStream
+{
+ private native int native_send(int sock, byte[] b, int off, int len) throws IOException;
+ private native int native_send(int sock, byte[][] b) throws IOException;
+ private int sock;
+ boolean closed = false;
+ private byte[] onebuf = new byte[1];
+ private UnixSocket us;
+ public USOutputStream(int sock, UnixSocket us)
+ {
+ this.sock = sock;
+ this.us = us;
+ }
+ public void close() throws IOException
+ {
+ closed = true;
+ us.close();
+ }
+ public void flush() {} // no-op, we do not buffer
+ public void write(byte[][] b) throws IOException
+ {
+ if (closed) throw new NotConnectedException();
+ native_send(sock, b);
+ }
+ public void write(byte[] b, int off, int len) throws IOException
+ {
+ if (closed) throw new NotConnectedException();
+ native_send(sock, b, off, len);
+ }
+ public void write(int b) throws IOException
+ {
+ onebuf[0] = (byte) (b % 0x7F);
+ if (1 == (b % 0x80)) onebuf[0] = (byte) -onebuf[0];
+ write(onebuf);
+ }
+ public boolean isClosed() { return closed; }
+ public UnixSocket getSocket() { return us; }
+}
diff --git a/app/src/main/java/cx/ath/matthew/unix/UnixIOException.java b/app/src/main/java/cx/ath/matthew/unix/UnixIOException.java
new file mode 100644
index 00000000..61cdc127
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/unix/UnixIOException.java
@@ -0,0 +1,44 @@
+/*
+ * Java Unix Sockets Library
+ *
+ * Copyright (c) Matthew Johnson 2004
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+package cx.ath.matthew.unix;
+
+import java.io.IOException;
+
+/**
+ * An IO Exception which occurred during UNIX Socket IO
+ */
+public class UnixIOException extends IOException
+{
+ private int no;
+ private String message;
+ public UnixIOException(int no, String message)
+ {
+ super(message);
+ this.message = message;
+ this.no = no;
+ }
+}
diff --git a/app/src/main/java/cx/ath/matthew/unix/UnixServerSocket.java b/app/src/main/java/cx/ath/matthew/unix/UnixServerSocket.java
new file mode 100644
index 00000000..082978c0
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/unix/UnixServerSocket.java
@@ -0,0 +1,129 @@
+/*
+ * Java Unix Sockets Library
+ *
+ * Copyright (c) Matthew Johnson 2004
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+package cx.ath.matthew.unix;
+
+import java.io.IOException;
+
+/**
+ * Represents a listening UNIX Socket.
+ */
+public class UnixServerSocket
+{
+ static { System.loadLibrary("unix-java"); }
+ private native int native_bind(String address, boolean abs) throws IOException;
+ private native void native_close(int sock) throws IOException;
+ private native int native_accept(int sock) throws IOException;
+ private UnixSocketAddress address = null;
+ private boolean bound = false;
+ private boolean closed = false;
+ private int sock;
+ /**
+ * Create an un-bound server socket.
+ */
+ public UnixServerSocket()
+ {
+ }
+ /**
+ * Create a server socket bound to the given address.
+ * @param address Path to the socket.
+ */
+ public UnixServerSocket(UnixSocketAddress address) throws IOException
+ {
+ bind(address);
+ }
+ /**
+ * Create a server socket bound to the given address.
+ * @param address Path to the socket.
+ */
+ public UnixServerSocket(String address) throws IOException
+ {
+ this(new UnixSocketAddress(address));
+ }
+ /**
+ * Accepts a connection on the ServerSocket.
+ * @return A UnixSocket connected to the accepted connection.
+ */
+ public UnixSocket accept() throws IOException
+ {
+ int client_sock = native_accept(sock);
+ return new UnixSocket(client_sock, address);
+ }
+ /**
+ * Closes the ServerSocket.
+ */
+ public synchronized void close() throws IOException
+ {
+ native_close(sock);
+ sock = 0;
+ closed = true;
+ bound = false;
+ }
+ /**
+ * Binds a server socket to the given address.
+ * @param address Path to the socket.
+ */
+ public void bind(UnixSocketAddress address) throws IOException
+ {
+ if (bound) close();
+ sock = native_bind(address.path, address.abs);
+ bound = true;
+ closed = false;
+ this.address = address;
+ }
+ /**
+ * Binds a server socket to the given address.
+ * @param address Path to the socket.
+ */
+ public void bind(String address) throws IOException
+ {
+ bind(new UnixSocketAddress(address));
+ }
+ /**
+ * Return the address this socket is bound to.
+ * @return The UnixSocketAddress if bound or null if unbound.
+ */
+ public UnixSocketAddress getAddress()
+ {
+ return address;
+ }
+ /**
+ * Check the status of the socket.
+ * @return True if closed.
+ */
+ public boolean isClosed()
+ {
+ return closed;
+ }
+ /**
+ * Check the status of the socket.
+ * @return True if bound.
+ */
+ public boolean isBound()
+ {
+ return bound;
+ }
+}
diff --git a/app/src/main/java/cx/ath/matthew/unix/UnixSocket.java b/app/src/main/java/cx/ath/matthew/unix/UnixSocket.java
new file mode 100644
index 00000000..f6526143
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/unix/UnixSocket.java
@@ -0,0 +1,320 @@
+/*
+ * Java Unix Sockets Library
+ *
+ * Copyright (c) Matthew Johnson 2004
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+package cx.ath.matthew.unix;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import cx.ath.matthew.debug.Debug;
+
+/**
+ * Represents a UnixSocket.
+ */
+public class UnixSocket
+{
+ static { System.loadLibrary("unix-java"); }
+ private native void native_set_pass_cred(int sock, boolean passcred) throws IOException;
+ private native int native_connect(String address, boolean abs) throws IOException;
+ private native void native_close(int sock) throws IOException;
+ private native int native_getPID(int sock);
+ private native int native_getUID(int sock);
+ private native int native_getGID(int sock);
+ private native void native_send_creds(int sock, byte data) throws IOException;
+ private native byte native_recv_creds(int sock, int[] creds) throws IOException;
+
+ private UnixSocketAddress address = null;
+ private USOutputStream os = null;
+ private USInputStream is = null;
+ private boolean closed = false;
+ private boolean connected = false;
+ private boolean passcred = false;
+ private int sock = 0;
+ private boolean blocking = true;
+ private int uid = -1;
+ private int pid = -1;
+ private int gid = -1;
+ UnixSocket(int sock, UnixSocketAddress address)
+ {
+ this.sock = sock;
+ this.address = address;
+ this.connected = true;
+ this.os = new USOutputStream(sock, this);
+ this.is = new USInputStream(sock, this);
+ }
+ /**
+ * Create an unconnected socket.
+ */
+ public UnixSocket()
+ {
+ }
+ /**
+ * Create a socket connected to the given address.
+ * @param address The Unix Socket address to connect to
+ */
+ public UnixSocket(UnixSocketAddress address) throws IOException
+ {
+ connect(address);
+ }
+ /**
+ * Create a socket connected to the given address.
+ * @param address The Unix Socket address to connect to
+ */
+ public UnixSocket(String address) throws IOException
+ {
+ this(new UnixSocketAddress(address));
+ }
+ /**
+ * Connect the socket to this address.
+ * @param address The Unix Socket address to connect to
+ */
+ public void connect(UnixSocketAddress address) throws IOException
+ {
+ if (connected) close();
+ this.sock = native_connect(address.path, address.abs);
+ this.os = new USOutputStream(this.sock, this);
+ this.is = new USInputStream(this.sock, this);
+ this.address = address;
+ this.connected = true;
+ this.closed = false;
+ this.is.setBlocking(blocking);
+ }
+ /**
+ * Connect the socket to this address.
+ * @param address The Unix Socket address to connect to
+ */
+ public void connect(String address) throws IOException
+ {
+ connect(new UnixSocketAddress(address));
+ }
+ public void finalize()
+ {
+ try {
+ close();
+ } catch (IOException IOe) {}
+ }
+ /**
+ * Closes the connection.
+ */
+ public synchronized void close() throws IOException
+ {
+ if (Debug.debug) Debug.print(Debug.INFO, "Closing socket");
+ native_close(sock);
+ sock = 0;
+ this.closed = true;
+ this.connected = false;
+ os = null;
+ is = null;
+ }
+ /**
+ * Returns an InputStream for reading from the socket.
+ * @return An InputStream connected to this socket.
+ */
+ public InputStream getInputStream()
+ {
+ return is;
+ }
+ /**
+ * Returns an OutputStream for writing to the socket.
+ * @return An OutputStream connected to this socket.
+ */
+ public OutputStream getOutputStream()
+ {
+ return os;
+ }
+ /**
+ * Returns the address this socket is connected to.
+ * Returns null if the socket is unconnected.
+ * @return The UnixSocketAddress the socket is connected to
+ */
+ public UnixSocketAddress getAddress()
+ {
+ return address;
+ }
+ /**
+ * Send a single byte of data with credentials.
+ * (Works on BSDs)
+ * @param data The byte of data to send.
+ */
+ public void sendCredentialByte(byte data) throws IOException
+ {
+ if (!connected) throw new NotConnectedException();
+ native_send_creds(sock, data);
+ }
+ /**
+ * Receive a single byte of data, with credentials.
+ * (Works on BSDs)
+ * @see getPeerUID
+ * @see getPeerPID
+ * @see getPeerGID
+ * @param data The byte of data to send.
+ */
+ public byte recvCredentialByte() throws IOException
+ {
+ if (!connected) throw new NotConnectedException();
+ int[] creds = new int[] { -1, -1, -1 };
+ byte data = native_recv_creds(sock, creds);
+ pid = creds[0];
+ uid = creds[1];
+ gid = creds[2];
+ return data;
+ }
+ /**
+ * Get the credential passing status.
+ * (only effective on linux)
+ * @return The current status of credential passing.
+ * @see setPassCred
+ */
+ public boolean getPassCred()
+ {
+ return passcred;
+ }
+ /**
+ * Return the uid of the remote process.
+ * Some data must have been received on the socket to do this.
+ * Either setPassCred must be called on Linux first, or recvCredentialByte
+ * on BSD.
+ * @return the UID or -1 if it is not available
+ */
+ public int getPeerUID()
+ {
+ if (-1 == uid)
+ uid = native_getUID(sock);
+ return uid;
+ }
+ /**
+ * Return the gid of the remote process.
+ * Some data must have been received on the socket to do this.
+ * Either setPassCred must be called on Linux first, or recvCredentialByte
+ * on BSD.
+ * @return the GID or -1 if it is not available
+ */
+ public int getPeerGID()
+ {
+ if (-1 == gid)
+ gid = native_getGID(sock);
+ return gid;
+ }
+ /**
+ * Return the pid of the remote process.
+ * Some data must have been received on the socket to do this.
+ * Either setPassCred must be called on Linux first, or recvCredentialByte
+ * on BSD.
+ * @return the PID or -1 if it is not available
+ */
+ public int getPeerPID()
+ {
+ if (-1 == pid)
+ pid = native_getPID(sock);
+ return pid;
+ }
+ /**
+ * Set the credential passing status.
+ * (Only does anything on linux, for other OS, you need
+ * to use send/recv credentials)
+ * @param enable Set to true for credentials to be passed.
+ */
+ public void setPassCred(boolean enable) throws IOException
+ {
+ native_set_pass_cred(sock, enable);
+ passcred = enable;
+ }
+ /**
+ * Get the blocking mode.
+ * @return true if reads are blocking.
+ * @see setBlocking
+ */
+ public boolean getBlocking()
+ {
+ return blocking;
+ }
+ /**
+ * Set the blocking mode.
+ * @param enable Set to false for non-blocking reads.
+ */
+ public void setBlocking(boolean enable)
+ {
+ blocking = enable;
+ if (null != is) is.setBlocking(enable);
+ }
+
+ /**
+ * Check the socket status.
+ * @return true if closed.
+ */
+ public boolean isClosed()
+ {
+ return closed;
+ }
+ /**
+ * Check the socket status.
+ * @return true if connected.
+ */
+ public boolean isConnected()
+ {
+ return connected;
+ }
+ /**
+ * Check the socket status.
+ * @return true if the input stream has been shutdown
+ */
+ public boolean isInputShutdown()
+ {
+ return is.isClosed();
+ }
+ /**
+ * Check the socket status.
+ * @return true if the output stream has been shutdown
+ */
+ public boolean isOutputShutdown()
+ {
+ return os.isClosed();
+ }
+ /**
+ * Shuts down the input stream.
+ * Subsequent reads on the associated InputStream will fail.
+ */
+ public void shutdownInput()
+ {
+ is.closed = true;
+ }
+ /**
+ * Shuts down the output stream.
+ * Subsequent writes to the associated OutputStream will fail.
+ */
+ public void shutdownOutput()
+ {
+ os.closed = true;
+ }
+ /**
+ * Set timeout of read requests.
+ */
+ public void setSoTimeout(int timeout)
+ {
+ is.setSoTimeout(timeout);
+ }
+}
diff --git a/app/src/main/java/cx/ath/matthew/unix/UnixSocketAddress.java b/app/src/main/java/cx/ath/matthew/unix/UnixSocketAddress.java
new file mode 100644
index 00000000..319cd604
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/unix/UnixSocketAddress.java
@@ -0,0 +1,85 @@
+/*
+ * Java Unix Sockets Library
+ *
+ * Copyright (c) Matthew Johnson 2004
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+package cx.ath.matthew.unix;
+
+/**
+ * Represents an address for a Unix Socket
+ */
+public class UnixSocketAddress
+{
+ String path;
+ boolean abs;
+ /**
+ * Create the address.
+ * @param path The path to the Unix Socket.
+ * @param abs True if this should be an abstract socket.
+ */
+ public UnixSocketAddress(String path, boolean abs)
+ {
+ this.path = path;
+ this.abs = abs;
+ }
+ /**
+ * Create the address.
+ * @param path The path to the Unix Socket.
+ */
+ public UnixSocketAddress(String path)
+ {
+ this.path = path;
+ this.abs = false;
+ }
+ /**
+ * Return the path.
+ */
+ public String getPath()
+ {
+ return path;
+ }
+ /**
+ * Returns true if this an address for an abstract socket.
+ */
+ public boolean isAbstract()
+ {
+ return abs;
+ }
+ /**
+ * Return the Address as a String.
+ */
+ public String toString()
+ {
+ return "unix"+(abs?":abstract":"")+":path="+path;
+ }
+ public boolean equals(Object o)
+ {
+ if (!(o instanceof UnixSocketAddress)) return false;
+ return ((UnixSocketAddress) o).path.equals(this.path);
+ }
+ public int hashCode()
+ {
+ return path.hashCode();
+ }
+}
diff --git a/app/src/main/java/cx/ath/matthew/unix/java-unix.h b/app/src/main/java/cx/ath/matthew/unix/java-unix.h
new file mode 100644
index 00000000..f0d1ebe3
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/unix/java-unix.h
@@ -0,0 +1,112 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include
+/* Header for class cx_ath_matthew_unix_UnixServerSocket */
+
+#ifndef _Included_cx_ath_matthew_unix_UnixServerSocket
+#define _Included_cx_ath_matthew_unix_UnixServerSocket
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: cx_ath_matthew_unix_UnixServerSocket
+ * Method: native_bind
+ * Signature: (Ljava/lang/String;Z)I
+ */
+JNIEXPORT jint JNICALL Java_cx_ath_matthew_unix_UnixServerSocket_native_1bind
+ (JNIEnv *, jobject, jstring, jboolean);
+
+/*
+ * Class: cx_ath_matthew_unix_UnixServerSocket
+ * Method: native_close
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_cx_ath_matthew_unix_UnixServerSocket_native_1close
+ (JNIEnv *, jobject, jint);
+
+/*
+ * Class: cx_ath_matthew_unix_UnixServerSocket
+ * Method: native_accept
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL Java_cx_ath_matthew_unix_UnixServerSocket_native_1accept
+ (JNIEnv *, jobject, jint);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+/* Header for class cx_ath_matthew_unix_UnixSocket */
+
+#ifndef _Included_cx_ath_matthew_unix_UnixSocket
+#define _Included_cx_ath_matthew_unix_UnixSocket
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: cx_ath_matthew_unix_UnixSocket
+ * Method: native_set_pass_cred
+ * Signature: (IZ)V
+ */
+JNIEXPORT void JNICALL Java_cx_ath_matthew_unix_UnixSocket_native_1set_1pass_1cred
+ (JNIEnv *, jobject, jint, jboolean);
+
+/*
+ * Class: cx_ath_matthew_unix_UnixSocket
+ * Method: native_connect
+ * Signature: (Ljava/lang/String;Z)I
+ */
+JNIEXPORT jint JNICALL Java_cx_ath_matthew_unix_UnixSocket_native_1connect
+ (JNIEnv *, jobject, jstring, jboolean);
+
+/*
+ * Class: cx_ath_matthew_unix_UnixSocket
+ * Method: native_close
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_cx_ath_matthew_unix_UnixSocket_native_1close
+ (JNIEnv *, jobject, jint);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+/* Header for class cx_ath_matthew_unix_USInputStream */
+
+#ifndef _Included_cx_ath_matthew_unix_USInputStream
+#define _Included_cx_ath_matthew_unix_USInputStream
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef cx_ath_matthew_unix_USInputStream_SKIP_BUFFER_SIZE
+#define cx_ath_matthew_unix_USInputStream_SKIP_BUFFER_SIZE 2048L
+/*
+ * Class: cx_ath_matthew_unix_USInputStream
+ * Method: native_recv
+ * Signature: (I[BII)I
+ */
+JNIEXPORT jint JNICALL Java_cx_ath_matthew_unix_USInputStream_native_1recv
+ (JNIEnv *, jobject, jint, jbyteArray, jint, jint);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+/* Header for class cx_ath_matthew_unix_USOutputStream */
+
+#ifndef _Included_cx_ath_matthew_unix_USOutputStream
+#define _Included_cx_ath_matthew_unix_USOutputStream
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: cx_ath_matthew_unix_USOutputStream
+ * Method: native_send
+ * Signature: (I[BII)I
+ */
+JNIEXPORT jint JNICALL Java_cx_ath_matthew_unix_USOutputStream_native_1send
+ (JNIEnv *, jobject, jint, jbyteArray, jint, jint);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/app/src/main/java/cx/ath/matthew/unix/testclient.java b/app/src/main/java/cx/ath/matthew/unix/testclient.java
new file mode 100644
index 00000000..f390b4a9
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/unix/testclient.java
@@ -0,0 +1,51 @@
+/*
+ * Java Unix Sockets Library
+ *
+ * Copyright (c) Matthew Johnson 2005
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+
+package cx.ath.matthew.unix;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+
+public class testclient
+{
+ public static void main(String args[]) throws IOException
+ {
+ UnixSocket s = new UnixSocket(new UnixSocketAddress("testsock", true));
+ OutputStream os = s.getOutputStream();
+ PrintWriter o = new PrintWriter(os);
+ BufferedReader r = new BufferedReader(new InputStreamReader(System.in));
+ String l;
+ while (null != (l = r.readLine())) {
+ byte[] buf = (l+"\n").getBytes();
+ os.write(buf, 0, buf.length);
+ }
+ s.close();
+ }
+}
diff --git a/app/src/main/java/cx/ath/matthew/unix/testserver.java b/app/src/main/java/cx/ath/matthew/unix/testserver.java
new file mode 100644
index 00000000..5e1d4167
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/unix/testserver.java
@@ -0,0 +1,55 @@
+/*
+ * Java Unix Sockets Library
+ *
+ * Copyright (c) Matthew Johnson 2005
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+
+package cx.ath.matthew.unix;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+
+public class testserver
+{
+ public static void main(String args[]) throws IOException
+ {
+ UnixServerSocket ss = new UnixServerSocket(new UnixSocketAddress("testsock", true));
+ UnixSocket s = ss.accept();
+ BufferedReader r = new BufferedReader(new InputStreamReader(s.getInputStream()));
+ String l;
+ while (null != (l = r.readLine()))
+ System.out.println(l);/*
+ InputStream is = s.getInputStream();
+ int r;
+ do {
+ r = is.read();
+ System.out.print((char)r);
+ } while (-1 != r);*/
+ s.close();
+ ss.close();
+ }
+}
diff --git a/app/src/main/java/cx/ath/matthew/utils/Hexdump.java b/app/src/main/java/cx/ath/matthew/utils/Hexdump.java
new file mode 100644
index 00000000..02cf5c65
--- /dev/null
+++ b/app/src/main/java/cx/ath/matthew/utils/Hexdump.java
@@ -0,0 +1,149 @@
+/*
+ * Java Hexdump Library
+ *
+ * Copyright (c) Matthew Johnson 2005
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * To Contact the author, please email src@matthew.ath.cx
+ *
+ */
+
+package cx.ath.matthew.utils;
+
+import java.io.PrintStream;
+
+public class Hexdump
+{
+ public static final char[] hexchars = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+ public static String toHex(byte[] buf)
+ {
+ return toHex(buf, 0, buf.length);
+ }
+ public static String toHex(byte[] buf, int ofs, int len)
+ {
+ StringBuffer sb = new StringBuffer();
+ int j = ofs+len;
+ for (int i = ofs; i < j; i++) {
+ if (i < buf.length) {
+ sb.append(hexchars[(buf[i] & 0xF0) >> 4]);
+ sb.append(hexchars[buf[i] & 0x0F]);
+ sb.append(' ');
+ } else {
+ sb.append(' ');
+ sb.append(' ');
+ sb.append(' ');
+ }
+ }
+ return sb.toString();
+ }
+
+ public static String toAscii(byte[] buf)
+ {
+ return toAscii(buf, 0, buf.length);
+ }
+ public static String toAscii(byte[] buf, int ofs, int len)
+ {
+ StringBuffer sb = new StringBuffer();
+ int j = ofs+len;
+ for (int i = ofs; i < j ; i++) {
+ if (i < buf.length) {
+ if (20 <= buf[i] && 126 >= buf[i])
+ sb.append((char) buf[i]);
+ else
+ sb.append('.');
+ } else
+ sb.append(' ');
+ }
+ return sb.toString();
+ }
+ public static String format(byte[] buf)
+ {
+ return format(buf, 80);
+ }
+ public static String format(byte[] buf, int width)
+ {
+ int bs = (width - 8) / 4;
+ int i = 0;
+ StringBuffer sb = new StringBuffer();
+ do {
+ for (int j = 0; j < 6; j++) {
+ sb.append(hexchars[(i << (j*4) & 0xF00000) >> 20]);
+ }
+ sb.append('\t');
+ sb.append(toHex(buf, i, bs));
+ sb.append(' ');
+ sb.append(toAscii(buf, i, bs));
+ sb.append('\n');
+ i += bs;
+ } while (i < buf.length);
+ return sb.toString();
+ }
+ public static void print(byte[] buf)
+ {
+ print(buf, System.err);
+ }
+ public static void print(byte[] buf, int width)
+ {
+ print(buf, width, System.err);
+ }
+ public static void print(byte[] buf, int width, PrintStream out)
+ {
+ out.print(format(buf, width));
+ }
+ public static void print(byte[] buf, PrintStream out)
+ {
+ out.print(format(buf));
+ }
+ /**
+ * Returns a string which can be written to a Java source file as part
+ * of a static initializer for a byte array.
+ * Returns data in the format 0xAB, 0xCD, ....
+ * use like:
+ * javafile.print("byte[] data = {")
+ * javafile.print(Hexdump.toByteArray(data));
+ * javafile.println("};");
+ */
+ public static String toByteArray(byte[] buf)
+ {
+ return toByteArray(buf, 0, buf.length);
+ }
+ /**
+ * Returns a string which can be written to a Java source file as part
+ * of a static initializer for a byte array.
+ * Returns data in the format 0xAB, 0xCD, ....
+ * use like:
+ * javafile.print("byte[] data = {")
+ * javafile.print(Hexdump.toByteArray(data));
+ * javafile.println("};");
+ */
+ public static String toByteArray(byte[] buf, int ofs, int len)
+ {
+ StringBuffer sb = new StringBuffer();
+ for (int i = ofs; i < len && i < buf.length; i++) {
+ sb.append('0');
+ sb.append('x');
+ sb.append(hexchars[(buf[i] & 0xF0) >> 4]);
+ sb.append(hexchars[buf[i] & 0x0F]);
+ if ((i+1) < len && (i+1) < buf.length)
+ sb.append(',');
+ }
+ return sb.toString();
+ }
+}
diff --git a/app/src/main/java/org/asteroidos/sync/MainActivity.java b/app/src/main/java/org/asteroidos/sync/MainActivity.java
index e44d7b7b..09243bc3 100644
--- a/app/src/main/java/org/asteroidos/sync/MainActivity.java
+++ b/app/src/main/java/org/asteroidos/sync/MainActivity.java
@@ -419,16 +419,20 @@ private void btEnableAndScan() {
}
}
+ private boolean isBound = false;
+
@Override
protected void onResume() {
super.onResume();
- bindService(mSyncServiceIntent, mConnection, Context.BIND_AUTO_CREATE);
+ isBound = bindService(mSyncServiceIntent, mConnection, Context.BIND_AUTO_CREATE);
}
@Override
protected void onPause() {
super.onPause();
- unbindService(mConnection);
+ if (isBound) {
+ unbindService(mConnection);
+ }
}
@Override
diff --git a/app/src/main/java/org/asteroidos/sync/asteroid/AsteroidBleManager.java b/app/src/main/java/org/asteroidos/sync/asteroid/AsteroidBleManager.java
index abbdb668..8dc0007d 100644
--- a/app/src/main/java/org/asteroidos/sync/asteroid/AsteroidBleManager.java
+++ b/app/src/main/java/org/asteroidos/sync/asteroid/AsteroidBleManager.java
@@ -50,7 +50,7 @@ public class AsteroidBleManager extends BleManager {
public final HashMap recvCallbacks;
public HashMap sendingCharacteristics;
- private int currentMtu = 244;
+ private int currentMtu = 247;
public AsteroidBleManager(@NonNull final Context context, SynchronizationService syncService) {
super(context);
@@ -162,7 +162,7 @@ public final boolean isRequiredServiceSupported(@NonNull final BluetoothGatt gat
@Override
protected final void initialize() {
beginAtomicRequestQueue()
- .add(requestMtu(517)
+ .add(requestMtu(currentMtu)
.with((device, mtu) -> log(Log.INFO, "MTU set to " + mtu))
.fail((device, status) -> log(Log.WARN, "Requested MTU not supported: " + status)))
.done(device -> log(Log.INFO, "Target initialized"))
diff --git a/app/src/main/java/org/asteroidos/sync/connectivity/MediaService.java b/app/src/main/java/org/asteroidos/sync/connectivity/MediaService.java
index 676eee65..5eda949e 100644
--- a/app/src/main/java/org/asteroidos/sync/connectivity/MediaService.java
+++ b/app/src/main/java/org/asteroidos/sync/connectivity/MediaService.java
@@ -166,6 +166,8 @@ public void sync() {
onActiveSessionsChanged(controllers);
if (mMediaSessionManager != null) {
mMediaSessionManager.addOnActiveSessionsChangedListener(this, new ComponentName(mCtx, NLService.class));
+ } else {
+ Log.e("MediaSessionManager", "missing MediaSessionManager");
}
});
} catch (SecurityException e) {
diff --git a/app/src/main/java/org/asteroidos/sync/connectivity/NotificationService.java b/app/src/main/java/org/asteroidos/sync/connectivity/NotificationService.java
index de8c71ab..7d716424 100644
--- a/app/src/main/java/org/asteroidos/sync/connectivity/NotificationService.java
+++ b/app/src/main/java/org/asteroidos/sync/connectivity/NotificationService.java
@@ -1,6 +1,6 @@
/*
* AsteroidOSSync
- * Copyright (c) 2023 AsteroidOS
+ * Copyright (c) 2024 AsteroidOS
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -26,13 +26,14 @@
import org.asteroidos.sync.NotificationPreferences;
import org.asteroidos.sync.asteroid.IAsteroidDevice;
import org.asteroidos.sync.dataobjects.Notification;
+import org.asteroidos.sync.services.INotificationHandler;
import org.asteroidos.sync.utils.AsteroidUUIDS;
import java.util.HashMap;
import java.util.Objects;
import java.util.UUID;
-public class NotificationService implements IConnectivityService {
+public class NotificationService implements IConnectivityService, INotificationHandler {
public static final String TAG = NotificationService.class.toString();
private final Context mCtx;
@@ -82,56 +83,61 @@ public final UUID getServiceUUID() {
return AsteroidUUIDS.NOTIFICATION_SERVICE_UUID;
}
+ @Override
+ public void postNotification(Context context, Intent intent) {
+ String event = intent.getStringExtra("event");
+ if (Objects.equals(event, "posted")) {
+ String packageName = intent.getStringExtra("packageName");
+ NotificationPreferences.putPackageToSeen(context, packageName);
+ NotificationPreferences.NotificationOption notificationOption =
+ NotificationPreferences.getNotificationPreferenceForApp(context, packageName);
+ if (notificationOption == NotificationPreferences.NotificationOption.NO_NOTIFICATIONS)
+ return;
+
+ int id = intent.getIntExtra("id", 0);
+ String appName = intent.getStringExtra("appName");
+ String appIcon = intent.getStringExtra("appIcon");
+ String summary = intent.getStringExtra("summary");
+ String body = intent.getStringExtra("body");
+ String vibration;
+ if (notificationOption == NotificationPreferences.NotificationOption.SILENT_NOTIFICATION)
+ vibration = "none";
+ else if (notificationOption == null
+ || notificationOption == NotificationPreferences.NotificationOption.NORMAL_VIBRATION
+ || notificationOption == NotificationPreferences.NotificationOption.DEFAULT)
+ vibration = "normal";
+ else if (notificationOption == NotificationPreferences.NotificationOption.STRONG_VIBRATION)
+ vibration = "strong";
+ else if(notificationOption == NotificationPreferences.NotificationOption.RINGTONE_VIBRATION)
+ vibration = "ringtone";
+ else
+ throw new IllegalArgumentException("Not all options handled");
+
+ if(intent.hasExtra("vibration"))
+ vibration = intent.getStringExtra("vibration");
+
+ Notification notification = new Notification(
+ Notification.MsgType.POSTED,
+ packageName,
+ id,
+ appName,
+ appIcon,
+ summary,
+ body,
+ vibration);
+
+ mDevice.send(AsteroidUUIDS.NOTIFICATION_UPDATE_CHAR, notification.toBytes(), NotificationService.this);
+ } else if (Objects.equals(event, "removed")) {
+ int id = intent.getIntExtra("id", 0);
+
+ mDevice.send(AsteroidUUIDS.NOTIFICATION_UPDATE_CHAR, new Notification(Notification.MsgType.REMOVED, id).toBytes(), NotificationService.this);
+ }
+ }
+
class NotificationReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
- String event = intent.getStringExtra("event");
- if (Objects.equals(event, "posted")) {
- String packageName = intent.getStringExtra("packageName");
- NotificationPreferences.putPackageToSeen(context, packageName);
- NotificationPreferences.NotificationOption notificationOption =
- NotificationPreferences.getNotificationPreferenceForApp(context, packageName);
- if (notificationOption == NotificationPreferences.NotificationOption.NO_NOTIFICATIONS)
- return;
-
- int id = intent.getIntExtra("id", 0);
- String appName = intent.getStringExtra("appName");
- String appIcon = intent.getStringExtra("appIcon");
- String summary = intent.getStringExtra("summary");
- String body = intent.getStringExtra("body");
- String vibration;
- if (notificationOption == NotificationPreferences.NotificationOption.SILENT_NOTIFICATION)
- vibration = "none";
- else if (notificationOption == null
- || notificationOption == NotificationPreferences.NotificationOption.NORMAL_VIBRATION
- || notificationOption == NotificationPreferences.NotificationOption.DEFAULT)
- vibration = "normal";
- else if (notificationOption == NotificationPreferences.NotificationOption.STRONG_VIBRATION)
- vibration = "strong";
- else if(notificationOption == NotificationPreferences.NotificationOption.RINGTONE_VIBRATION)
- vibration = "ringtone";
- else
- throw new IllegalArgumentException("Not all options handled");
-
- if(intent.hasExtra("vibration"))
- vibration = intent.getStringExtra("vibration");
-
- Notification notification = new Notification(
- Notification.MsgType.POSTED,
- packageName,
- id,
- appName,
- appIcon,
- summary,
- body,
- vibration);
-
- mDevice.send(AsteroidUUIDS.NOTIFICATION_UPDATE_CHAR, notification.toBytes(), NotificationService.this);
- } else if (Objects.equals(event, "removed")) {
- int id = intent.getIntExtra("id", 0);
-
- mDevice.send(AsteroidUUIDS.NOTIFICATION_UPDATE_CHAR, new Notification(Notification.MsgType.REMOVED, id).toBytes(), NotificationService.this);
- }
+ postNotification(context, intent);
}
}
}
diff --git a/app/src/main/java/org/asteroidos/sync/connectivity/SlirpService.java b/app/src/main/java/org/asteroidos/sync/connectivity/SlirpService.java
index 47305a15..6a3487e7 100644
--- a/app/src/main/java/org/asteroidos/sync/connectivity/SlirpService.java
+++ b/app/src/main/java/org/asteroidos/sync/connectivity/SlirpService.java
@@ -19,20 +19,28 @@
package org.asteroidos.sync.connectivity;
import android.content.Context;
+import android.os.Handler;
+import android.os.HandlerThread;
import android.system.Os;
import android.system.OsConstants;
import android.system.StructPollfd;
import android.util.Log;
import org.asteroidos.sync.asteroid.IAsteroidDevice;
+import org.asteroidos.sync.dbus.IDBusConnectionCallback;
+import org.asteroidos.sync.dbus.IDBusConnectionProvider;
import org.asteroidos.sync.utils.AsteroidUUIDS;
+import org.freedesktop.dbus.DBusConnection;
+import org.freedesktop.dbus.exceptions.DBusException;
import java.io.FileDescriptor;
import java.nio.ByteBuffer;
+import java.text.ParseException;
import java.util.HashMap;
import java.util.UUID;
+import java.util.function.Consumer;
-public class SlirpService implements IConnectivityService {
+public class SlirpService implements IConnectivityService, IDBusConnectionProvider {
private final IAsteroidDevice mDevice;
@@ -40,12 +48,48 @@ public class SlirpService implements IConnectivityService {
private final Thread slirpThread;
+ private final HandlerThread dBusHandlerThread;
+
+ private final Handler dBusHandler;
+
private volatile int mtu;
+ private final ByteBuffer rx = ByteBuffer.allocateDirect(1500);
+
+ private final ByteBuffer tx = ByteBuffer.allocateDirect(1500);
+
+ private final Consumer dBusConnectionRunnable = dBusConnectionCallback -> {
+ DBusConnection connection = null;
+ try {
+ synchronized (DBusConnection.class) {
+ connection = DBusConnection.getConnection("tcp:host=127.0.0.1,bind=*,port=55556,family=ipv4");
+ try {
+ Log.i("SlirpService", "D-Bus connection acquired: " + connection.getAddress().toString());
+ } catch (ParseException e) {
+ Log.i("SlirpService", "D-Bus connection acquired");
+ }
+ }
+ } catch (Throwable e) {
+ Log.e("SlirpService", "Failed to connect to D-Bus", e);
+ }
+ if (connection != null) {
+ try {
+ dBusConnectionCallback.handleConnection(connection);
+ } catch (Throwable e) {
+ Log.e("SlirpService", "An error occurred in a D-Bus callback", e);
+ }
+ }
+ };
+
+
public SlirpService(Context ctx, IAsteroidDevice device) {
mDevice = device;
mCtx = ctx;
+ dBusHandlerThread = new HandlerThread("D-Bus Connection");
+ dBusHandlerThread.start();
+ dBusHandler = new Handler(dBusHandlerThread.getLooper());
+
slirpThread = new Thread(() -> {
FileDescriptor fd = getVdeFd();
StructPollfd pollfd = new StructPollfd();
@@ -58,41 +102,59 @@ public SlirpService(Context ctx, IAsteroidDevice device) {
continue;
}
- ByteBuffer rx = ByteBuffer.allocateDirect(mtu);
- long read = vdeRecv(rx, 0, mtu);
- byte[] data = new byte[(int) read];
- rx.get(data);
- mDevice.send(AsteroidUUIDS.SLIRP_OUTGOING_CHAR, data, SlirpService.this);
-
-// resetMtu();
+ synchronized (SlirpService.this) {
+ rx.clear();
+ long read = vdeRecv(rx, 0, mtu - 3);
+ assert read <= (mtu - 3);
+ if (read > 0) {
+ Log.d("SlirpService", "Received " + read + " bytes");
+ byte[] data = new byte[(int) read];
+ rx.get(data);
+ mDevice.send(AsteroidUUIDS.SLIRP_OUTGOING_CHAR, data, SlirpService.this);
+ } else {
+ Log.e("SlirpService", "Read error: " + read);
+ }
+ }
} catch (Exception e) {
- Log.e("SlirpService", e.toString());
+ Log.e("SlirpService", "Poller exception", e);
}
}
});
mtu = mDevice.getMtu();
- initNative(mtu - 14);
+ startNative(mtu - 3);
mDevice.registerCallback(AsteroidUUIDS.SLIRP_INCOMING_CHAR, data -> {
resetMtu();
- ByteBuffer tx = ByteBuffer.allocateDirect(data.length);
- tx.put(data);
- vdeSend(tx, 0, data.length);
+ synchronized (SlirpService.this) {
+ tx.clear();
+ tx.put(data);
+ vdeSend(tx, 0, data.length);
+ }
});
slirpThread.start();
}
+ private void startNative(int mtu) {
+ initNative(mtu - 14);
+
+ vdeAddFwd(false, "0.0.0.0", 45722, "10.0.2.3", 22);
+ vdeAddFwd(false, "0.0.0.0", 55555, "10.0.2.3", 55555);
+ vdeAddFwd(false, "0.0.0.0", 55556, "10.0.2.3", 55556);
+ }
+
private void resetMtu() {
- int newMtu = mDevice.getMtu();
- if (mtu != newMtu) {
- mtu = newMtu;
+ synchronized (SlirpService.this) {
+ int newMtu = mDevice.getMtu();
+ if (mtu != newMtu) {
+ mtu = newMtu;
- finalizeNative();
- initNative(mtu - 14);
+ finalizeNative();
+ startNative(mtu - 3);
+ }
}
}
@@ -127,8 +189,22 @@ public UUID getServiceUUID() {
return AsteroidUUIDS.SLIRP_SERVICE_UUID;
}
+ public void acquireDBusConnection(IDBusConnectionCallback dBusConnectionCallback) {
+ dBusHandler.post(() -> dBusConnectionRunnable.accept(dBusConnectionCallback));
+ }
+
+ @Override
+ public void acquireDBusConnectionLater(IDBusConnectionCallback dBusConnectionCallback, long delay) {
+ dBusHandler.postDelayed(() -> dBusConnectionRunnable.accept(dBusConnectionCallback), delay);
+ }
+
+ @SuppressWarnings({"unused", "FieldMayBeFinal"}) // used internally by the JNI part
private long mySlirp = 0;
+ private native int vdeAddUnixFwd(String path, String ip, int port);
+
+ private native int vdeAddFwd(boolean udp, String hostip, int hostport, String ip, int port);
+
private native void initNative(int mtu);
private native void finalizeNative();
diff --git a/app/src/main/java/org/asteroidos/sync/dbus/DBusNotificationService.java b/app/src/main/java/org/asteroidos/sync/dbus/DBusNotificationService.java
new file mode 100644
index 00000000..5b263441
--- /dev/null
+++ b/app/src/main/java/org/asteroidos/sync/dbus/DBusNotificationService.java
@@ -0,0 +1,169 @@
+/*
+ * AsteroidOSSync
+ * Copyright (c) 2024 AsteroidOS
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+ private final IDBusConnectionProvider connectionProvider;
+
+ private static final HashFunction murmur32 = Hashing.murmur3_32_fixed(0);
+
+ private final BiMap mapping = HashBiMap.create();
+
+ private Context mCtx;
+
+ private NotificationReceiver mNReceiver;
+
+ public DBusNotificationService(Context ctx, IDBusConnectionProvider connectionProvider) {
+ this.mCtx = ctx;
+ this.connectionProvider = connectionProvider;
+
+ connectionProvider.acquireDBusConnectionLater(notify -> Log.w("DBusNotificationService", Arrays.toString(notify.getNames())), 1000);
+ }
+
+ @Override
+ public void postNotification(Context context, Intent intent) {
+ String event = intent.getStringExtra("event");
+
+ if (Objects.equals(event, "posted")) {
+ String packageName = intent.getStringExtra("packageName");
+ NotificationPreferences.putPackageToSeen(context, packageName);
+ NotificationPreferences.NotificationOption notificationOption =
+ NotificationPreferences.getNotificationPreferenceForApp(context, packageName);
+ if (notificationOption == NotificationPreferences.NotificationOption.NO_NOTIFICATIONS)
+ return;
+
+ String key = Objects.requireNonNull(intent.getStringExtra("key"));
+ String appName = intent.getStringExtra("appName");
+ String appIcon = intent.getStringExtra("appIcon");
+ String summary = intent.getStringExtra("summary");
+ String body = intent.getStringExtra("body");
+ String vibration;
+ if (notificationOption == NotificationPreferences.NotificationOption.SILENT_NOTIFICATION)
+ vibration = "notif_silent";
+ else if (notificationOption == null
+ || notificationOption == NotificationPreferences.NotificationOption.NORMAL_VIBRATION
+ || notificationOption == NotificationPreferences.NotificationOption.DEFAULT)
+ vibration = "notif_normal";
+ else if (notificationOption == NotificationPreferences.NotificationOption.STRONG_VIBRATION)
+ vibration = "notif_strong";
+ else if (notificationOption == NotificationPreferences.NotificationOption.RINGTONE_VIBRATION)
+ vibration = "ringtone";
+ else
+ throw new IllegalArgumentException("Not all options handled");
+
+ connectionProvider.acquireDBusConnectionLater(notify -> {
+ synchronized (mapping) {
+ mapping.put(key, notify.getRemoteObject("org.freedesktop.Notifications", "/org/freedesktop/Notifications", Notifications.class)
+ .Notify(appName, mapping.getOrDefault(key, new UInt32(0)), appIcon, summary, body, Collections.emptyList(),
+ Map.of(
+ "x-nemo-feedback", new Variant<>(vibration),
+ "x-nemo-preview-body", new Variant<>(body),
+ "x-nemo-preview-summary", new Variant<>(summary),
+ "urgency", new Variant<>((byte) 3)), 0));
+ }
+ }, 500);
+ } else if (Objects.equals(event, "removed")) {
+ String key = Objects.requireNonNull(intent.getStringExtra("key"));
+ // Avoid an infinite loop when the user dismisses the notification on the watch
+ if (mapping.containsKey(key)) {
+ UInt32 id;
+ synchronized (mapping) {
+ id = mapping.get(key);
+ mapping.remove(key);
+ }
+ connectionProvider.acquireDBusConnectionLater(notify -> notify.getRemoteObject("org.freedesktop.Notifications", "/org/freedesktop/Notifications", Notifications.class)
+ .CloseNotification(id), 500);
+ }
+ }
+ }
+
+ @Override
+ public void handle(Notifications.NotificationClosed s) {
+ synchronized (mapping) {
+ if (s.reason == Notifications.NotificationClosed.REASON_DISMISSED_BY_USER
+ && mapping.containsValue(s.id)) {
+ Intent dismiss = new Intent("org.asteroidos.sync.NOTIFICATION_LISTENER_SERVICE");
+ dismiss.putExtra("command", "dismiss");
+ dismiss.putExtra("key", mapping.inverse().get(s.id));
+
+ mapping.inverse().remove(s.id);
+ mCtx.sendBroadcast(dismiss);
+ }
+ }
+ }
+
+ @Override
+ public void sync() {
+ if (mNReceiver == null) {
+ IntentFilter filter = new IntentFilter();
+ filter.addAction("org.asteroidos.sync.NOTIFICATION_LISTENER");
+ mNReceiver = new NotificationReceiver();
+ mCtx.registerReceiver(mNReceiver, filter);
+
+ Intent i = new Intent("org.asteroidos.sync.NOTIFICATION_LISTENER_SERVICE");
+ i.putExtra("command", "refresh");
+ mCtx.sendBroadcast(i);
+ }
+ connectionProvider.acquireDBusConnection(notify -> notify.addSigHandler(Notifications.NotificationClosed.class, notify.getRemoteObject("org.freedesktop.Notifications", "/org/freedesktop/Notifications", Notifications.class), DBusNotificationService.this));
+ }
+
+ @Override
+ public void unsync() {
+ connectionProvider.acquireDBusConnection(notify -> notify.removeSigHandler(Notifications.NotificationClosed.class, notify.getRemoteObject("org.freedesktop.Notifications", "/org/freedesktop/Notifications", Notifications.class), DBusNotificationService.this));
+ if (mNReceiver != null) {
+ try {
+ mCtx.unregisterReceiver(mNReceiver);
+ } catch (IllegalArgumentException ignored) {
+ }
+ mNReceiver = null;
+ }
+ }
+
+ class NotificationReceiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ postNotification(context, intent);
+ }
+ }
+}
diff --git a/app/src/main/java/org/asteroidos/sync/dbus/IDBusConnectionCallback.java b/app/src/main/java/org/asteroidos/sync/dbus/IDBusConnectionCallback.java
new file mode 100644
index 00000000..146b60a7
--- /dev/null
+++ b/app/src/main/java/org/asteroidos/sync/dbus/IDBusConnectionCallback.java
@@ -0,0 +1,27 @@
+/*
+ * AsteroidOSSync
+ * Copyright (c) 2024 AsteroidOS
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see getPackageInfo(Context context)
}
}
else {
- icon = Bitmap.createBitmap(apkIcon.getIntrinsicWidth(), apkIcon.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
- Canvas canvas = new Canvas(icon);
- apkIcon.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
- apkIcon.draw(canvas);
+ if (apkIcon.getIntrinsicWidth() <= 0 || apkIcon.getIntrinsicHeight() <= 0)
+ icon = Bitmap.createBitmap(144, 144, Bitmap.Config.ARGB_8888);
+ else {
+ icon = Bitmap.createBitmap(apkIcon.getIntrinsicWidth(), apkIcon.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+ Canvas canvas = new Canvas(icon);
+ apkIcon.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+ apkIcon.draw(canvas);
+ }
}
} catch(ClassCastException ignored) {}
AppInfo appInfo = new AppInfo(pinfo.packageName,
diff --git a/app/src/main/java/org/freedesktop/DBus.java b/app/src/main/java/org/freedesktop/DBus.java
new file mode 100644
index 00000000..5d99a648
--- /dev/null
+++ b/app/src/main/java/org/freedesktop/DBus.java
@@ -0,0 +1,490 @@
+/*
+ D-Bus Java Implementation
+ Copyright (c) 2005-2006 Matthew Johnson
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of either the GNU Lesser General Public License Version 2 or the
+ Academic Free Licence Version 2.1.
+
+ Full licence texts are included in the COPYING file with this program.
+*/
+package org.freedesktop;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import java.util.Map;
+import java.util.List;
+
+import org.freedesktop.dbus.DBusInterface;
+import org.freedesktop.dbus.DBusSignal;
+import org.freedesktop.dbus.Position;
+import org.freedesktop.dbus.Struct;
+import org.freedesktop.dbus.Tuple;
+import org.freedesktop.dbus.UInt16;
+import org.freedesktop.dbus.UInt32;
+import org.freedesktop.dbus.UInt64;
+import org.freedesktop.dbus.Variant;
+import org.freedesktop.dbus.exceptions.DBusException;
+import org.freedesktop.dbus.exceptions.DBusExecutionException;
+
+public interface DBus extends DBusInterface
+{
+ public static final int DBUS_NAME_FLAG_ALLOW_REPLACEMENT = 0x01;
+ public static final int DBUS_NAME_FLAG_REPLACE_EXISTING = 0x02;
+ public static final int DBUS_NAME_FLAG_DO_NOT_QUEUE = 0x04;
+ public static final int DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER = 1;
+ public static final int DBUS_REQUEST_NAME_REPLY_IN_QUEUE = 2;
+ public static final int DBUS_REQUEST_NAME_REPLY_EXISTS = 3;
+ public static final int DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER = 4;
+ public static final int DBUS_RELEASE_NAME_REPLY_RELEASED = 1;
+ public static final int DBUS_RELEASE_NAME_REPLY_NON_EXISTANT = 2;
+ public static final int DBUS_RELEASE_NAME_REPLY_NOT_OWNER = 3;
+ public static final int DBUS_START_REPLY_SUCCESS = 1;
+ public static final int DBUS_START_REPLY_ALREADY_RUNNING = 2;
+ /**
+ * All DBus Applications should respond to the Ping method on this interface
+ */
+ public interface Peer extends DBusInterface
+ {
+ public void Ping();
+ }
+ /**
+ * Objects can provide introspection data via this interface and method.
+ * See the Introspection Format .
+ */
+ public interface Introspectable extends DBusInterface
+ {
+ /**
+ * @return The XML introspection data for this object
+ */
+ public String Introspect();
+ }
+ /**
+ * A standard properties interface.
+ */
+ public interface Properties extends DBusInterface
+ {
+ /**
+ * Get the value for the given property.
+ * @param interface_name The interface this property is associated with.
+ * @param property_name The name of the property.
+ * @return The value of the property (may be any valid DBus type).
+ */
+ public A Get (String interface_name, String property_name);
+ /**
+ * Set the value for the given property.
+ * @param interface_name The interface this property is associated with.
+ * @param property_name The name of the property.
+ * @param value The new value of the property (may be any valid DBus type).
+ */
+ public void Set (String interface_name, String property_name, A value);
+ /**
+ * Get all properties and values.
+ * @param interface_name The interface the properties is associated with.
+ * @return The properties mapped to their values.
+ */
+ public Map GetAll (String interface_name);
+ }
+ /**
+ * Messages generated locally in the application.
+ */
+ public interface Local extends DBusInterface
+ {
+ public class Disconnected extends DBusSignal
+ {
+ public Disconnected(String path) throws DBusException
+ {
+ super(path);
+ }
+ }
+ }
+
+ /**
+ * Initial message to register ourselves on the Bus.
+ * @return The unique name of this connection to the Bus.
+ */
+ public String Hello();
+ /**
+ * Lists all connected names on the Bus.
+ * @return An array of all connected names.
+ */
+ public String[] ListNames();
+ /**
+ * Determine if a name has an owner.
+ * @param name The name to query.
+ * @return true if the name has an owner.
+ */
+ public boolean NameHasOwner(String name);
+ /**
+ * Get the connection unique name that owns the given name.
+ * @param name The name to query.
+ * @return The connection which owns the name.
+ */
+ public String GetNameOwner(String name);
+ /**
+ * Get the Unix UID that owns a connection name.
+ * @param connection_name The connection name.
+ * @return The Unix UID that owns it.
+ */
+ public UInt32 GetConnectionUnixUser(String connection_name);
+ /**
+ * Start a service. If the given service is not provided
+ * by any application, it will be started according to the .service file
+ * for that service.
+ * @param name The service name to start.
+ * @param flags Unused.
+ * @return DBUS_START_REPLY constants.
+ */
+ public UInt32 StartServiceByName(String name, UInt32 flags);
+ /**
+ * Request a name on the bus.
+ * @param name The name to request.
+ * @param flags DBUS_NAME flags.
+ * @return DBUS_REQUEST_NAME_REPLY constants.
+ */
+ public UInt32 RequestName(String name, UInt32 flags);
+ /**
+ * Release a name on the bus.
+ * @param name The name to release.
+ * @return DBUS_RELEASE_NAME_REPLY constants.
+ */
+ public UInt32 ReleaseName(String name);
+
+ /**
+ * Add a match rule.
+ * Will cause you to receive messages that aren't directed to you which
+ * match this rule.
+ * @param matchrule The Match rule as a string. Format Undocumented.
+ */
+ public void AddMatch(String matchrule) throws Error.MatchRuleInvalid;
+
+ /**
+ * Remove a match rule.
+ * Will cause you to stop receiving messages that aren't directed to you which
+ * match this rule.
+ * @param matchrule The Match rule as a string. Format Undocumented.
+ */
+ public void RemoveMatch(String matchrule) throws Error.MatchRuleInvalid;
+
+ /**
+ * List the connections currently queued for a name.
+ * @param name The name to query
+ * @return A list of unique connection IDs.
+ */
+ public String[] ListQueuedOwners(String name);
+
+ /**
+ * Returns the proccess ID associated with a connection.
+ * @param connection_name The name of the connection
+ * @return The PID of the connection.
+ */
+ public UInt32 GetConnectionUnixProcessID(String connection_name);
+
+ /**
+ * Does something undocumented.
+ */
+ public Byte[] GetConnectionSELinuxSecurityContext(String a);
+
+ /**
+ * Does something undocumented.
+ */
+ public void ReloadConfig();
+
+ /**
+ * Signal sent when the owner of a name changes
+ */
+ public class NameOwnerChanged extends DBusSignal
+ {
+ public final String name;
+ public final String old_owner;
+ public final String new_owner;
+ public NameOwnerChanged(String path, String name, String old_owner, String new_owner) throws DBusException
+ {
+ super(path, new Object[] { name, old_owner, new_owner });
+ this.name = name;
+ this.old_owner = old_owner;
+ this.new_owner = new_owner;
+ }
+ }
+ /**
+ * Signal sent to a connection when it loses a name
+ */
+ public class NameLost extends DBusSignal
+ {
+ public final String name;
+ public NameLost(String path, String name) throws DBusException
+ {
+ super(path, name);
+ this.name = name;
+ }
+ }
+ /**
+ * Signal sent to a connection when it aquires a name
+ */
+ public class NameAcquired extends DBusSignal
+ {
+ public final String name;
+ public NameAcquired(String path, String name) throws DBusException
+ {
+ super(path, name);
+ this.name = name;
+ }
+ }
+ /**
+ * Contains standard errors that can be thrown from methods.
+ */
+ public interface Error
+ {
+ /**
+ * Thrown if the method called was unknown on the remote object
+ */
+ @SuppressWarnings("serial")
+ public class UnknownMethod extends DBusExecutionException
+ {
+ public UnknownMethod(String message)
+ {
+ super(message);
+ }
+ }
+ /**
+ * Thrown if the object was unknown on a remote connection
+ */
+ @SuppressWarnings("serial")
+ public class UnknownObject extends DBusExecutionException
+ {
+ public UnknownObject(String message)
+ {
+ super(message);
+ }
+ }
+ /**
+ * Thrown if the requested service was not available
+ */
+ @SuppressWarnings("serial")
+ public class ServiceUnknown extends DBusExecutionException
+ {
+ public ServiceUnknown(String message)
+ {
+ super(message);
+ }
+ }
+ /**
+ * Thrown if the match rule is invalid
+ */
+ @SuppressWarnings("serial")
+ public class MatchRuleInvalid extends DBusExecutionException
+ {
+ public MatchRuleInvalid(String message)
+ {
+ super(message);
+ }
+ }
+ /**
+ * Thrown if there is no reply to a method call
+ */
+ @SuppressWarnings("serial")
+ public class NoReply extends DBusExecutionException
+ {
+ public NoReply(String message)
+ {
+ super(message);
+ }
+ }
+ /**
+ * Thrown if a message is denied due to a security policy
+ */
+ @SuppressWarnings("serial")
+ public class AccessDenied extends DBusExecutionException
+ {
+ public AccessDenied(String message)
+ {
+ super(message);
+ }
+ }
+ }
+ /**
+ * Description of the interface or method, returned in the introspection data
+ */
+ @Retention(RetentionPolicy.RUNTIME)
+ public @interface Description
+ {
+ String value();
+ }
+ /**
+ * Indicates that a DBus interface or method is deprecated
+ */
+ @Retention(RetentionPolicy.RUNTIME)
+ public @interface Deprecated {}
+ /**
+ * Contains method-specific annotations
+ */
+ public interface Method
+ {
+ /**
+ * Methods annotated with this do not send a reply
+ */
+ @Target(ElementType.METHOD)
+ @Retention(RetentionPolicy.RUNTIME)
+ public @interface NoReply {}
+ /**
+ * Give an error that the method can return
+ */
+ @Target(ElementType.METHOD)
+ @Retention(RetentionPolicy.RUNTIME)
+ public @interface Error
+ {
+ String value();
+ }
+ }
+ /**
+ * Contains GLib-specific annotations
+ */
+ public interface GLib
+ {
+ /**
+ * Define a C symbol to map to this method. Used by GLib only
+ */
+ @Target(ElementType.METHOD)
+ @Retention(RetentionPolicy.RUNTIME)
+ public @interface CSymbol
+ {
+ String value();
+ }
+ }
+ /**
+ * Contains Binding-test interfaces
+ */
+ public interface Binding
+ {
+ public interface SingleTests extends DBusInterface
+ {
+ @Description("Returns the sum of the values in the input list")
+ public UInt32 Sum(byte[] a);
+ }
+ public interface TestClient extends DBusInterface
+ {
+ @Description("when the trigger signal is received, this method should be called on the sending process/object.")
+ public void Response(UInt16 a, double b);
+ @Description("Causes a callback")
+ public static class Trigger extends DBusSignal
+ {
+ public final UInt16 a;
+ public final double b;
+ public Trigger(String path, UInt16 a, double b) throws DBusException
+ {
+ super(path, a, b);
+ this.a = a;
+ this.b = b;
+ }
+ }
+
+ }
+ public interface Tests extends DBusInterface
+ {
+ @Description("Returns whatever it is passed")
+ public Variant Identity(Variant input);
+ @Description("Returns whatever it is passed")
+ public byte IdentityByte(byte input);
+ @Description("Returns whatever it is passed")
+ public boolean IdentityBool(boolean input);
+ @Description("Returns whatever it is passed")
+ public short IdentityInt16(short input);
+ @Description("Returns whatever it is passed")
+ public UInt16 IdentityUInt16(UInt16 input);
+ @Description("Returns whatever it is passed")
+ public int IdentityInt32(int input);
+ @Description("Returns whatever it is passed")
+ public UInt32 IdentityUInt32(UInt32 input);
+ @Description("Returns whatever it is passed")
+ public long IdentityInt64(long input);
+ @Description("Returns whatever it is passed")
+ public UInt64 IdentityUInt64(UInt64 input);
+ @Description("Returns whatever it is passed")
+ public double IdentityDouble(double input);
+ @Description("Returns whatever it is passed")
+ public String IdentityString(String input);
+ @Description("Returns whatever it is passed")
+ public Variant[] IdentityArray(Variant[] input);
+ @Description("Returns whatever it is passed")
+ public byte[] IdentityByteArray(byte[] input);
+ @Description("Returns whatever it is passed")
+ public boolean[] IdentityBoolArray(boolean[] input);
+ @Description("Returns whatever it is passed")
+ public short[] IdentityInt16Array(short[] input);
+ @Description("Returns whatever it is passed")
+ public UInt16[] IdentityUInt16Array(UInt16[] input);
+ @Description("Returns whatever it is passed")
+ public int[] IdentityInt32Array(int[] input);
+ @Description("Returns whatever it is passed")
+ public UInt32[] IdentityUInt32Array(UInt32[] input);
+ @Description("Returns whatever it is passed")
+ public long[] IdentityInt64Array(long[] input);
+ @Description("Returns whatever it is passed")
+ public UInt64[] IdentityUInt64Array(UInt64[] input);
+ @Description("Returns whatever it is passed")
+ public double[] IdentityDoubleArray(double[] input);
+ @Description("Returns whatever it is passed")
+ public String[] IdentityStringArray(String[] input);
+ @Description("Returns the sum of the values in the input list")
+ public long Sum(int[] a);
+ @Description("Given a map of A => B, should return a map of B => a list of all the As which mapped to B")
+ public Map> InvertMapping(Map a);
+ @Description("This method returns the contents of a struct as separate values")
+ public Triplet DeStruct(TestStruct a);
+ @Description("Given any compound type as a variant, return all the primitive types recursively contained within as an array of variants")
+ public List> Primitize(Variant a);
+ @Description("inverts it's input")
+ public boolean Invert(boolean a);
+ @Description("triggers sending of a signal from the supplied object with the given parameter")
+ public void Trigger(String a, UInt64 b);
+ @Description("Causes the server to exit")
+ public void Exit();
+ }
+ public interface TestSignals extends DBusInterface
+ {
+ @Description("Sent in response to a method call")
+ public static class Triggered extends DBusSignal
+ {
+ public final UInt64 a;
+ public Triggered(String path, UInt64 a) throws DBusException
+ {
+ super(path, a);
+ this.a = a;
+ }
+ }
+ }
+ public final class Triplet extends Tuple
+ {
+ @Position(0)
+ public final A a;
+ @Position(1)
+ public final B b;
+ @Position(2)
+ public final C c;
+ public Triplet(A a, B b, C c)
+ {
+ this.a = a;
+ this.b = b;
+ this.c = c;
+ }
+ }
+ public final class TestStruct extends Struct
+ {
+ @Position(0)
+ public final String a;
+ @Position(1)
+ public final UInt32 b;
+ @Position(2)
+ public final Short c;
+ public TestStruct(String a, UInt32 b, Short c)
+ {
+ this.a = a;
+ this.b = b;
+ this.c = c;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/org/freedesktop/Notifications.java b/app/src/main/java/org/freedesktop/Notifications.java
new file mode 100644
index 00000000..e873a5b2
--- /dev/null
+++ b/app/src/main/java/org/freedesktop/Notifications.java
@@ -0,0 +1,52 @@
+/*
+ * AsteroidOSSync
+ * Copyright (c) 2024 AsteroidOS
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see GetCapabilities();
+
+ public UInt32 Notify(String app_name, UInt32 replaces_id, String app_icon, String summary, String body, List actions, Map hints, int expire_timeout);
+
+ public void CloseNotification(UInt32 id);
+}
diff --git a/app/src/main/java/org/freedesktop/dbus/AbstractConnection.java b/app/src/main/java/org/freedesktop/dbus/AbstractConnection.java
new file mode 100644
index 00000000..2b289cc4
--- /dev/null
+++ b/app/src/main/java/org/freedesktop/dbus/AbstractConnection.java
@@ -0,0 +1,1030 @@
+/*
+ D-Bus Java Implementation
+ Copyright (c) 2005-2006 Matthew Johnson
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of either the GNU Lesser General Public License Version 2 or the
+ Academic Free Licence Version 2.1.
+
+ Full licence texts are included in the COPYING file with this program.
+*/
+package org.freedesktop.dbus;
+
+import static org.freedesktop.dbus.Gettext.$_;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+
+import java.io.File;
+import java.io.IOException;
+
+import java.text.MessageFormat;
+import java.text.ParseException;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Vector;
+
+import java.util.regex.Pattern;
+
+import org.freedesktop.DBus;
+import org.freedesktop.dbus.exceptions.NotConnected;
+import org.freedesktop.dbus.exceptions.DBusException;
+import org.freedesktop.dbus.exceptions.DBusExecutionException;
+import org.freedesktop.dbus.exceptions.FatalDBusException;
+import org.freedesktop.dbus.exceptions.FatalException;
+
+import cx.ath.matthew.debug.Debug;
+
+
+/** Handles a connection to DBus.
+ */
+public abstract class AbstractConnection
+{
+ protected class FallbackContainer
+ {
+ private Map fallbacks = new HashMap();
+ public synchronized void add(String path, ExportedObject eo)
+ {
+ if (Debug.debug) Debug.print(Debug.DEBUG, "Adding fallback on "+path+" of "+eo);
+ fallbacks.put(path.split("/"), eo);
+ }
+ public synchronized void remove(String path)
+ {
+ if (Debug.debug) Debug.print(Debug.DEBUG, "Removing fallback on "+path);
+ fallbacks.remove(path.split("/"));
+ }
+ public synchronized ExportedObject get(String path)
+ {
+ int best = 0;
+ int i = 0;
+ ExportedObject bestobject = null;
+ String[] pathel = path.split("/");
+ for (String[] fbpath: fallbacks.keySet()) {
+ if (Debug.debug) Debug.print(Debug.VERBOSE, "Trying fallback path "+Arrays.deepToString(fbpath)+" to match "+Arrays.deepToString(pathel));
+ for (i = 0; i < pathel.length && i < fbpath.length; i++)
+ if (!pathel[i].equals(fbpath[i])) break;
+ if (i > 0 && i == fbpath.length && i > best)
+ bestobject = fallbacks.get(fbpath);
+ if (Debug.debug) Debug.print(Debug.VERBOSE, "Matches "+i+" bestobject now "+bestobject);
+ }
+ if (Debug.debug) Debug.print(Debug.DEBUG, "Found fallback for "+path+" of "+bestobject);
+ return bestobject;
+ }
+ }
+ protected class _thread extends Thread
+ {
+ public _thread()
+ {
+ setName("DBusConnection");
+ }
+ public void run()
+ {
+ try {
+ Message m = null;
+ while (_run) {
+ m = null;
+
+ // read from the wire
+ try {
+ // this blocks on outgoing being non-empty or a message being available.
+ m = readIncoming();
+ if (m != null) {
+ if (Debug.debug) Debug.print(Debug.VERBOSE, "Got Incoming Message: "+m);
+ synchronized (this) { notifyAll(); }
+
+ if (m instanceof DBusSignal)
+ handleMessage((DBusSignal) m);
+ else if (m instanceof MethodCall)
+ handleMessage((MethodCall) m);
+ else if (m instanceof MethodReturn)
+ handleMessage((MethodReturn) m);
+ else if (m instanceof Error)
+ handleMessage((Error) m);
+
+ m = null;
+ }
+ } catch (Exception e) {
+ if (EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, e);
+ if (e instanceof FatalException) {
+ disconnect();
+ }
+ }
+
+ }
+ synchronized (this) { notifyAll(); }
+ } catch (Exception e) {
+ if (Debug.debug && EXCEPTION_DEBUG) Debug.print(Debug.ERR, e);
+ }
+ }
+ }
+ private class _globalhandler implements org.freedesktop.DBus.Peer, org.freedesktop.DBus.Introspectable
+ {
+ private String objectpath;
+ public _globalhandler()
+ {
+ this.objectpath = null;
+ }
+ public _globalhandler(String objectpath)
+ {
+ this.objectpath = objectpath;
+ }
+ public boolean isRemote() { return false; }
+ public void Ping() { return; }
+ public String Introspect()
+ {
+ String intro = objectTree.Introspect(objectpath);
+ if (null == intro) {
+ ExportedObject eo = fallbackcontainer.get(objectpath);
+ if (null != eo) intro = eo.introspectiondata;
+ }
+ if (null == intro)
+ throw new DBus.Error.UnknownObject("Introspecting on non-existant object");
+ else return
+ "\n"+intro;
+ }
+ }
+ protected class _workerthread extends Thread
+ {
+ private boolean _run = true;
+ public void halt()
+ {
+ _run = false;
+ }
+ public void run()
+ {
+ while (_run) {
+ Runnable r = null;
+ synchronized (runnables) {
+ while (runnables.size() == 0 && _run)
+ try { runnables.wait(); } catch (InterruptedException Ie) {}
+ if (runnables.size() > 0)
+ r = runnables.removeFirst();
+ }
+ if (null != r) r.run();
+ }
+ }
+ }
+ private class _sender extends Thread
+ {
+ public _sender()
+ {
+ setName("Sender");
+ }
+ public void run()
+ {
+ Message m = null;
+
+ if (Debug.debug) Debug.print(Debug.INFO, "Monitoring outbound queue");
+ // block on the outbound queue and send from it
+ while (_run) {
+ if (null != outgoing) synchronized (outgoing) {
+ if (Debug.debug) Debug.print(Debug.VERBOSE, "Blocking");
+ while (outgoing.size() == 0 && _run)
+ try { outgoing.wait(); } catch (InterruptedException Ie) {}
+ if (Debug.debug) Debug.print(Debug.VERBOSE, "Notified");
+ if (outgoing.size() > 0)
+ m = outgoing.remove();
+ if (Debug.debug) Debug.print(Debug.DEBUG, "Got message: "+m);
+ }
+ if (null != m)
+ sendMessage(m);
+ m = null;
+ }
+
+ if (Debug.debug) Debug.print(Debug.INFO, "Flushing outbound queue and quitting");
+ // flush the outbound queue before disconnect.
+ if (null != outgoing) do {
+ EfficientQueue ogq = outgoing;
+ synchronized (ogq) {
+ outgoing = null;
+ }
+ if (!ogq.isEmpty())
+ m = ogq.remove();
+ else m = null;
+ sendMessage(m);
+ } while (null != m);
+
+ // close the underlying streams
+ }
+ }
+ /**
+ * Timeout in us on checking the BUS for incoming messages and sending outgoing messages
+ */
+ protected static final int TIMEOUT = 100000;
+ /** Initial size of the pending calls map */
+ private static final int PENDING_MAP_INITIAL_SIZE = 10;
+ static final String BUSNAME_REGEX = "^[-_a-zA-Z][-_a-zA-Z0-9]*(\\.[-_a-zA-Z][-_a-zA-Z0-9]*)*$";
+ static final String CONNID_REGEX = "^:[0-9]*\\.[0-9]*$";
+ static final String OBJECT_REGEX = "^/([-_a-zA-Z0-9]+(/[-_a-zA-Z0-9]+)*)?$";
+ static final byte THREADCOUNT = 4;
+ static final int MAX_ARRAY_LENGTH = 67108864;
+ static final int MAX_NAME_LENGTH = 255;
+ protected Map exportedObjects;
+ private ObjectTree objectTree;
+ private _globalhandler _globalhandlerreference;
+ protected Map importedObjects;
+ protected Map>> handledSignals;
+ protected EfficientMap pendingCalls;
+ protected Map> pendingCallbacks;
+ protected Map> pendingCallbackReplys;
+ protected LinkedList runnables;
+ protected LinkedList<_workerthread> workers;
+ protected FallbackContainer fallbackcontainer;
+ protected boolean _run;
+ EfficientQueue outgoing;
+ LinkedList pendingErrors;
+ private static final Map infomap = new HashMap();
+ protected _thread thread;
+ protected _sender sender;
+ protected Transport transport;
+ protected String addr;
+ protected boolean weakreferences = false;
+ static final Pattern dollar_pattern = Pattern.compile("[$]");
+ public static final boolean EXCEPTION_DEBUG;
+ static final boolean FLOAT_SUPPORT;
+ protected boolean connected = false;
+ static {
+ FLOAT_SUPPORT = (null != System.getenv("DBUS_JAVA_FLOATS"));
+ EXCEPTION_DEBUG = (null != System.getenv("DBUS_JAVA_EXCEPTION_DEBUG"));
+ if (EXCEPTION_DEBUG) {
+ Debug.print("Debugging of internal exceptions enabled");
+ Debug.setThrowableTraces(true);
+ }
+ if (Debug.debug) {
+ File f = new File("debug.conf");
+ if (f.exists()) {
+ Debug.print("Loading debug config file: "+f);
+ try {
+ Debug.loadConfig(f);
+ } catch (IOException IOe) {}
+ } else {
+ Properties p = new Properties();
+ p.setProperty("ALL", "INFO");
+ Debug.print("debug config file "+f+" does not exist, not loading.");
+ }
+ Debug.setHexDump(true);
+ }
+ }
+
+ protected AbstractConnection(String address) throws DBusException
+ {
+ exportedObjects = new HashMap();
+ importedObjects = new HashMap();
+ _globalhandlerreference = new _globalhandler();
+ synchronized (exportedObjects) {
+ exportedObjects.put(null, new ExportedObject(_globalhandlerreference, weakreferences));
+ }
+ handledSignals = new HashMap>>();
+ pendingCalls = new EfficientMap(PENDING_MAP_INITIAL_SIZE);
+ outgoing = new EfficientQueue(PENDING_MAP_INITIAL_SIZE);
+ pendingCallbacks = new HashMap>();
+ pendingCallbackReplys = new HashMap>();
+ pendingErrors = new LinkedList