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

Refactored packages.

This commit is contained in:
Felix Ableitner 2014-12-12 00:49:12 +02:00
parent 834f3ca724
commit 539d955737
28 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/androidTest/scala/com/nutomic/ensichat/aodvv2/AddressTest.scala → app/src/androidTest/scala/com/nutomic/ensichat/protocol/AddressTest.scala
View File

@ -1,7 +1,7 @@
package com.nutomic.ensichat.aodvv2
package com.nutomic.ensichat.protocol
import android.test.AndroidTestCase
import com.nutomic.ensichat.aodvv2.AddressTest._
import com.nutomic.ensichat.protocol.AddressTest._
import junit.framework.Assert._
object AddressTest {

8
app/src/androidTest/scala/com/nutomic/ensichat/messages/CryptoTest.scala → app/src/androidTest/scala/com/nutomic/ensichat/protocol/CryptoTest.scala
View File

@ -1,7 +1,7 @@
package com.nutomic.ensichat.messages
package com.nutomic.ensichat.protocol
import android.test.AndroidTestCase
import com.nutomic.ensichat.aodvv2.MessageTest._
import com.nutomic.ensichat.protocol.messages.MessageTest
import junit.framework.Assert._
class CryptoTest extends AndroidTestCase {
@ -16,7 +16,7 @@ class CryptoTest extends AndroidTestCase {
}
def testSignVerify(): Unit = {
messages.foreach { m =>
MessageTest.messages.foreach { m =>
val signed = Crypto.sign(m)
assertTrue(Crypto.verify(signed, Crypto.getLocalPublicKey))
assertEquals(m.Header, signed.Header)
@ -25,7 +25,7 @@ class CryptoTest extends AndroidTestCase {
}
def testEncryptDecrypt(): Unit = {
messages.foreach{ m =>
MessageTest.messages.foreach{ m =>
val encrypted = Crypto.encrypt(Crypto.sign(m), Crypto.getLocalPublicKey)
val decrypted = Crypto.decrypt(encrypted)
assertEquals(m.Body, decrypted.Body)

4
app/src/androidTest/scala/com/nutomic/ensichat/aodvv2/ConnectionInfoTest.scala → app/src/androidTest/scala/com/nutomic/ensichat/protocol/messages/ConnectionInfoTest.scala
View File

@ -1,8 +1,8 @@
package com.nutomic.ensichat.aodvv2
package com.nutomic.ensichat.protocol.messages
import android.content.Context
import android.test.AndroidTestCase
import com.nutomic.ensichat.messages.Crypto
import com.nutomic.ensichat.protocol.Crypto
import junit.framework.Assert
object ConnectionInfoTest {

5
app/src/androidTest/scala/com/nutomic/ensichat/aodvv2/MessageHeaderTest.scala → app/src/androidTest/scala/com/nutomic/ensichat/protocol/messages/MessageHeaderTest.scala
View File

@ -1,10 +1,11 @@
package com.nutomic.ensichat.aodvv2
package com.nutomic.ensichat.protocol.messages
import java.util.GregorianCalendar
import android.test.AndroidTestCase
import com.nutomic.ensichat.aodvv2.MessageHeaderTest._
import com.nutomic.ensichat.protocol.{Address, AddressTest}
import junit.framework.Assert._
import com.nutomic.ensichat.protocol.messages.MessageHeaderTest._
object MessageHeaderTest {

10
app/src/androidTest/scala/com/nutomic/ensichat/aodvv2/MessageTest.scala → app/src/androidTest/scala/com/nutomic/ensichat/protocol/messages/MessageTest.scala
View File

@ -1,12 +1,12 @@
package com.nutomic.ensichat.aodvv2
package com.nutomic.ensichat.protocol.messages
import java.io.ByteArrayInputStream
import java.util.GregorianCalendar
import com.nutomic.ensichat.protocol.messages.MessageHeaderTest._
import com.nutomic.ensichat.protocol.messages.MessageTest._
import android.test.AndroidTestCase
import com.nutomic.ensichat.aodvv2.MessageHeaderTest._
import com.nutomic.ensichat.aodvv2.MessageTest._
import com.nutomic.ensichat.messages.Crypto
import com.nutomic.ensichat.protocol.{AddressTest, Crypto, messages}
import junit.framework.Assert._
import scala.collection.immutable.TreeSet
@ -60,7 +60,7 @@ class MessageTest extends AndroidTestCase {
}
def testSerializeEncrypted(): Unit = {
messages.foreach{ m =>
MessageTest.messages.foreach{ m =>
val signed = Crypto.sign(m)
val encrypted = Crypto.encrypt(signed, Crypto.getLocalPublicKey)
val bytes = encrypted.write

2
app/src/androidTest/scala/com/nutomic/ensichat/aodvv2/ResultAddContactTest.scala → app/src/androidTest/scala/com/nutomic/ensichat/protocol/messages/ResultAddContactTest.scala
View File

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

5
app/src/androidTest/scala/com/nutomic/ensichat/util/DatabaseTest.scala
View File

@ -8,8 +8,9 @@ import android.database.DatabaseErrorHandler
import android.database.sqlite.SQLiteDatabase
import android.test.AndroidTestCase
import android.test.mock.MockContext
import com.nutomic.ensichat.aodvv2.AddressTest
import com.nutomic.ensichat.aodvv2.MessageTest._
import com.nutomic.ensichat.protocol.AddressTest
import com.nutomic.ensichat.protocol.messages.MessageTest
import com.nutomic.ensichat.protocol.messages.MessageTest._
import junit.framework.Assert._
class DatabaseTest extends AndroidTestCase {

4
app/src/main/scala/com/nutomic/ensichat/activities/AddContactsActivity.scala
View File

@ -10,10 +10,10 @@ import android.view._
import android.widget.AdapterView.OnItemClickListener
import android.widget._
import com.nutomic.ensichat.R
import com.nutomic.ensichat.aodvv2.{Address, Message, RequestAddContact, ResultAddContact}
import com.nutomic.ensichat.bluetooth.ChatService
import com.nutomic.ensichat.bluetooth.ChatService.OnMessageReceivedListener
import com.nutomic.ensichat.messages.Crypto
import com.nutomic.ensichat.protocol.messages.{Message, RequestAddContact, ResultAddContact}
import com.nutomic.ensichat.protocol.{Address, Crypto}
import com.nutomic.ensichat.util.{DevicesAdapter, IdenticonGenerator}
import scala.collection.SortedSet

2
app/src/main/scala/com/nutomic/ensichat/activities/MainActivity.scala
View File

@ -7,8 +7,8 @@ import android.os.Bundle
import android.view.MenuItem
import android.widget.Toast
import com.nutomic.ensichat.R
import com.nutomic.ensichat.aodvv2.Address
import com.nutomic.ensichat.fragments.{ChatFragment, ContactsFragment}
import com.nutomic.ensichat.protocol.Address
/**
* Main activity, entry point for app start.

4
app/src/main/scala/com/nutomic/ensichat/bluetooth/ChatService.scala
View File

@ -10,9 +10,9 @@ import android.preference.PreferenceManager
import android.util.Log
import com.google.common.collect.HashBiMap
import com.nutomic.ensichat.R
import com.nutomic.ensichat.aodvv2._
import com.nutomic.ensichat.bluetooth.ChatService.{OnMessageReceivedListener, OnNearbyContactsChangedListener}
import com.nutomic.ensichat.messages._
import com.nutomic.ensichat.protocol._
import com.nutomic.ensichat.protocol.messages.{ConnectionInfo, Message, MessageBody, MessageHeader}
import com.nutomic.ensichat.util.Database
import scala.collection.SortedSet

4
app/src/main/scala/com/nutomic/ensichat/bluetooth/TransferThread.scala
View File

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

3
app/src/main/scala/com/nutomic/ensichat/fragments/ChatFragment.scala
View File

@ -9,9 +9,10 @@ import android.widget.TextView.OnEditorActionListener
import android.widget._
import com.nutomic.ensichat.R
import com.nutomic.ensichat.activities.EnsiChatActivity
import com.nutomic.ensichat.aodvv2.{Address, Message, Text}
import com.nutomic.ensichat.bluetooth.ChatService
import com.nutomic.ensichat.bluetooth.ChatService.OnMessageReceivedListener
import com.nutomic.ensichat.protocol.Address
import com.nutomic.ensichat.protocol.messages.{Message, Text}
import com.nutomic.ensichat.util.MessagesAdapter
import scala.collection.SortedSet

2
app/src/main/scala/com/nutomic/ensichat/aodvv2/Address.scala → app/src/main/scala/com/nutomic/ensichat/protocol/Address.scala
View File

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

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

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

6
app/src/main/scala/com/nutomic/ensichat/messages/Crypto.scala → app/src/main/scala/com/nutomic/ensichat/protocol/Crypto.scala
View File

@ -1,4 +1,4 @@
package com.nutomic.ensichat.messages
package com.nutomic.ensichat.protocol
import java.io._
import java.security._
@ -9,8 +9,8 @@ import javax.crypto.{Cipher, CipherOutputStream, KeyGenerator, SecretKey}
import android.content.Context
import android.preference.PreferenceManager
import android.util.Log
import com.nutomic.ensichat.aodvv2._
import com.nutomic.ensichat.messages.Crypto._
import com.nutomic.ensichat.protocol.Crypto._
import com.nutomic.ensichat.protocol.messages._
import com.nutomic.ensichat.util.PRNGFixes
object Crypto {

5
app/src/main/scala/com/nutomic/ensichat/aodvv2/ConnectionInfo.scala → app/src/main/scala/com/nutomic/ensichat/protocol/messages/ConnectionInfo.scala
View File

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

4
app/src/main/scala/com/nutomic/ensichat/aodvv2/CryptoData.scala → app/src/main/scala/com/nutomic/ensichat/protocol/messages/CryptoData.scala
View File

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

2
app/src/main/scala/com/nutomic/ensichat/aodvv2/EncryptedBody.scala → app/src/main/scala/com/nutomic/ensichat/protocol/messages/EncryptedBody.scala
View File

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

2
app/src/main/scala/com/nutomic/ensichat/aodvv2/Message.scala → app/src/main/scala/com/nutomic/ensichat/protocol/messages/Message.scala
View File

@ -1,4 +1,4 @@
package com.nutomic.ensichat.aodvv2
package com.nutomic.ensichat.protocol.messages
import java.io.InputStream

4
app/src/main/scala/com/nutomic/ensichat/aodvv2/MessageBody.scala → app/src/main/scala/com/nutomic/ensichat/protocol/messages/MessageBody.scala
View File

@ -1,6 +1,4 @@
package com.nutomic.ensichat.aodvv2
import android.util.Log
package com.nutomic.ensichat.protocol.messages
/**
* Holds the actual message content.

4
app/src/main/scala/com/nutomic/ensichat/aodvv2/MessageHeader.scala → app/src/main/scala/com/nutomic/ensichat/protocol/messages/MessageHeader.scala
View File

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

2
app/src/main/scala/com/nutomic/ensichat/aodvv2/RequestAddContact.scala → app/src/main/scala/com/nutomic/ensichat/protocol/messages/RequestAddContact.scala
View File

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

4
app/src/main/scala/com/nutomic/ensichat/aodvv2/ResultAddContact.scala → app/src/main/scala/com/nutomic/ensichat/protocol/messages/ResultAddContact.scala
View File

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

4
app/src/main/scala/com/nutomic/ensichat/aodvv2/Text.scala → app/src/main/scala/com/nutomic/ensichat/protocol/messages/Text.scala
View File

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

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

@ -4,7 +4,8 @@ import java.util.Date
import android.content.{ContentValues, Context}
import android.database.sqlite.{SQLiteDatabase, SQLiteOpenHelper}
import com.nutomic.ensichat.aodvv2._
import com.nutomic.ensichat.protocol._
import com.nutomic.ensichat.protocol.messages._
import scala.collection.SortedSet
import scala.collection.immutable.TreeSet

2
app/src/main/scala/com/nutomic/ensichat/util/DevicesAdapter.scala
View File

@ -3,8 +3,8 @@ package com.nutomic.ensichat.util
import android.content.Context
import android.view.{View, ViewGroup}
import android.widget.{ArrayAdapter, TextView}
import com.nutomic.ensichat.aodvv2.Address
import com.nutomic.ensichat.bluetooth.Device
import com.nutomic.ensichat.protocol.Address
/**
* Displays [[Device]]s in ListView.

2
app/src/main/scala/com/nutomic/ensichat/util/IdenticonGenerator.scala
View File

@ -3,7 +3,7 @@ package com.nutomic.ensichat.util
import android.content.Context
import android.graphics.Bitmap.Config
import android.graphics.{Bitmap, Canvas, Color}
import com.nutomic.ensichat.aodvv2.Address
import com.nutomic.ensichat.protocol.Address
/**
* Calculates a unique identicon for the given hash.

3
app/src/main/scala/com/nutomic/ensichat/util/MessagesAdapter.scala
View File

@ -4,7 +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.aodvv2.{Address, Message, Text}
import com.nutomic.ensichat.protocol.Address
import com.nutomic.ensichat.protocol.messages.{Message, Text}
/**
* Displays [[Message]]s in ListView.