Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Morlunk/Jumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Comminos <andrew@morlunk.com>2015-04-29 01:47:50 +0300
committerAndrew Comminos <andrew@morlunk.com>2015-04-29 01:47:50 +0300
commit02490cf4ab3a272f5d2c3af36348d58470ad4acf (patch)
treebc22c5f1dfd9ecefa156fc7ca109087846129c6f /src
parent5ac1f42b888d3683969ba940b943bda6c38b0844 (diff)
Removed text message storing. Now expected to be done in client.
Diffstat (limited to 'src')
-rw-r--r--src/main/aidl/com/morlunk/jumble/IJumbleService.aidl2
-rw-r--r--src/main/java/com/morlunk/jumble/JumbleService.java22
2 files changed, 2 insertions, 22 deletions
diff --git a/src/main/aidl/com/morlunk/jumble/IJumbleService.aidl b/src/main/aidl/com/morlunk/jumble/IJumbleService.aidl
index 7b7e1db..4ee186c 100644
--- a/src/main/aidl/com/morlunk/jumble/IJumbleService.aidl
+++ b/src/main/aidl/com/morlunk/jumble/IJumbleService.aidl
@@ -56,8 +56,6 @@ interface IJumbleService {
IChannel getChannel(int id);
IChannel getRootChannel();
int getPermissions();
- List getMessageLog();
- void clearMessageLog();
// Audio actions and settings
boolean isTalking();
diff --git a/src/main/java/com/morlunk/jumble/JumbleService.java b/src/main/java/com/morlunk/jumble/JumbleService.java
index 7ebcdb2..13072f9 100644
--- a/src/main/java/com/morlunk/jumble/JumbleService.java
+++ b/src/main/java/com/morlunk/jumble/JumbleService.java
@@ -152,7 +152,6 @@ public class JumbleService extends Service implements JumbleConnection.JumbleCon
private ModelHandler mModelHandler;
private AudioHandler mAudioHandler;
- private List<Message> mMessageLog;
private boolean mReconnecting;
/**
@@ -250,7 +249,6 @@ public class JumbleService extends Service implements JumbleConnection.JumbleCon
mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Jumble");
mHandler = new Handler(getMainLooper());
mCallbacks = new JumbleCallbacks();
- mMessageLog = new ArrayList<Message>();
mAudioBuilder = new AudioHandler.Builder()
.setContext(this)
.setLogger(this)
@@ -396,8 +394,6 @@ public class JumbleService extends Service implements JumbleConnection.JumbleCon
mAudioHandler.shutdown();
}
- mMessageLog.clear();
-
mModelHandler = null;
mAudioHandler = null;
@@ -709,16 +705,6 @@ public class JumbleService extends Service implements JumbleConnection.JumbleCon
}
@Override
- public List getMessageLog() throws RemoteException {
- return mMessageLog;
- }
-
- @Override
- public void clearMessageLog() throws RemoteException {
- mMessageLog.clear();
- }
-
- @Override
public int getTransmitMode() throws RemoteException {
return mAudioHandler.getTransmitMode();
}
@@ -853,9 +839,7 @@ public class JumbleService extends Service implements JumbleConnection.JumbleCon
User user = mModelHandler.getUser(session);
List<User> users = new ArrayList<User>(1);
users.add(user);
- Message logMessage = new Message(getSession(), self.getName(), new ArrayList<Channel>(0), new ArrayList<Channel>(0), users, message);
- mMessageLog.add(logMessage);
- return logMessage;
+ return new Message(getSession(), self.getName(), new ArrayList<Channel>(0), new ArrayList<Channel>(0), users, message);
}
@Override
@@ -870,9 +854,7 @@ public class JumbleService extends Service implements JumbleConnection.JumbleCon
Channel targetChannel = mModelHandler.getChannel(channel);
List<Channel> targetChannels = new ArrayList<Channel>();
targetChannels.add(targetChannel);
- Message logMessage = new Message(getSession(), self.getName(), targetChannels, tree ? targetChannels : new ArrayList<Channel>(0), new ArrayList<User>(0), message);
- mMessageLog.add(logMessage);
- return logMessage;
+ return new Message(getSession(), self.getName(), targetChannels, tree ? targetChannels : new ArrayList<Channel>(0), new ArrayList<User>(0), message);
}
@Override