CiaranG
/
connectbot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change project to "VX Connectbot"

master
Martin Matuska 2011-12-05 20:29:51 +01:00
parent 9d46c8ca11
commit 4c0b758061
70 changed files with 283 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -3,5 +3,5 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

6
AndroidManifest.xml
View File

@ -16,9 +16,9 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.connectbot"
package="sk.vx.connectbot"
android:versionName="1.7.1"
android:versionCode="356"
android:versionCode="1"
android:installLocation="auto">
<uses-sdk android:targetSdkVersion="11" android:minSdkVersion="3" />
@ -59,7 +59,7 @@
<activity android:name=".HelpTopicActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name=".ColorsActivity" android:configChanges="keyboardHidden|orientation" />
<service android:name="org.connectbot.service.TerminalManager"
<service android:name="sk.vx.connectbot.service.TerminalManager"
android:configChanges="keyboardHidden|orientation"
android:description="@string/service_desc" />

31
assets/help/PhysicalKeyboard.html
View File

@ -1,8 +1,6 @@
<html>
<body style="background-color: #000; color: #fff">
<p><img
src="http://connectbot.googlecode.com/svn/trunk/www/keyboard.jpg" /></p>
<p>Here are some keyboard shortcuts available when a <strong>hardware
keyboard</strong> is present. If you&#x27;re using a phone where the main input
type is a <strong>virtual keyboard</strong>, please see the VirtualKeyboard help topic.
@ -10,18 +8,24 @@ type is a <strong>virtual keyboard</strong>, please see the VirtualKeyboard help
<p><strong>Note:</strong> the side that <strong>shift</strong>, <strong>alt</strong>,
<strong>slash</strong>, and <strong>tab</strong> uses can be changed in
preferences between left, right, and disabled.</p>
<p><strong>Note:</strong> to use advanced Sony Ericsson Xperia (mini) pro key mappings you
have to activate the appropriate option in application settings.</p>
<ul>
<li>Control key (CTRL)</li>
<blockquote>Pressing once on the trackball will toggle on
<strong>control</strong> for the next character typed. The cursor will
indicate this state with a &lt; symbol. Note that pressing the
trackball again will send an <strong>escape</strong> key.</blockquote>
trackball again will send an <strong>escape</strong> key.<br><br>
Xperia (mini) pro: the <strong>Language</strong> key (above right arrow) maps to CTRL.
</blockquote>
</ul>
<ul>
<li>Escape (ESC)</li>
<blockquote>Pressing twice on the trackball will send <strong>escape</strong>
key. Note that some other terminal emulators map pressing <strong>ALT-<i>key</i></strong>
to <strong>escape + <i>key</i></strong>.</blockquote>
to <strong>escape + <i>key</i></strong>.<br><br>
Xperia (mini) pro: pressing the <strong>Language</strong> key (above right arrow)
twice maps to ESC</blockquote>
</ul>
<ul>
<li>Shift</li>
@ -54,9 +58,24 @@ preferences between left, right, and disabled.</p>
<ul>
<li>Function keys (F1 through F10)</li>
<blockquote>Hold down the shift key and press numbers 1
through 10 to send F1 through F10 respectively.</blockquote>
through 10 to send F1 through F10 respectively.<br><br>
Xperia (mini) pro: pressing the <strong>Language</strong> (above right arrow) key twice
and a number (with <strong>Alt</strong>) maps to F1 through F10
</blockquote>
</ul>
<ul>
<li>Navigation keys</li>
<blockquote><strong>Alt</strong> + Up Arrow = Page Up
<br><strong>Alt</strong> + Down Arrow = Page Down
<br><strong>Alt</strong> + Left Arrow = Home
<br><strong>Alt</strong> + Right Arrow = End</blockquote>
</ul>
<ul>
<li>Additional mappings for Xperia (mini) pro:</li>
<blockquote><strong>Alt</strong> + S = pipe symbol
<br><strong>Alt</strong> + Z = backslash
<br><strong>SYM</strong> = opens/closes symbol input dialog</blockquote>
</ul>
</body>
</html>

2
assets/help/VirtualKeyboard.html
View File

@ -1,8 +1,6 @@
<html>
<body style="background-color: #000; color: #fff">
<p><img src="http://connectbot.googlecode.com/svn/trunk/www/magic-cb-screen.png" width="100%" /></p>
<h2>Caveats</h2>
<p>Since ConnectBot doesn&#x27;t use any of the normal TextView
widgets, Android&#x27;s IME structure isn&#x27;t designed to directly

2
res/layout/act_help_topic.xml
View File

@ -24,7 +24,7 @@
android:layout_height="fill_parent"
>
<org.connectbot.util.HelpTopicView
<sk.vx.connectbot.util.HelpTopicView
android:id="@+id/topic_text"
android:layout_width="fill_parent"
android:layout_height="fill_parent"

2
res/layout/dia_gatherentropy.xml
View File

@ -33,7 +33,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="center"/>
<org.connectbot.util.EntropyView
<sk.vx.connectbot.util.EntropyView
android:id="@+id/entropy"
android:layout_width="fill_parent"
android:layout_height="wrap_content"

2
res/layout/wiz_eula.xml
View File

@ -78,7 +78,7 @@
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:autoLink="web"
android:text="Copyright \u00a9 2007-2008 Kenny Root http://the-b.org, Jeffrey Sharkey http://jsharkey.org\n\nBased in part on the Trilead SSH2 client, provided under a BSD-style license. Copyright \u00a9 2007 Trilead AG. http://www.trilead.com\n\nAlso based on JTA Telnet/SSH client, provided under the GPLv2 license. Copyright \u00a9 Matthias L. Jugel, Marcus Meiner 1996-2005. http://www.javassh.org\n\nAlso based in part on the JSOCKS library, provided under the GNU LGPL license. http://jsocks.sourceforge.net\n\nAlso based in part on JZlib provided under a BSD-style license. Copyright \u00a9 JCraft, Inc., 2000-20004 http://www.jcraft.com"
android:text="Copyright \u00a9 2007-2008 Kenny Root http://the-b.org, Jeffrey Sharkey http://jsharkey.org\nCopyright \u00a9 2011 Martin Matuska. http://www.vx.sk\n\nBased in part on the Trilead SSH2 client, provided under a BSD-style license. Copyright \u00a9 2007 Trilead AG. http://www.trilead.com\n\nAlso based on JTA Telnet/SSH client, provided under the GPLv2 license. Copyright \u00a9 Matthias L. Jugel, Marcus Meiner 1996-2005. http://www.javassh.org\n\nAlso based in part on the JSOCKS library, provided under the GNU LGPL license. http://jsocks.sourceforge.net\n\nAlso based in part on JZlib provided under a BSD-style license. Copyright \u00a9 JCraft, Inc., 2000-2004 http://www.jcraft.com"
android:textSize="14sp"
android:textColor="#bebebe"
/>

2
res/values/notrans.xml
View File

@ -18,7 +18,7 @@
*/
-->
<resources>
<string name="app_name" translatable="false">ConnectBot</string>
<string name="app_name" translatable="false">VX ConnectBot</string>
<!-- DO NOT MANUALLY UPDATE VERSION!!!
Updating is update by the ant task "update-version" in build.xml
-->

3
res/values/strings.xml
View File

@ -459,7 +459,7 @@
<string name="menu_colors_reset">"Reset"</string>
<!-- Displayed in the notification bar that connections are active -->
<string name="app_is_running">"ConnectBot is running"</string>
<string name="app_is_running">"VX ConnectBot is running"</string>
<string name="color_red">"red"</string>
<string name="color_green">"green"</string>
@ -469,4 +469,5 @@
<!-- Sony Xperia (mini) pro HW keyboard fix -->
<string name="pref_xperiapro_title">Sony Ericsson Xperia (mini) pro key remap</string>
<string name="pref_xperiapro_summary">Remap keys on Xperia (mini) pro hardware keyboard</string>
</resources>

3
res/xml/preferences.xml
View File

@ -133,7 +133,7 @@
android:defaultValue="true"
/>
<org.connectbot.util.VolumePreference
<sk.vx.connectbot.util.VolumePreference
android:key="bellVolume"
android:title="@string/pref_bell_volume_title"
/>
@ -160,4 +160,5 @@
</PreferenceCategory>
</PreferenceScreen>

17
src/org/connectbot/ColorsActivity.java → src/sk/vx/connectbot/ColorsActivity.java
View File

@ -15,16 +15,15 @@
* limitations under the License.
*/
package org.connectbot;
package sk.vx.connectbot;
import java.util.Arrays;
import java.util.List;
import org.connectbot.util.Colors;
import org.connectbot.util.HostDatabase;
import org.connectbot.util.UberColorPickerDialog;
import org.connectbot.util.UberColorPickerDialog.OnColorChangedListener;
import sk.vx.connectbot.util.Colors;
import sk.vx.connectbot.util.HostDatabase;
import sk.vx.connectbot.util.UberColorPickerDialog;
import sk.vx.connectbot.util.UberColorPickerDialog.OnColorChangedListener;
import android.app.Activity;
import android.content.Context;
import android.graphics.Canvas;
@ -32,15 +31,15 @@ import android.graphics.Paint;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.MenuItem.OnMenuItemClickListener;
import android.view.View;
import android.view.ViewGroup;
import android.view.MenuItem.OnMenuItemClickListener;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.BaseAdapter;
import android.widget.GridView;
import android.widget.Spinner;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.AdapterView.OnItemSelectedListener;
/**
* @author Kenny Root

15
src/org/connectbot/ConsoleActivity.java → src/sk/vx/connectbot/ConsoleActivity.java
View File

@ -15,18 +15,17 @@
* limitations under the License.
*/
package org.connectbot;
package sk.vx.connectbot;
import java.lang.ref.WeakReference;
import java.util.List;
import org.connectbot.bean.SelectionArea;
import org.connectbot.service.PromptHelper;
import org.connectbot.service.TerminalBridge;
import org.connectbot.service.TerminalKeyListener;
import org.connectbot.service.TerminalManager;
import org.connectbot.util.PreferenceConstants;
import sk.vx.connectbot.bean.SelectionArea;
import sk.vx.connectbot.service.PromptHelper;
import sk.vx.connectbot.service.TerminalBridge;
import sk.vx.connectbot.service.TerminalKeyListener;
import sk.vx.connectbot.service.TerminalManager;
import sk.vx.connectbot.util.PreferenceConstants;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;

18
src/org/connectbot/GeneratePubkeyActivity.java → src/sk/vx/connectbot/GeneratePubkeyActivity.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot;
package sk.vx.connectbot;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
@ -23,17 +23,15 @@ import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.SecureRandom;
import org.connectbot.bean.PubkeyBean;
import org.connectbot.util.EntropyDialog;
import org.connectbot.util.EntropyView;
import org.connectbot.util.OnEntropyGatheredListener;
import org.connectbot.util.PubkeyDatabase;
import org.connectbot.util.PubkeyUtils;
import sk.vx.connectbot.bean.PubkeyBean;
import sk.vx.connectbot.util.EntropyDialog;
import sk.vx.connectbot.util.EntropyView;
import sk.vx.connectbot.util.OnEntropyGatheredListener;
import sk.vx.connectbot.util.PubkeyDatabase;
import sk.vx.connectbot.util.PubkeyUtils;
import android.app.Activity;
import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@ -48,8 +46,8 @@ import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.RadioGroup;
import android.widget.SeekBar;
import android.widget.RadioGroup.OnCheckedChangeListener;
import android.widget.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
public class GeneratePubkeyActivity extends Activity implements OnEntropyGatheredListener {

2
src/org/connectbot/HelpActivity.java → src/sk/vx/connectbot/HelpActivity.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot;
package sk.vx.connectbot;
import java.io.IOException;

5
src/org/connectbot/HelpTopicActivity.java → src/sk/vx/connectbot/HelpTopicActivity.java
View File

@ -15,10 +15,9 @@
* limitations under the License.
*/
package org.connectbot;
import org.connectbot.util.HelpTopicView;
package sk.vx.connectbot;
import sk.vx.connectbot.util.HelpTopicView;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;

15
src/org/connectbot/HostEditorActivity.java → src/sk/vx/connectbot/HostEditorActivity.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot;
package sk.vx.connectbot;
import java.nio.charset.Charset;
import java.util.Arrays;
@ -23,15 +23,14 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
import java.util.Set;
import org.connectbot.bean.HostBean;
import org.connectbot.service.TerminalBridge;
import org.connectbot.service.TerminalManager;
import org.connectbot.util.HostDatabase;
import org.connectbot.util.PubkeyDatabase;
import sk.vx.connectbot.bean.HostBean;
import sk.vx.connectbot.service.TerminalBridge;
import sk.vx.connectbot.service.TerminalManager;
import sk.vx.connectbot.util.HostDatabase;
import sk.vx.connectbot.util.PubkeyDatabase;
import android.content.ComponentName;
import android.content.ContentValues;
import android.content.Context;

23
src/org/connectbot/HostListActivity.java → src/sk/vx/connectbot/HostListActivity.java
View File

@ -15,17 +15,16 @@
* limitations under the License.
*/
package org.connectbot;
package sk.vx.connectbot;
import java.util.List;
import org.connectbot.bean.HostBean;
import org.connectbot.service.TerminalBridge;
import org.connectbot.service.TerminalManager;
import org.connectbot.transport.TransportFactory;
import org.connectbot.util.HostDatabase;
import org.connectbot.util.PreferenceConstants;
import sk.vx.connectbot.bean.HostBean;
import sk.vx.connectbot.service.TerminalBridge;
import sk.vx.connectbot.service.TerminalManager;
import sk.vx.connectbot.transport.TransportFactory;
import sk.vx.connectbot.util.HostDatabase;
import sk.vx.connectbot.util.PreferenceConstants;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.ListActivity;
@ -33,9 +32,9 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.Intent.ShortcutIconResource;
import android.content.ServiceConnection;
import android.content.SharedPreferences;
import android.content.Intent.ShortcutIconResource;
import android.content.SharedPreferences.Editor;
import android.content.res.ColorStateList;
import android.net.Uri;
@ -50,17 +49,17 @@ import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.MenuItem.OnMenuItemClickListener;
import android.view.View;
import android.view.View.OnKeyListener;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.AdapterView.OnItemClickListener;
public class HostListActivity extends ListActivity {
public final static int REQUEST_EDIT = 1;

19
src/org/connectbot/PortForwardListActivity.java → src/sk/vx/connectbot/PortForwardListActivity.java
View File

@ -15,16 +15,15 @@
* limitations under the License.
*/
package org.connectbot;
package sk.vx.connectbot;
import java.util.List;
import org.connectbot.bean.HostBean;
import org.connectbot.bean.PortForwardBean;
import org.connectbot.service.TerminalBridge;
import org.connectbot.service.TerminalManager;
import org.connectbot.util.HostDatabase;
import sk.vx.connectbot.bean.HostBean;
import sk.vx.connectbot.bean.PortForwardBean;
import sk.vx.connectbot.service.TerminalBridge;
import sk.vx.connectbot.service.TerminalManager;
import sk.vx.connectbot.util.HostDatabase;
import android.app.AlertDialog;
import android.app.ListActivity;
import android.content.ComponentName;
@ -44,18 +43,18 @@ import android.view.ContextMenu;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.MenuItem.OnMenuItemClickListener;
import android.view.View;
import android.view.ViewGroup;
import android.view.MenuItem.OnMenuItemClickListener;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.ListView;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.AdapterView.OnItemSelectedListener;
/**
* List all portForwards for a particular host and provide a way for users to add more portForwards,

10
src/org/connectbot/PubkeyListActivity.java → src/sk/vx/connectbot/PubkeyListActivity.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot;
package sk.vx.connectbot;
import java.io.ByteArrayOutputStream;
import java.io.File;
@ -31,12 +31,12 @@ import java.util.EventListener;
import java.util.LinkedList;
import java.util.List;
import org.connectbot.bean.PubkeyBean;
import org.connectbot.service.TerminalManager;
import org.connectbot.util.PubkeyDatabase;
import org.connectbot.util.PubkeyUtils;
import org.openintents.intents.FileManagerIntents;
import sk.vx.connectbot.bean.PubkeyBean;
import sk.vx.connectbot.service.TerminalManager;
import sk.vx.connectbot.util.PubkeyDatabase;
import sk.vx.connectbot.util.PubkeyUtils;
import android.app.AlertDialog;
import android.app.ListActivity;
import android.content.ActivityNotFoundException;

5
src/org/connectbot/SettingsActivity.java → src/sk/vx/connectbot/SettingsActivity.java
View File

@ -15,10 +15,9 @@
* limitations under the License.
*/
package org.connectbot;
import org.connectbot.util.PreferenceConstants;
package sk.vx.connectbot;
import sk.vx.connectbot.util.PreferenceConstants;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceActivity;

2
src/org/connectbot/StrictModeSetup.java → src/sk/vx/connectbot/StrictModeSetup.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.connectbot;
package sk.vx.connectbot;
import android.os.StrictMode;
public class StrictModeSetup {
public static void run() {

11
src/org/connectbot/TerminalView.java → src/sk/vx/connectbot/TerminalView.java
View File

@ -15,17 +15,16 @@
* limitations under the License.
*/
package org.connectbot;
package sk.vx.connectbot;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.connectbot.bean.SelectionArea;
import org.connectbot.service.FontSizeChangedListener;
import org.connectbot.service.TerminalBridge;
import org.connectbot.service.TerminalKeyListener;
import sk.vx.connectbot.bean.SelectionArea;
import sk.vx.connectbot.service.FontSizeChangedListener;
import sk.vx.connectbot.service.TerminalBridge;
import sk.vx.connectbot.service.TerminalKeyListener;
import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;

6
src/org/connectbot/WizardActivity.java → src/sk/vx/connectbot/WizardActivity.java
View File

@ -15,12 +15,10 @@
* limitations under the License.
*/
package org.connectbot;
import org.connectbot.util.HelpTopicView;
package sk.vx.connectbot;
import sk.vx.connectbot.util.HelpTopicView;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;

5
src/org/connectbot/bean/AbstractBean.java → src/sk/vx/connectbot/bean/AbstractBean.java
View File

@ -15,12 +15,11 @@
* limitations under the License.
*/
package org.connectbot.bean;
package sk.vx.connectbot.bean;
import java.util.Map.Entry;
import org.connectbot.util.XmlBuilder;
import sk.vx.connectbot.util.XmlBuilder;
import android.content.ContentValues;
/**

5
src/org/connectbot/bean/HostBean.java → src/sk/vx/connectbot/bean/HostBean.java
View File

@ -15,10 +15,9 @@
* limitations under the License.
*/
package org.connectbot.bean;
import org.connectbot.util.HostDatabase;
package sk.vx.connectbot.bean;
import sk.vx.connectbot.util.HostDatabase;
import android.content.ContentValues;
import android.net.Uri;

7
src/org/connectbot/bean/PortForwardBean.java → src/sk/vx/connectbot/bean/PortForwardBean.java
View File

@ -15,10 +15,9 @@
* limitations under the License.
*/
package org.connectbot.bean;
import org.connectbot.util.HostDatabase;
package sk.vx.connectbot.bean;
import sk.vx.connectbot.util.HostDatabase;
import android.content.ContentValues;
@ -74,6 +73,7 @@ public class PortForwardBean extends AbstractBean {
setDest(dest);
}
@Override
public String getBeanName() {
return BEAN_NAME;
}
@ -224,6 +224,7 @@ public class PortForwardBean extends AbstractBean {
/**
* @return
*/
@Override
public ContentValues getValues() {
ContentValues values = new ContentValues();

9
src/org/connectbot/bean/PubkeyBean.java → src/sk/vx/connectbot/bean/PubkeyBean.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.bean;
package sk.vx.connectbot.bean;
import java.security.KeyFactory;
import java.security.NoSuchAlgorithmException;
@ -27,9 +27,8 @@ import java.security.spec.EncodedKeySpec;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.X509EncodedKeySpec;
import org.connectbot.util.PubkeyDatabase;
import org.connectbot.util.PubkeyUtils;
import sk.vx.connectbot.util.PubkeyDatabase;
import sk.vx.connectbot.util.PubkeyUtils;
import android.content.ContentValues;
/**
@ -201,7 +200,7 @@ public class PubkeyBean extends AbstractBean {
}
/* (non-Javadoc)
* @see org.connectbot.bean.AbstractBean#getValues()
* @see sk.vx.connectbot.bean.AbstractBean#getValues()
*/
@Override
public ContentValues getValues() {

2
src/org/connectbot/bean/SelectionArea.java → src/sk/vx/connectbot/bean/SelectionArea.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.bean;
package sk.vx.connectbot.bean;
import de.mud.terminal.VDUBuffer;

9
src/org/connectbot/service/BackupAgent.java → src/sk/vx/connectbot/service/BackupAgent.java
View File

@ -15,14 +15,13 @@
* limitations under the License.
*/
package org.connectbot.service;
package sk.vx.connectbot.service;
import java.io.IOException;
import org.connectbot.util.HostDatabase;
import org.connectbot.util.PreferenceConstants;
import org.connectbot.util.PubkeyDatabase;
import sk.vx.connectbot.util.HostDatabase;
import sk.vx.connectbot.util.PreferenceConstants;
import sk.vx.connectbot.util.PubkeyDatabase;
import android.app.backup.BackupAgentHelper;
import android.app.backup.BackupDataInput;
import android.app.backup.BackupDataOutput;

5
src/org/connectbot/service/BackupWrapper.java → src/sk/vx/connectbot/service/BackupWrapper.java
View File

@ -15,10 +15,9 @@
* limitations under the License.
*/
package org.connectbot.service;
import org.connectbot.util.PreferenceConstants;
package sk.vx.connectbot.service;
import sk.vx.connectbot.util.PreferenceConstants;
import android.app.backup.BackupManager;
import android.content.Context;

2
src/org/connectbot/service/BridgeDisconnectedListener.java → src/sk/vx/connectbot/service/BridgeDisconnectedListener.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.service;
package sk.vx.connectbot.service;
public interface BridgeDisconnectedListener {
public void onDisconnected(TerminalBridge bridge);

13
src/org/connectbot/service/ConnectionNotifier.java → src/sk/vx/connectbot/service/ConnectionNotifier.java
View File

@ -15,17 +15,16 @@
* limitations under the License.
*/
package org.connectbot.service;
package sk.vx.connectbot.service;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import org.connectbot.ConsoleActivity;
import org.connectbot.R;
import org.connectbot.bean.HostBean;
import org.connectbot.util.HostDatabase;
import org.connectbot.util.PreferenceConstants;
import sk.vx.connectbot.ConsoleActivity;
import sk.vx.connectbot.R;
import sk.vx.connectbot.bean.HostBean;
import sk.vx.connectbot.util.HostDatabase;
import sk.vx.connectbot.util.PreferenceConstants;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;

2
src/org/connectbot/service/ConnectivityReceiver.java → src/sk/vx/connectbot/service/ConnectivityReceiver.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.connectbot.service;
package sk.vx.connectbot.service;
import android.content.BroadcastReceiver;
import android.content.Context;

2
src/org/connectbot/service/FontSizeChangedListener.java → src/sk/vx/connectbot/service/FontSizeChangedListener.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.service;
package sk.vx.connectbot.service;
/**
* @author Kenny Root

2
src/org/connectbot/service/PromptHelper.java → src/sk/vx/connectbot/service/PromptHelper.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.service;
package sk.vx.connectbot.service;
import java.util.concurrent.Semaphore;

6
src/org/connectbot/service/Relay.java → src/sk/vx/connectbot/service/Relay.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.service;
package sk.vx.connectbot.service;
import java.io.IOException;
import java.nio.ByteBuffer;
@ -26,9 +26,9 @@ import java.nio.charset.CoderResult;
import java.nio.charset.CodingErrorAction;
import org.apache.harmony.niochar.charset.additional.IBM437;
import org.connectbot.transport.AbsTransport;
import org.connectbot.util.EastAsianWidth;
import sk.vx.connectbot.transport.AbsTransport;
import sk.vx.connectbot.util.EastAsianWidth;
import android.util.Log;
import de.mud.terminal.vt320;

19
src/org/connectbot/service/TerminalBridge.java → src/sk/vx/connectbot/service/TerminalBridge.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.service;
package sk.vx.connectbot.service;
import java.io.IOException;
import java.nio.charset.Charset;
@ -24,15 +24,14 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.connectbot.R;
import org.connectbot.TerminalView;
import org.connectbot.bean.HostBean;
import org.connectbot.bean.PortForwardBean;
import org.connectbot.bean.SelectionArea;
import org.connectbot.transport.AbsTransport;
import org.connectbot.transport.TransportFactory;
import org.connectbot.util.HostDatabase;
import sk.vx.connectbot.R;
import sk.vx.connectbot.TerminalView;
import sk.vx.connectbot.bean.HostBean;
import sk.vx.connectbot.bean.PortForwardBean;
import sk.vx.connectbot.bean.SelectionArea;
import sk.vx.connectbot.transport.AbsTransport;
import sk.vx.connectbot.transport.TransportFactory;
import sk.vx.connectbot.util.HostDatabase;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;

57
src/org/connectbot/service/TerminalKeyListener.java → src/sk/vx/connectbot/service/TerminalKeyListener.java
View File

@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.connectbot.service;
package sk.vx.connectbot.service;
import java.io.IOException;
import org.connectbot.TerminalView;
import org.connectbot.bean.SelectionArea;
import org.connectbot.util.PreferenceConstants;
import sk.vx.connectbot.TerminalView;
import sk.vx.connectbot.bean.SelectionArea;
import sk.vx.connectbot.util.PreferenceConstants;
import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.content.res.Configuration;
@ -215,7 +214,7 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
mDeadKey = 0;
}
final boolean printing = (key != 0);
final boolean printing = (key != 0 && keyCode != KeyEvent.KEYCODE_ENTER);
//Show up the CharacterPickerDialog when the SYM key is pressed
if( (keyCode == KeyEvent.KEYCODE_SYM || keyCode == KeyEvent.KEYCODE_PICTSYMBOLS ||
@ -383,8 +382,13 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
selectionArea.decrementColumn();
bridge.redraw();
} else {
((vt320) buffer).keyPressed(vt320.KEY_LEFT, ' ',
getStateForBuffer());
if ((metaState & META_ALT_MASK) != 0) {
((vt320) buffer).keyPressed(vt320.KEY_HOME, ' ',
getStateForBuffer());
} else {
((vt320) buffer).keyPressed(vt320.KEY_LEFT, ' ',
getStateForBuffer());
}
metaState &= ~META_TRANSIENT;
bridge.tryKeyVibrate();
}
@ -395,8 +399,13 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
selectionArea.decrementRow();
bridge.redraw();
} else {
((vt320) buffer).keyPressed(vt320.KEY_UP, ' ',
getStateForBuffer());
if ((metaState & META_ALT_MASK) != 0) {
((vt320)buffer).keyPressed(vt320.KEY_PAGE_UP, ' ',
getStateForBuffer());
} else {
((vt320) buffer).keyPressed(vt320.KEY_UP, ' ',
getStateForBuffer());
}
metaState &= ~META_TRANSIENT;
bridge.tryKeyVibrate();
}
@ -407,8 +416,13 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
selectionArea.incrementRow();
bridge.redraw();
} else {
((vt320) buffer).keyPressed(vt320.KEY_DOWN, ' ',
getStateForBuffer());
if ((metaState & META_ALT_MASK) != 0) {
((vt320)buffer).keyPressed(vt320.KEY_PAGE_DOWN, ' ',
getStateForBuffer());
} else {
((vt320) buffer).keyPressed(vt320.KEY_DOWN, ' ',
getStateForBuffer());
}
metaState &= ~META_TRANSIENT;
bridge.tryKeyVibrate();
}
@ -419,8 +433,13 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
selectionArea.incrementColumn();
bridge.redraw();
} else {
((vt320) buffer).keyPressed(vt320.KEY_RIGHT, ' ',
getStateForBuffer());
if ((metaState & META_ALT_MASK) != 0) {
((vt320) buffer).keyPressed(vt320.KEY_END, ' ',
getStateForBuffer());
} else {
((vt320) buffer).keyPressed(vt320.KEY_RIGHT, ' ',
getStateForBuffer());
}
metaState &= ~META_TRANSIENT;
bridge.tryKeyVibrate();
}
@ -654,7 +673,17 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
}
dismiss(); //Closes the picker
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_SYM || keyCode == KeyEvent.KEYCODE_PICTSYMBOLS) {
dismiss();
return true;
}
return super.onKeyDown(keyCode, event);
}
};
cpd.show();
return true;
}

19
src/org/connectbot/service/TerminalManager.java → src/sk/vx/connectbot/service/TerminalManager.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.service;
package sk.vx.connectbot.service;
import java.io.IOException;
import java.lang.ref.WeakReference;
@ -30,15 +30,14 @@ import java.util.Map.Entry;
import java.util.Timer;
import java.util.TimerTask;
import org.connectbot.R;
import org.connectbot.bean.HostBean;
import org.connectbot.bean.PubkeyBean;
import org.connectbot.transport.TransportFactory;
import org.connectbot.util.HostDatabase;
import org.connectbot.util.PreferenceConstants;
import org.connectbot.util.PubkeyDatabase;
import org.connectbot.util.PubkeyUtils;
import sk.vx.connectbot.R;
import sk.vx.connectbot.bean.HostBean;
import sk.vx.connectbot.bean.PubkeyBean;
import sk.vx.connectbot.transport.TransportFactory;
import sk.vx.connectbot.util.HostDatabase;
import sk.vx.connectbot.util.PreferenceConstants;
import sk.vx.connectbot.util.PubkeyDatabase;
import sk.vx.connectbot.util.PubkeyUtils;
import android.app.Service;
import android.content.Context;
import android.content.Intent;

11
src/org/connectbot/transport/AbsTransport.java → src/sk/vx/connectbot/transport/AbsTransport.java
View File

@ -15,17 +15,16 @@
* limitations under the License.
*/
package org.connectbot.transport;
package sk.vx.connectbot.transport;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import org.connectbot.bean.HostBean;
import org.connectbot.bean.PortForwardBean;
import org.connectbot.service.TerminalBridge;
import org.connectbot.service.TerminalManager;
import sk.vx.connectbot.bean.HostBean;
import sk.vx.connectbot.bean.PortForwardBean;
import sk.vx.connectbot.service.TerminalBridge;
import sk.vx.connectbot.service.TerminalManager;
import android.content.Context;
import android.net.Uri;

15
src/org/connectbot/transport/Local.java → src/sk/vx/connectbot/transport/Local.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.transport;
package sk.vx.connectbot.transport;
import java.io.FileDescriptor;
import java.io.FileInputStream;
@ -23,12 +23,11 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Map;
import org.connectbot.R;
import org.connectbot.bean.HostBean;
import org.connectbot.service.TerminalBridge;
import org.connectbot.service.TerminalManager;
import org.connectbot.util.HostDatabase;
import sk.vx.connectbot.R;
import sk.vx.connectbot.bean.HostBean;
import sk.vx.connectbot.service.TerminalBridge;
import sk.vx.connectbot.service.TerminalManager;
import sk.vx.connectbot.util.HostDatabase;
import android.content.Context;
import android.net.Uri;
import android.util.Log;
@ -210,7 +209,7 @@ public class Local extends AbsTransport {
}
/* (non-Javadoc)
* @see org.connectbot.transport.AbsTransport#usesNetwork()
* @see sk.vx.connectbot.transport.AbsTransport#usesNetwork()
*/
@Override
public boolean usesNetwork() {

25
src/org/connectbot/transport/SSH.java → src/sk/vx/connectbot/transport/SSH.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.transport;
package sk.vx.connectbot.transport;
import java.io.IOException;
import java.io.InputStream;
@ -35,17 +35,16 @@ import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.connectbot.R;
import org.connectbot.bean.HostBean;
import org.connectbot.bean.PortForwardBean;
import org.connectbot.bean.PubkeyBean;
import org.connectbot.service.TerminalBridge;
import org.connectbot.service.TerminalManager;
import org.connectbot.service.TerminalManager.KeyHolder;
import org.connectbot.util.HostDatabase;
import org.connectbot.util.PubkeyDatabase;
import org.connectbot.util.PubkeyUtils;
import sk.vx.connectbot.R;
import sk.vx.connectbot.bean.HostBean;
import sk.vx.connectbot.bean.PortForwardBean;
import sk.vx.connectbot.bean.PubkeyBean;
import sk.vx.connectbot.service.TerminalBridge;
import sk.vx.connectbot.service.TerminalManager;
import sk.vx.connectbot.service.TerminalManager.KeyHolder;
import sk.vx.connectbot.util.HostDatabase;
import sk.vx.connectbot.util.PubkeyDatabase;
import sk.vx.connectbot.util.PubkeyUtils;
import android.content.Context;
import android.net.Uri;
import android.util.Log;
@ -943,7 +942,7 @@ public class SSH extends AbsTransport implements ConnectionMonitor, InteractiveC
}
/* (non-Javadoc)
* @see org.connectbot.transport.AbsTransport#usesNetwork()
* @see sk.vx.connectbot.transport.AbsTransport#usesNetwork()
*/
@Override
public boolean usesNetwork() {

15
src/org/connectbot/transport/Telnet.java → src/sk/vx/connectbot/transport/Telnet.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.transport;
package sk.vx.connectbot.transport;
import java.io.IOException;
import java.io.InputStream;
@ -28,12 +28,11 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.connectbot.R;
import org.connectbot.bean.HostBean;
import org.connectbot.service.TerminalBridge;
import org.connectbot.service.TerminalManager;
import org.connectbot.util.HostDatabase;
import sk.vx.connectbot.R;
import sk.vx.connectbot.bean.HostBean;
import sk.vx.connectbot.service.TerminalBridge;
import sk.vx.connectbot.service.TerminalManager;
import sk.vx.connectbot.util.HostDatabase;
import android.content.Context;
import android.net.Uri;
import android.util.Log;
@ -321,7 +320,7 @@ public class Telnet extends AbsTransport {
}
/* (non-Javadoc)
* @see org.connectbot.transport.AbsTransport#usesNetwork()
* @see sk.vx.connectbot.transport.AbsTransport#usesNetwork()
*/
@Override
public boolean usesNetwork() {

7
src/org/connectbot/transport/TransportFactory.java → src/sk/vx/connectbot/transport/TransportFactory.java
View File

@ -15,14 +15,13 @@
* limitations under the License.
*/
package org.connectbot.transport;
package sk.vx.connectbot.transport;
import java.util.HashMap;
import java.util.Map;
import org.connectbot.bean.HostBean;
import org.connectbot.util.HostDatabase;
import sk.vx.connectbot.bean.HostBean;
import sk.vx.connectbot.util.HostDatabase;
import android.content.Context;
import android.net.Uri;
import android.util.Log;

2
src/org/connectbot/util/Colors.java → src/sk/vx/connectbot/util/Colors.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.util;
package sk.vx.connectbot.util;
/**
* @author Kenny Root

2
src/org/connectbot/util/EastAsianWidth.java → src/sk/vx/connectbot/util/EastAsianWidth.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.util;
package sk.vx.connectbot.util;
import android.graphics.Paint;
import android.text.AndroidCharacter;

2
src/org/connectbot/util/Encryptor.java → src/sk/vx/connectbot/util/Encryptor.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.util;
package sk.vx.connectbot.util;
/**
* This class is from:

5
src/org/connectbot/util/EntropyDialog.java → src/sk/vx/connectbot/util/EntropyDialog.java
View File

@ -15,10 +15,9 @@
* limitations under the License.
*/
package org.connectbot.util;
import org.connectbot.R;
package sk.vx.connectbot.util;
import sk.vx.connectbot.R;
import android.app.Dialog;
import android.content.Context;
import android.view.View;

7
src/org/connectbot/util/EntropyView.java → src/sk/vx/connectbot/util/EntropyView.java
View File

@ -15,18 +15,17 @@
* limitations under the License.
*/
package org.connectbot.util;
package sk.vx.connectbot.util;
import java.util.Vector;
import org.connectbot.R;
import sk.vx.connectbot.R;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Typeface;
import android.graphics.Paint.FontMetrics;
import android.graphics.Typeface;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;

5
src/org/connectbot/util/HelpTopicView.java → src/sk/vx/connectbot/util/HelpTopicView.java
View File

@ -15,10 +15,9 @@
* limitations under the License.
*/
package org.connectbot.util;
import org.connectbot.HelpActivity;
package sk.vx.connectbot.util;
import sk.vx.connectbot.HelpActivity;
import android.content.Context;
import android.util.AttributeSet;
import android.webkit.WebSettings;

7
src/org/connectbot/util/HostDatabase.java → src/sk/vx/connectbot/util/HostDatabase.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.util;
package sk.vx.connectbot.util;
import java.nio.charset.Charset;
import java.util.Iterator;
@ -24,9 +24,8 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.connectbot.bean.HostBean;
import org.connectbot.bean.PortForwardBean;
import sk.vx.connectbot.bean.HostBean;
import sk.vx.connectbot.bean.PortForwardBean;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;

2
src/org/connectbot/util/OnDbWrittenListener.java → src/sk/vx/connectbot/util/OnDbWrittenListener.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.util;
package sk.vx.connectbot.util;
/**
* @author kroot

2
src/org/connectbot/util/OnEntropyGatheredListener.java → src/sk/vx/connectbot/util/OnEntropyGatheredListener.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.util;
package sk.vx.connectbot.util;
public interface OnEntropyGatheredListener {
void onEntropyGathered(byte[] entropy);

2
src/org/connectbot/util/PreferenceConstants.java → src/sk/vx/connectbot/util/PreferenceConstants.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.util;
package sk.vx.connectbot.util;
import android.os.Build;

5
src/org/connectbot/util/PubkeyDatabase.java → src/sk/vx/connectbot/util/PubkeyDatabase.java
View File

@ -15,13 +15,12 @@
* limitations under the License.
*/
package org.connectbot.util;
package sk.vx.connectbot.util;
import java.util.LinkedList;
import java.util.List;
import org.connectbot.bean.PubkeyBean;
import sk.vx.connectbot.bean.PubkeyBean;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;

2
src/org/connectbot/util/PubkeyUtils.java → src/sk/vx/connectbot/util/PubkeyUtils.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.util;
package sk.vx.connectbot.util;
import java.io.IOException;
import java.math.BigInteger;

4
src/org/connectbot/util/RobustSQLiteOpenHelper.java → src/sk/vx/connectbot/util/RobustSQLiteOpenHelper.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.util;
package sk.vx.connectbot.util;
import java.util.LinkedList;
import java.util.List;
@ -23,9 +23,9 @@ import java.util.List;
import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteDatabase.CursorFactory;
import android.database.sqlite.SQLiteException;
import android.database.sqlite.SQLiteOpenHelper;
import android.database.sqlite.SQLiteDatabase.CursorFactory;
/**
* @author Kenny Root

2
src/org/connectbot/util/UberColorPickerDialog.java → src/sk/vx/connectbot/util/UberColorPickerDialog.java
View File

@ -31,7 +31,7 @@
* Enjoy!
*/
package org.connectbot.util;
package sk.vx.connectbot.util;
import android.app.Dialog;
import android.content.Context;

2
src/org/connectbot/util/VolumePreference.java → src/sk/vx/connectbot/util/VolumePreference.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.util;
package sk.vx.connectbot.util;
import android.content.Context;
import android.preference.DialogPreference;

9
src/org/connectbot/util/XmlBuilder.java → src/sk/vx/connectbot/util/XmlBuilder.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.util;
package sk.vx.connectbot.util;
import com.trilead.ssh2.crypto.Base64;
@ -53,18 +53,19 @@ public class XmlBuilder {
sb.append(String.format("<%s>%s</%s>", field,
binary ? new String(Base64.encode(input.getBytes())) : input, field));
} else if (data instanceof Integer) {
sb.append(String.format("<%s>%d</%s>", field, (Integer) data, field));
sb.append(String.format("<%s>%d</%s>", field, data, field));
} else if (data instanceof Long) {
sb.append(String.format("<%s>%d</%s>", field, (Long) data, field));
sb.append(String.format("<%s>%d</%s>", field, data, field));
} else if (data instanceof byte[]) {
sb.append(String.format("<%s>%s</%s>", field, new String(Base64.encode((byte[]) data)), field));
} else if (data instanceof Boolean) {
sb.append(String.format("<%s>%s</%s>", field, (Boolean) data, field));
sb.append(String.format("<%s>%s</%s>", field, data, field));
}
return this;
}
@Override
public String toString() {
return sb.toString();
}

2
tests/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.connectbot.tests"
package="sk.vx.connectbot.tests"
android:versionCode="1"
android:versionName="1.0">
<!-- We add an application tag here just so that we can indicate that

6
tests/src/org/connectbot/HostBeanTest.java → tests/src/sk/vx/connectbot/HostBeanTest.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package org.connectbot;
package sk.vx.connectbot;
import org.connectbot.bean.HostBean;
import org.connectbot.mock.BeanTestCase;
import sk.vx.connectbot.bean.HostBean;
import sk.vx.connectbot.mock.BeanTestCase;
import android.test.AndroidTestCase;

8
tests/src/org/connectbot/HostListActivityTest.java → tests/src/sk/vx/connectbot/HostListActivityTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot;
package sk.vx.connectbot;
import android.app.Activity;
import android.test.ActivityInstrumentationTestCase2;
@ -26,14 +26,14 @@ import android.test.ActivityInstrumentationTestCase2;
* information on how to write and extend Application tests.
* <p/>
* To run this test, you can type: adb shell am instrument -w \ -e class
* org.connectbot.HostListActivityTest \
* org.connectbot.tests/android.test.InstrumentationTestRunner
* sk.vx.connectbot.HostListActivityTest \
* sk.vx.connectbot.tests/android.test.InstrumentationTestRunner
*/
public class HostListActivityTest extends ActivityInstrumentationTestCase2<HostListActivity> {
private Activity mActivity;
public HostListActivityTest() {
super("org.connectbot", HostListActivity.class);
super("sk.vx.connectbot", HostListActivity.class);
}
@Override

4
tests/src/org/connectbot/SelectionAreaTest.java → tests/src/sk/vx/connectbot/SelectionAreaTest.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package org.connectbot;
package sk.vx.connectbot;
import org.connectbot.bean.SelectionArea;
import sk.vx.connectbot.bean.SelectionArea;
import android.test.AndroidTestCase;

8
tests/src/org/connectbot/SettingsActivityTest.java → tests/src/sk/vx/connectbot/SettingsActivityTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot;
package sk.vx.connectbot;
import android.test.ActivityInstrumentationTestCase2;
@ -26,14 +26,14 @@ import android.test.ActivityInstrumentationTestCase2;
* <p/>
* To run this test, you can type:
* adb shell am instrument -w \
* -e class org.connectbot.HostListActivityTest \
* org.connectbot.tests/android.test.InstrumentationTestRunner
* -e class sk.vx.connectbot.HostListActivityTest \
* sk.vx.connectbot.tests/android.test.InstrumentationTestRunner
*/
public class SettingsActivityTest extends
ActivityInstrumentationTestCase2<SettingsActivity> {
public SettingsActivityTest() {
super("org.connectbot", SettingsActivity.class);
super("sk.vx.connectbot", SettingsActivity.class);
}
public void testOpenMenu() {

2
tests/src/org/connectbot/TerminalBridgeTest.java → tests/src/sk/vx/connectbot/TerminalBridgeTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot;
package sk.vx.connectbot;
import android.test.AndroidTestCase;

2
tests/src/org/connectbot/mock/BeanTestCase.java → tests/src/sk/vx/connectbot/mock/BeanTestCase.java
View File

@ -1,7 +1,7 @@
/**
* Originally from http://www.cornetdesign.com/files/BeanTestCase.java.txt
*/
package org.connectbot.mock;
package sk.vx.connectbot.mock;
import junit.framework.TestCase;

2
tests/src/org/connectbot/mock/NullOutputStream.java → tests/src/sk/vx/connectbot/mock/NullOutputStream.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.mock;
package sk.vx.connectbot.mock;
import java.io.IOException;
import java.io.OutputStream;

10
tests/src/org/connectbot/mock/NullTransport.java → tests/src/sk/vx/connectbot/mock/NullTransport.java
View File

@ -15,15 +15,15 @@
* limitations under the License.
*/
package org.connectbot.mock;
package sk.vx.connectbot.mock;
import java.io.IOException;
import java.util.Map;
import org.connectbot.bean.HostBean;
import org.connectbot.service.TerminalBridge;
import org.connectbot.service.TerminalManager;
import org.connectbot.transport.AbsTransport;
import sk.vx.connectbot.bean.HostBean;
import sk.vx.connectbot.service.TerminalBridge;
import sk.vx.connectbot.service.TerminalManager;
import sk.vx.connectbot.transport.AbsTransport;
import android.net.Uri;

2
tests/src/org/connectbot/util/PubkeyUtilsTest.java → tests/src/sk/vx/connectbot/util/PubkeyUtilsTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.connectbot.util;
package sk.vx.connectbot.util;
import java.util.Arrays;