Implemented new message framework for more client customizability.

3 files changed, 21 insertions, 4 deletions

diff --git a/src/main/aidl/com/morlunk/jumble/IJumbleObserver.aidl b/src/main/aidl/com/morlunk/jumble/IJumbleObserver.aidl
index 49a9ccc..c90a098 100644
--- a/src/main/aidl/com/morlunk/jumble/IJumbleObserver.aidl
+++ b/src/main/aidl/com/morlunk/jumble/IJumbleObserver.aidl
@@ -18,6 +18,7 @@ package com.morlunk.jumble;
 
 import com.morlunk.jumble.model.Channel;
 import com.morlunk.jumble.model.User;
+import com.morlunk.jumble.model.Message;
 
 interface IJumbleObserver {
     // Connection
@@ -40,7 +41,5 @@ interface IJumbleObserver {
     void onPermissionDenied(String reason);
 
     // Logging & Messaging
-    void onLogInfo(String message);
-    void onLogWarning(String message);
-    void onMessageReceived(in User user, String message);
+    void onMessageLogged(in Message message);
 }
diff --git a/src/main/aidl/com/morlunk/jumble/IJumbleService.aidl b/src/main/aidl/com/morlunk/jumble/IJumbleService.aidl
index 5a005f6..04ab76e 100644
--- a/src/main/aidl/com/morlunk/jumble/IJumbleService.aidl
+++ b/src/main/aidl/com/morlunk/jumble/IJumbleService.aidl
@@ -50,7 +50,6 @@ interface IJumbleService {
     Channel getChannel(int id);
     List getUserList();
     List getChannelList();
-    List getLogHistory();
     int getPermissions();
 
     // Audio actions and settings
diff --git a/src/main/aidl/com/morlunk/jumble/model/Message.aidl b/src/main/aidl/com/morlunk/jumble/model/Message.aidl
new file mode 100644
index 0000000..61af67c
--- /dev/null
+++ b/src/main/aidl/com/morlunk/jumble/model/Message.aidl
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2013 Andrew Comminos
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.morlunk.jumble.model;
+
+parcelable Message;
\ No newline at end of file