From 4284150f36d62fc6a0f3b50dc946cd42a54ac633 Mon Sep 17 00:00:00 2001
From: Roberto Tyley <roberto@github.com>
Date: Wed, 14 Mar 2012 12:01:09 +0000
Subject: [PATCH] Tidy, removing RoboGuice & other unused stuff, version
 updates

---
 AndroidManifest.xml                           |  1 -
 pom.xml                                       | 25 +++------------
 .../com/madgag/ssh/toysshagent/SshUtil.java   |  3 +-
 .../toysshagent/ToySshAgentApplication.java   | 32 -------------------
 .../ssh/toysshagent/ToySshAgentModule.java    | 32 -------------------
 5 files changed, 7 insertions(+), 86 deletions(-)
 delete mode 100644 src/main/java/com/madgag/ssh/toysshagent/ToySshAgentApplication.java
 delete mode 100644 src/main/java/com/madgag/ssh/toysshagent/ToySshAgentModule.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9d93fb4..fe31bd8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,7 +25,6 @@
           android:versionName="1.0">
     <uses-sdk android:minSdkVersion="7" />
     <application
-            android:name="com.madgag.ssh.toysshagent.ToySshAgentApplication"
             android:icon="@drawable/icon"
             android:label="@string/app_name"
             android:debuggable="true">
diff --git a/pom.xml b/pom.xml
index e33d107..c116a93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>net.schmizz</groupId>
             <artifactId>sshj</artifactId>
-            <version>0.3.1</version>
+            <version>0.7.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -94,16 +94,6 @@
             <artifactId>scprov-jdk15</artifactId>
             <version>1.46.99.3-UNOFFICIAL-ROBERTO-RELEASE</version>
         </dependency>
-        <dependency>
-            <groupId>org.roboguice</groupId>
-            <artifactId>roboguice</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-            <version>2.0-no_aop</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -117,23 +107,18 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <target>1.5</target>
-                    <source>1.5</source>
+                    <target>1.6</target>
+                    <source>1.6</source>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                <artifactId>maven-android-plugin</artifactId>
-                <version>2.9.0-beta-2</version>
+                <artifactId>android-maven-plugin</artifactId>
+                <version>3.1.1</version>
                 <configuration>
                     <sdk>
-                        <path>${user.home}/android-sdk/</path>
                         <platform>8</platform>
                     </sdk>
-                    <emulator>
-                        <avd>22</avd>
-                    </emulator>
-                    <deleteConflictingFiles>true</deleteConflictingFiles>
                     <extractDuplicates>true</extractDuplicates>
                 </configuration>
                 <extensions>true</extensions>
diff --git a/src/main/java/com/madgag/ssh/toysshagent/SshUtil.java b/src/main/java/com/madgag/ssh/toysshagent/SshUtil.java
index 6f8a047..99034fe 100644
--- a/src/main/java/com/madgag/ssh/toysshagent/SshUtil.java
+++ b/src/main/java/com/madgag/ssh/toysshagent/SshUtil.java
@@ -23,6 +23,7 @@
 import java.security.PublicKey;
 import java.security.Security;
 
+import net.schmizz.sshj.common.Buffer;
 import net.schmizz.sshj.common.Buffer.PlainBuffer;
 import net.schmizz.sshj.common.KeyType;
 
@@ -38,7 +39,7 @@ public class SshUtil {
 		Security.addProvider(new BouncyCastleProvider());
 	}
 
-    public PublicKey sshDecode(byte[] bytes) {
+    public PublicKey sshDecode(byte[] bytes) throws Buffer.BufferException {
 		return new PlainBuffer(bytes).readPublicKey();
 	}
 
diff --git a/src/main/java/com/madgag/ssh/toysshagent/ToySshAgentApplication.java b/src/main/java/com/madgag/ssh/toysshagent/ToySshAgentApplication.java
deleted file mode 100644
index 91c2c5d..0000000
--- a/src/main/java/com/madgag/ssh/toysshagent/ToySshAgentApplication.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2011 Roberto Tyley
- *
- * This file is part of 'Toy Android ssh-agent'.
- *
- * 'Toy Android ssh-agent' 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.
- *
- * 'Toy Android ssh-agent' 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 'Toy Android ssh-agent'.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.madgag.ssh.toysshagent;
-
-import java.util.List;
-
-import roboguice.application.RoboApplication;
-
-import com.google.inject.Module;
-
-public class ToySshAgentApplication extends RoboApplication {
-	protected void addApplicationModules(List<Module> modules) {
-        modules.add(new ToySshAgentModule());
-    }
-}
diff --git a/src/main/java/com/madgag/ssh/toysshagent/ToySshAgentModule.java b/src/main/java/com/madgag/ssh/toysshagent/ToySshAgentModule.java
deleted file mode 100644
index 2bffdd3..0000000
--- a/src/main/java/com/madgag/ssh/toysshagent/ToySshAgentModule.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2011 Roberto Tyley
- *
- * This file is part of 'Toy Android ssh-agent'.
- *
- * 'Toy Android ssh-agent' 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.
- *
- * 'Toy Android ssh-agent' 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 'Toy Android ssh-agent'.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.madgag.ssh.toysshagent;
-
-import android.util.Log;
-import roboguice.config.AbstractAndroidModule;
-
-public class ToySshAgentModule extends AbstractAndroidModule {
-
-	@Override
-    protected void configure() {
-    	Log.i("TSAM", "Configuring the Toy ssh-agent app...");
-    }
-	
-}