diff options
| author | Kenny Root <kenny@the-b.org> | 2015-08-07 23:29:07 -0600 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-08-07 23:29:07 -0600 |
| commit | 9cd914c3563fbb8ed194c3d5b988e1e3930e30fc (patch) | |
| tree | 6783a5e43b3f05b386fab77c7466d13ec5477a5f /app/src/main/java/org/connectbot/service | |
| parent | 25315e3b4c26aa126f43cbc58fc7621926a4f6ac (diff) | |
| parent | 374952ea62dd5199b38da51cc7efe075d999120a (diff) | |
| download | connectbot-9cd914c3563fbb8ed194c3d5b988e1e3930e30fc.tar.gz connectbot-9cd914c3563fbb8ed194c3d5b988e1e3930e30fc.tar.bz2 connectbot-9cd914c3563fbb8ed194c3d5b988e1e3930e30fc.zip | |
Merge pull request #119 from jklein24/viewpager
Diffstat (limited to 'app/src/main/java/org/connectbot/service')
| -rw-r--r-- | app/src/main/java/org/connectbot/service/TerminalManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/src/main/java/org/connectbot/service/TerminalManager.java b/app/src/main/java/org/connectbot/service/TerminalManager.java index b5d891d..8001561 100644 --- a/app/src/main/java/org/connectbot/service/TerminalManager.java +++ b/app/src/main/java/org/connectbot/service/TerminalManager.java @@ -22,6 +22,7 @@ import java.lang.ref.WeakReference; import java.security.KeyPair; import java.security.PrivateKey; import java.security.PublicKey; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.LinkedList; @@ -70,7 +71,7 @@ import android.util.Log; public class TerminalManager extends Service implements BridgeDisconnectedListener, OnSharedPreferenceChangeListener { public final static String TAG = "CB.TerminalManager"; - private List<TerminalBridge> bridges = new LinkedList<TerminalBridge>(); + private ArrayList<TerminalBridge> bridges = new ArrayList<TerminalBridge>(); public Map<HostBean, WeakReference<TerminalBridge>> mHostBridgeMap = new HashMap<HostBean, WeakReference<TerminalBridge>>(); public Map<String, WeakReference<TerminalBridge>> mNicknameBridgeMap = @@ -471,7 +472,7 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen } } - public List<TerminalBridge> getBridges() { + public ArrayList<TerminalBridge> getBridges() { return bridges; } |