diff options
| author | Kenny Root <kenny@the-b.org> | 2015-09-07 21:06:11 -0700 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-09-07 21:06:11 -0700 |
| commit | 9c32266fe8a898c39561e72f1aefb4b21c264c94 (patch) | |
| tree | 85c0df6e4e1956926d3782e1f6e48ce5c5926cb7 /app/src/main/java/org/connectbot/service | |
| parent | 3261fee2eae9b4e0f5b6a39b4422f7419e79812d (diff) | |
| download | connectbot-9c32266fe8a898c39561e72f1aefb4b21c264c94.tar.gz connectbot-9c32266fe8a898c39561e72f1aefb4b21c264c94.tar.bz2 connectbot-9c32266fe8a898c39561e72f1aefb4b21c264c94.zip | |
Get rid of useless backup dbLock usage
Diffstat (limited to 'app/src/main/java/org/connectbot/service')
| -rw-r--r-- | app/src/main/java/org/connectbot/service/BackupAgent.java | 20 | ||||
| -rw-r--r-- | app/src/main/java/org/connectbot/service/TerminalManager.java | 11 |
2 files changed, 2 insertions, 29 deletions
diff --git a/app/src/main/java/org/connectbot/service/BackupAgent.java b/app/src/main/java/org/connectbot/service/BackupAgent.java index 312ae3b..f1a69a3 100644 --- a/app/src/main/java/org/connectbot/service/BackupAgent.java +++ b/app/src/main/java/org/connectbot/service/BackupAgent.java @@ -53,24 +53,4 @@ public class BackupAgent extends BackupAgentHelper { addHelper(PubkeyDatabase.DB_NAME, pubkeys); } - - @Override - public void onBackup(ParcelFileDescriptor oldState, BackupDataOutput data, - ParcelFileDescriptor newState) throws IOException { - synchronized (HostDatabase.dbLock) { - super.onBackup(oldState, data, newState); - } - } - - @Override - public void onRestore(BackupDataInput data, int appVersionCode, - ParcelFileDescriptor newState) throws IOException { - Log.d("ConnectBot.BackupAgent", "onRestore called"); - - synchronized (HostDatabase.dbLock) { - Log.d("ConnectBot.BackupAgent", "onRestore in-lock"); - - super.onRestore(data, appVersionCode, newState); - } - } } diff --git a/app/src/main/java/org/connectbot/service/TerminalManager.java b/app/src/main/java/org/connectbot/service/TerminalManager.java index 7e0f4c7..1f0ee29 100644 --- a/app/src/main/java/org/connectbot/service/TerminalManager.java +++ b/app/src/main/java/org/connectbot/service/TerminalManager.java @@ -173,15 +173,8 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen disconnectAll(true, false); - if (hostdb != null) { - hostdb.close(); - hostdb = null; - } - - if (pubkeydb != null) { - pubkeydb.close(); - pubkeydb = null; - } + hostdb = null; + pubkeydb = null; synchronized (this) { if (idleTimer != null) |