Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
filipmacek committed Aug 15, 2020
1 parent 2a5dab5 commit caf2570
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 17 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
.externalNativeBuild
.cxx
.metals/
appsecrets.properties
11 changes: 11 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ apply plugin: 'kotlin-kapt'
apply plugin: 'androidx.navigation.safeargs.kotlin'
apply plugin: 'koin'

def appSecretsFile = rootProject.file("appsecrets.properties")
def appSecrets = new Properties()
appSecrets.load(new FileInputStream(appSecretsFile))

android {
compileSdkVersion rootProject.compileSdkVersion
buildFeatures {
Expand All @@ -20,6 +24,13 @@ android {
versionName "0.1.6"
vectorDrawables.useSupportLibrary true

// Agent private key
buildConfigField("String","AGENT_PRIVATE_KEY",appSecrets["AGENT_PRIVATE_KEY"])
buildConfigField("String","INFURA_NODE_URL",appSecrets["INFURA_NODE_URL"])
buildConfigField("String","CONTRACT_ADDRESS",appSecrets["CONTRACT_ADDRESS"])
buildConfigField("String","AGENT_ADDRESS",appSecrets["AGENT_ADDRESS"])


}
buildTypes {
release {
Expand Down
18 changes: 3 additions & 15 deletions app/src/main/java/com/filipmacek/movement/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,18 @@ package com.filipmacek.movement

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.util.Log
import com.karumi.dexter.Dexter
import android.Manifest
import android.annotation.SuppressLint
import android.content.*
import android.location.Location
import android.os.IBinder
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import androidx.navigation.Navigation
import android.util.Log
import com.filipmacek.movement.data.location.Coordinate
import com.filipmacek.movement.data.location.LocationRepository
import com.filipmacek.movement.data.users.User
import com.filipmacek.movement.services.MovementLocationService
import com.filipmacek.movement.viewmodels.MainActivityViewModel
import com.google.android.gms.location.LocationServices
import com.google.android.gms.location.SettingsClient
import com.karumi.dexter.MultiplePermissionsReport
import com.karumi.dexter.PermissionToken
import com.karumi.dexter.listener.PermissionRequest
import com.karumi.dexter.listener.multi.MultiplePermissionsListener
import org.koin.android.ext.android.inject
import java.io.File

import com.filipmacek.movement.BuildConfig

@Suppress("DEPRECATION")
class MainActivity : AppCompatActivity() {
Expand Down Expand Up @@ -55,14 +44,13 @@ class MainActivity : AppCompatActivity() {
token: PermissionToken?
) {}
}).check()


}






companion object {
private const val TAG="MainActivity"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ import org.web3j.tx.ReadonlyTransactionManager
import org.web3j.tx.gas.DefaultGasProvider
import java.math.BigInteger
import java.nio.charset.Charset
import com.filipmacek.movement.BuildConfig

class SmartContract(){
private var web3j:Web3j
private val urlInfura="https://kovan.infura.io/v3/42f42a255e264be7a6bc8373c4308e96"
private val address="0x7468fd7961Caa0dB1b184040862613A981E3A77E"
private val urlInfura= BuildConfig.INFURA_NODE_URL
private val address=BuildConfig.CONTRACT_ADDRESS
private val contractManager: ReadonlyTransactionManager
private var contract: Movement_contract?=null
init {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.filipmacek.movement.blockchain

import android.util.Log
import com.filipmacek.movement.BuildConfig
import com.filipmacek.movement.data.nodes.Node
import com.filipmacek.movement.data.routes.Route
import com.filipmacek.movement.data.users.User
import org.web3j.crypto.Credentials
import org.web3j.protocol.Web3j
import org.web3j.tx.RawTransactionManager
import org.web3j.tx.gas.DefaultGasProvider


class SmartContractAgent (web3j: Web3j){
private val urlInfura = BuildConfig.INFURA_NODE_URL
private val address = BuildConfig.CONTRACT_ADDRESS
private val credentials:Credentials = Credentials.create(BuildConfig.AGENT_PRIVATE_KEY)
private val transactionManager:RawTransactionManager = RawTransactionManager(web3j,credentials)
private val contract = Movement_contract.load(
address,web3j,transactionManager,DefaultGasProvider()
)


companion object{
const val TAG= "SmartContractAddress"
}

fun routeStarted(user: User, route: Route, nodeList:List<Node>){

}
fun routeFinished(user:User,route:Route,nodeList: List<Node>){

}


}

0 comments on commit caf2570

Please sign in to comment.