nutomic/ensichat
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Split package messages into header and body, move BufferUtils to util.

Browse source
This commit is contained in:
Felix Ableitner 2015-04-16 09:25:39 +02:00
parent 5c102581ce
commit 85a8b71fe9
37 changed files with 80 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/androidTest/scala/com/nutomic/ensichat/protocol/CryptoTest.scala
View file

@ -1,7 +1,6 @@
package com.nutomic.ensichat.protocol
import android.test.AndroidTestCase
import com.nutomic.ensichat.protocol.messages.MessageTest
import junit.framework.Assert._
class CryptoTest extends AndroidTestCase {

9
app/src/androidTest/scala/com/nutomic/ensichat/protocol/messages/MessageTest.scala → app/src/androidTest/scala/com/nutomic/ensichat/protocol/MessageTest.scala
View file

@ -1,12 +1,13 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol
import java.io.ByteArrayInputStream
import java.util.GregorianCalendar
import android.test.AndroidTestCase
import com.nutomic.ensichat.protocol.messages.ContentHeaderTest._
import com.nutomic.ensichat.protocol.messages.MessageTest._
import com.nutomic.ensichat.protocol.{AddressTest, Crypto}
import com.nutomic.ensichat.protocol.body.{ConnectionInfo, ConnectionInfoTest, Text}
import com.nutomic.ensichat.protocol.header.ContentHeaderTest._
import com.nutomic.ensichat.protocol.MessageTest._
import com.nutomic.ensichat.protocol.header.MessageHeader
import junit.framework.Assert._
import scala.collection.immutable.TreeSet

3
app/src/androidTest/scala/com/nutomic/ensichat/protocol/RouterTest.scala
View file

@ -1,7 +1,8 @@
package com.nutomic.ensichat.protocol
import android.test.AndroidTestCase
import com.nutomic.ensichat.protocol.messages._
import com.nutomic.ensichat.protocol.body.UserName
import com.nutomic.ensichat.protocol.header.ContentHeader
import junit.framework.Assert._
class RouterTest extends AndroidTestCase {

2
app/src/androidTest/scala/com/nutomic/ensichat/protocol/messages/ConnectionInfoTest.scala → app/src/androidTest/scala/com/nutomic/ensichat/protocol/body/ConnectionInfoTest.scala
View file

@ -1,4 +1,4 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.body
import android.content.Context
import android.test.AndroidTestCase

2
app/src/androidTest/scala/com/nutomic/ensichat/protocol/messages/ResultAddContactTest.scala → app/src/androidTest/scala/com/nutomic/ensichat/protocol/body/ResultAddContactTest.scala
View file

@ -1,4 +1,4 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.body
import android.test.AndroidTestCase
import junit.framework.Assert._

2
app/src/androidTest/scala/com/nutomic/ensichat/protocol/messages/UserNameTest.scala → app/src/androidTest/scala/com/nutomic/ensichat/protocol/body/UserNameTest.scala
View file

@ -1,4 +1,4 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.body
import android.test.AndroidTestCase
import junit.framework.Assert

3
app/src/androidTest/scala/com/nutomic/ensichat/protocol/messages/ContentHeaderTest.scala → app/src/androidTest/scala/com/nutomic/ensichat/protocol/header/ContentHeaderTest.scala
View file

@ -1,6 +1,7 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.header
import android.test.AndroidTestCase
import com.nutomic.ensichat.protocol.body.Text
import com.nutomic.ensichat.protocol.{Address, AddressTest}
import junit.framework.Assert._

4
app/src/androidTest/scala/com/nutomic/ensichat/protocol/messages/MessageHeaderTest.scala → app/src/androidTest/scala/com/nutomic/ensichat/protocol/header/MessageHeaderTest.scala
View file

@ -1,7 +1,7 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.header
import android.test.AndroidTestCase
import com.nutomic.ensichat.protocol.messages.MessageHeaderTest._
import com.nutomic.ensichat.protocol.header.MessageHeaderTest._
import com.nutomic.ensichat.protocol.{Address, AddressTest}
import junit.framework.Assert._

5
app/src/androidTest/scala/com/nutomic/ensichat/util/AddContactsHandlerTest.scala
View file

@ -2,8 +2,9 @@ package com.nutomic.ensichat.util
import android.content.Context
import android.test.AndroidTestCase
import com.nutomic.ensichat.protocol.messages._
import com.nutomic.ensichat.protocol.{Address, Crypto, UserTest}
import com.nutomic.ensichat.protocol.body.{RequestAddContact, ResultAddContact}
import com.nutomic.ensichat.protocol.header.ContentHeader
import com.nutomic.ensichat.protocol.{Address, Crypto, Message, UserTest}
import junit.framework.Assert._
class AddContactsHandlerTest extends AndroidTestCase {

10
app/src/androidTest/scala/com/nutomic/ensichat/util/DatabaseTest.scala
View file

@ -6,10 +6,12 @@ import android.content.Context
import android.database.DatabaseErrorHandler
import android.database.sqlite.SQLiteDatabase
import android.test.{AndroidTestCase, mock}
import com.nutomic.ensichat.protocol.UserTest
import com.nutomic.ensichat.protocol.messages.ContentHeaderTest._
import com.nutomic.ensichat.protocol.messages.MessageTest._
import com.nutomic.ensichat.protocol.messages.{ContentHeader, CryptoData}
import com.nutomic.ensichat.protocol.{MessageTest, UserTest}
import com.nutomic.ensichat.protocol.body.CryptoData
import com.nutomic.ensichat.protocol.header.ContentHeaderTest
import com.nutomic.ensichat.protocol.header.ContentHeader
import ContentHeaderTest._
import MessageTest._
import com.nutomic.ensichat.util.Database.OnContactsUpdatedListener
import junit.framework.Assert._

2
app/src/main/scala/com/nutomic/ensichat/activities/AddContactsActivity.scala
View file

@ -8,7 +8,7 @@ import android.widget.AdapterView.OnItemClickListener
import android.widget._
import com.nutomic.ensichat.R
import com.nutomic.ensichat.protocol.ChatService
import com.nutomic.ensichat.protocol.messages.RequestAddContact
import com.nutomic.ensichat.protocol.body.RequestAddContact
import com.nutomic.ensichat.util.Database.OnContactsUpdatedListener
import com.nutomic.ensichat.util.{Database, UsersAdapter}

2
app/src/main/scala/com/nutomic/ensichat/activities/ConfirmAddContactActivity.scala
View file

@ -7,7 +7,7 @@ import android.os.Bundle
import android.view.{ContextThemeWrapper, LayoutInflater}
import android.widget.{ImageView, TextView}
import com.nutomic.ensichat.R
import com.nutomic.ensichat.protocol.messages.ResultAddContact
import com.nutomic.ensichat.protocol.body.ResultAddContact
import com.nutomic.ensichat.protocol.{Address, Crypto}
import com.nutomic.ensichat.util.IdenticonGenerator

2
app/src/main/scala/com/nutomic/ensichat/bluetooth/BluetoothInterface.scala
View file

@ -12,7 +12,7 @@ import com.nutomic.ensichat.R
import com.nutomic.ensichat.fragments.SettingsFragment
import com.nutomic.ensichat.protocol.ChatService.InterfaceHandler
import com.nutomic.ensichat.protocol._
import com.nutomic.ensichat.protocol.messages.{ConnectionInfo, Message}
import com.nutomic.ensichat.protocol.body.ConnectionInfo
import scala.collection.immutable.HashMap

5
app/src/main/scala/com/nutomic/ensichat/bluetooth/TransferThread.scala
View file

@ -5,8 +5,9 @@ import java.io._
import android.bluetooth.BluetoothSocket
import android.util.Log
import com.nutomic.ensichat.protocol._
import com.nutomic.ensichat.protocol.messages.Message.ReadMessageException
import com.nutomic.ensichat.protocol.messages.{ConnectionInfo, Message, MessageHeader}
import com.nutomic.ensichat.protocol.body.ConnectionInfo
import com.nutomic.ensichat.protocol.header.MessageHeader
import Message.ReadMessageException
/**
* Transfers data between connnected devices.

4
app/src/main/scala/com/nutomic/ensichat/fragments/ChatFragment.scala
View file

@ -10,8 +10,8 @@ import android.widget._
import com.nutomic.ensichat.R
import com.nutomic.ensichat.activities.EnsiChatActivity
import com.nutomic.ensichat.protocol.ChatService.OnMessageReceivedListener
import com.nutomic.ensichat.protocol.messages.{Message, Text}
import com.nutomic.ensichat.protocol.{Address, ChatService}
import com.nutomic.ensichat.protocol.body.Text
import com.nutomic.ensichat.protocol.{Message, Address, ChatService}
import com.nutomic.ensichat.util.{Database, MessagesAdapter}
/**

2
app/src/main/scala/com/nutomic/ensichat/fragments/SettingsFragment.scala
View file

@ -6,7 +6,7 @@ import android.preference.{Preference, PreferenceFragment, PreferenceManager}
import com.nutomic.ensichat.R
import com.nutomic.ensichat.activities.EnsiChatActivity
import com.nutomic.ensichat.fragments.SettingsFragment._
import com.nutomic.ensichat.protocol.messages.UserName
import com.nutomic.ensichat.protocol.body.UserName
import com.nutomic.ensichat.util.Database
object SettingsFragment {

3
app/src/main/scala/com/nutomic/ensichat/protocol/ChatService.scala
View file

@ -10,7 +10,8 @@ import com.nutomic.ensichat.R
import com.nutomic.ensichat.bluetooth.BluetoothInterface
import com.nutomic.ensichat.fragments.SettingsFragment
import com.nutomic.ensichat.protocol.ChatService.{OnConnectionsChangedListener, OnMessageReceivedListener}
import com.nutomic.ensichat.protocol.messages._
import com.nutomic.ensichat.protocol.body.{UserName, MessageBody, ConnectionInfo}
import com.nutomic.ensichat.protocol.header.ContentHeader
import com.nutomic.ensichat.util.{AddContactsHandler, Database, NotificationHandler}
import scala.collection.mutable

3
app/src/main/scala/com/nutomic/ensichat/protocol/Crypto.scala
View file

@ -10,7 +10,8 @@ import android.content.Context
import android.preference.PreferenceManager
import android.util.Log
import com.nutomic.ensichat.protocol.Crypto._
import com.nutomic.ensichat.protocol.messages._
import com.nutomic.ensichat.protocol.body._
import com.nutomic.ensichat.protocol.header.ContentHeader
import com.nutomic.ensichat.util.PRNGFixes
object Crypto {

5
app/src/main/scala/com/nutomic/ensichat/protocol/messages/Message.scala → app/src/main/scala/com/nutomic/ensichat/protocol/Message.scala
View file

@ -1,8 +1,11 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol
import java.io.InputStream
import java.security.spec.InvalidKeySpecException
import com.nutomic.ensichat.protocol.body._
import com.nutomic.ensichat.protocol.header.{AbstractHeader, ContentHeader, MessageHeader}
object Message {
/**

2
app/src/main/scala/com/nutomic/ensichat/protocol/Router.scala
View file

@ -1,6 +1,6 @@
package com.nutomic.ensichat.protocol
import com.nutomic.ensichat.protocol.messages.{ContentHeader, Message}
import com.nutomic.ensichat.protocol.header.ContentHeader
/**
* Forwards messages to all connected devices.

2
app/src/main/scala/com/nutomic/ensichat/protocol/SeqNumGenerator.scala
View file

@ -2,7 +2,7 @@ package com.nutomic.ensichat.protocol
import android.content.Context
import android.preference.PreferenceManager
import com.nutomic.ensichat.protocol.messages.ContentHeader
import com.nutomic.ensichat.protocol.header.ContentHeader
/**
* Generates sequence numbers acorrding to protocol, which are stored persistently.

5
app/src/main/scala/com/nutomic/ensichat/protocol/messages/ConnectionInfo.scala → app/src/main/scala/com/nutomic/ensichat/protocol/body/ConnectionInfo.scala
View file

@ -1,10 +1,11 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.body
import java.nio.ByteBuffer
import java.security.spec.X509EncodedKeySpec
import java.security.{KeyFactory, PublicKey}
import com.nutomic.ensichat.protocol.{BufferUtils, Crypto}
import com.nutomic.ensichat.protocol.Crypto
import com.nutomic.ensichat.util.BufferUtils
object ConnectionInfo {

4
app/src/main/scala/com/nutomic/ensichat/protocol/messages/CryptoData.scala → app/src/main/scala/com/nutomic/ensichat/protocol/body/CryptoData.scala
View file

@ -1,9 +1,9 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.body
import java.nio.ByteBuffer
import java.util
import com.nutomic.ensichat.protocol.BufferUtils
import com.nutomic.ensichat.util.BufferUtils
object CryptoData {

2
app/src/main/scala/com/nutomic/ensichat/protocol/messages/EncryptedBody.scala → app/src/main/scala/com/nutomic/ensichat/protocol/body/EncryptedBody.scala
View file

@ -1,4 +1,4 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.body
/**
* Represents the data in an encrypted message body.

2
app/src/main/scala/com/nutomic/ensichat/protocol/messages/MessageBody.scala → app/src/main/scala/com/nutomic/ensichat/protocol/body/MessageBody.scala
View file

@ -1,4 +1,4 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.body
/**
* Holds the actual message content.

2
app/src/main/scala/com/nutomic/ensichat/protocol/messages/RequestAddContact.scala → app/src/main/scala/com/nutomic/ensichat/protocol/body/RequestAddContact.scala
View file

@ -1,4 +1,4 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.body
import java.nio.ByteBuffer

4
app/src/main/scala/com/nutomic/ensichat/protocol/messages/ResultAddContact.scala → app/src/main/scala/com/nutomic/ensichat/protocol/body/ResultAddContact.scala
View file

@ -1,8 +1,8 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.body
import java.nio.ByteBuffer
import com.nutomic.ensichat.protocol.BufferUtils
import com.nutomic.ensichat.util.BufferUtils
object ResultAddContact {

6
app/src/main/scala/com/nutomic/ensichat/protocol/messages/Text.scala → app/src/main/scala/com/nutomic/ensichat/protocol/body/Text.scala
View file

@ -1,9 +1,9 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.body
import java.nio.ByteBuffer
import java.util.Date
import com.nutomic.ensichat.protocol.BufferUtils
import com.nutomic.ensichat.protocol.Message
import com.nutomic.ensichat.util.BufferUtils
object Text {

6
app/src/main/scala/com/nutomic/ensichat/protocol/messages/UserName.scala → app/src/main/scala/com/nutomic/ensichat/protocol/body/UserName.scala
View file

@ -1,8 +1,8 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.body
import java.nio.ByteBuffer
import com.nutomic.ensichat.protocol.BufferUtils
import com.nutomic.ensichat.protocol.Message
import com.nutomic.ensichat.util.BufferUtils
object UserName {

7
app/src/main/scala/com/nutomic/ensichat/protocol/messages/AbstractHeader.scala → app/src/main/scala/com/nutomic/ensichat/protocol/header/AbstractHeader.scala
View file

@ -1,8 +1,9 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.header
import java.nio.ByteBuffer
import com.nutomic.ensichat.protocol.{Address, BufferUtils}
import com.nutomic.ensichat.protocol.Address
import com.nutomic.ensichat.util.BufferUtils
object AbstractHeader {
@ -10,7 +11,7 @@ object AbstractHeader {
val Version = 0
private[messages] val Length = 10 + 2 * Address.Length
private[header] val Length = 10 + 2 * Address.Length
}

5
app/src/main/scala/com/nutomic/ensichat/protocol/messages/ContentHeader.scala → app/src/main/scala/com/nutomic/ensichat/protocol/header/ContentHeader.scala
View file

@ -1,8 +1,9 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.header
import java.nio.ByteBuffer
import com.nutomic.ensichat.protocol.{Address, BufferUtils}
import com.nutomic.ensichat.protocol.Address
import com.nutomic.ensichat.util.BufferUtils
object ContentHeader {

7
app/src/main/scala/com/nutomic/ensichat/protocol/messages/MessageHeader.scala → app/src/main/scala/com/nutomic/ensichat/protocol/header/MessageHeader.scala
View file

@ -1,9 +1,10 @@
package com.nutomic.ensichat.protocol.messages
package com.nutomic.ensichat.protocol.header
import java.nio.ByteBuffer
import com.nutomic.ensichat.protocol.messages.Message.ParseMessageException
import com.nutomic.ensichat.protocol.{Address, BufferUtils}
import com.nutomic.ensichat.protocol.{Message, Address}
import Message.ParseMessageException
import com.nutomic.ensichat.util.BufferUtils
object MessageHeader {

4
app/src/main/scala/com/nutomic/ensichat/util/AddContactsHandler.scala
View file

@ -7,8 +7,8 @@ import android.widget.Toast
import com.nutomic.ensichat.R
import com.nutomic.ensichat.activities.ConfirmAddContactActivity
import com.nutomic.ensichat.protocol.ChatService.OnMessageReceivedListener
import com.nutomic.ensichat.protocol.messages.{Message, RequestAddContact, ResultAddContact}
import com.nutomic.ensichat.protocol.{Address, User}
import com.nutomic.ensichat.protocol.body.{ResultAddContact, RequestAddContact}
import com.nutomic.ensichat.protocol.{Message, Address, User}
/**
* Handles [[RequestAddContact]] and [[ResultAddContact]] messages, adds new contacts.

2
app/src/main/scala/com/nutomic/ensichat/protocol/BufferUtils.scala → app/src/main/scala/com/nutomic/ensichat/util/BufferUtils.scala
View file

@ -1,4 +1,4 @@
package com.nutomic.ensichat.protocol
package com.nutomic.ensichat.util
import java.nio.ByteBuffer

3
app/src/main/scala/com/nutomic/ensichat/util/Database.scala
View file

@ -6,7 +6,8 @@ import android.content.{ContentValues, Context}
import android.database.sqlite.{SQLiteDatabase, SQLiteOpenHelper}
import com.nutomic.ensichat.protocol.ChatService.OnMessageReceivedListener
import com.nutomic.ensichat.protocol._
import com.nutomic.ensichat.protocol.messages._
import com.nutomic.ensichat.protocol.body.{Text, ResultAddContact, RequestAddContact}
import com.nutomic.ensichat.protocol.header.ContentHeader
import com.nutomic.ensichat.util.Database.OnContactsUpdatedListener
import scala.collection.immutable.TreeSet

4
app/src/main/scala/com/nutomic/ensichat/util/MessagesAdapter.scala
View file

@ -4,8 +4,8 @@ import android.content.Context
import android.view.{Gravity, View, ViewGroup}
import android.widget.{ArrayAdapter, RelativeLayout, TextView}
import com.nutomic.ensichat.R
import com.nutomic.ensichat.protocol.Address
import com.nutomic.ensichat.protocol.messages.{Message, Text}
import com.nutomic.ensichat.protocol.{Message, Address}
import com.nutomic.ensichat.protocol.body.Text
/**
* Displays [[Message]]s in ListView.

4
app/src/main/scala/com/nutomic/ensichat/util/NotificationHandler.scala
View file

@ -5,8 +5,8 @@ import android.content.{Context, Intent}
import com.nutomic.ensichat.R
import com.nutomic.ensichat.activities.MainActivity
import com.nutomic.ensichat.protocol.ChatService.OnMessageReceivedListener
import com.nutomic.ensichat.protocol.Crypto
import com.nutomic.ensichat.protocol.messages.{Message, Text}
import com.nutomic.ensichat.protocol.{Message, Crypto}
import com.nutomic.ensichat.protocol.body.Text
/**
* Displays notifications for new messages.