X-Git-Url: http://git.joshuawise.com/dumload.git/blobdiff_plain/42aa7dfda6c5898856be74d57c8253ac75977d72..113e5e9f0483796238df53b9d6a55ad63ca15f4a:/src/com/joshuawise/dumload/Uploader.java?ds=sidebyside

diff --git a/src/com/joshuawise/dumload/Uploader.java b/src/com/joshuawise/dumload/Uploader.java
index e7725e9..6aa3317 100644
--- a/src/com/joshuawise/dumload/Uploader.java
+++ b/src/com/joshuawise/dumload/Uploader.java
@@ -1,3 +1,19 @@
+/* Uploader.java
+ * Back-end upload logic for Dumload.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License, version 3, as
+ * published by the Free Software Foundation.
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
 package com.joshuawise.dumload;
 
 import java.io.InputStream;
@@ -284,10 +300,14 @@ public class Uploader extends Service implements Runnable, UserInfo, UIKeyboardI
 				jsch.addIdentity(homedir + "/id_dsa");
 			} catch (java.lang.Exception e) {
 			}
+			try {
+				jsch.addIdentity(homedir + "/id_dsa_generated");
+			} catch (java.lang.Exception e) {
+			}
 			SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 			String server = prefs.getString("server", "").trim();
 			String userName = prefs.getString("userName", "").trim();
-			Integer port = prefs.getInt("serverPort", 22);
+			Integer port = Integer.valueOf(prefs.getString("port", "22"));
 			Log.d("dbg", userName + "@" + server + ":" + port);
 			Session s = jsch.getSession(userName, server, port);
 			s.setUserInfo(this);