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

Generate local keys before starting any connectivity.

Browse source
This commit is contained in:
Felix Ableitner 2015-01-24 17:16:46 +01:00
parent 7bc8532732
commit 998f2676e0
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/scala/com/nutomic/ensichat/bluetooth/ChatService.scala
View file

@ -81,7 +81,7 @@ class ChatService extends Service {
private val AddressDeviceMap = HashBiMap.create[Address, Device.ID]()
/**
* Initializes BroadcastReceiver for discovery, starts discovery and listens for connections.
* Sets up bluetooth connectivity.
*/
override def onCreate(): Unit = {
super.onCreate()
@ -92,14 +92,12 @@ class ChatService extends Service {
registerReceiver(BluetoothStateReceiver, new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED))
registerReceiver(DiscoveryFinishedReceiver,
new IntentFilter(BluetoothAdapter.ACTION_DISCOVERY_FINISHED))
if (bluetoothAdapter.isEnabled) {
startBluetoothConnections()
}
if (!Crypto.localKeysExist)
Future(Crypto.generateLocalKeys())
else
Future {
Crypto.generateLocalKeys()
startBluetoothConnections()
Log.i(Tag, "Service started, address is " + Crypto.getLocalAddress)
}
}
override def onStartCommand(intent: Intent, flags: Int, startId: Int) = Service.START_STICKY
@ -167,7 +165,8 @@ class ChatService extends Service {
override def onReceive(context: Context, intent: Intent): Unit = {
intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1) match {
case BluetoothAdapter.STATE_ON =>
startBluetoothConnections()
if (Crypto.localKeysExist)
startBluetoothConnections()
case BluetoothAdapter.STATE_TURNING_OFF =>
connections.foreach(d => d._2.close())
case BluetoothAdapter.STATE_OFF =>

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

@ -73,8 +73,13 @@ class Crypto(Context: Context) {
/**
* Generates a new key pair using [[KeyAlgorithm]] with [[KeySize]] bits and stores the keys.
*
* Does nothing if the key pair already exists.
*/
def generateLocalKeys(): Unit = {
if (localKeysExist)
return
var address: Address = null
var keyPair: KeyPair = null
do {