Skip to content

Commit 996d9e5

Browse files
JanF01JanF01
committed
[FEAT] v1 for testing with backend
1 parent 4148a11 commit 996d9e5

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎app/src/main/java/com/example/blockchainaccess/CreateProfileActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fun CreateProfileScreen(name: String, modifier: Modifier = Modifier) {
6363
var username by remember { mutableStateOf("") }
6464
var password by remember { mutableStateOf("") }
6565
var repeatPassword by remember { mutableStateOf("") }
66-
var selectedPort by remember { mutableStateOf("8081") }
66+
var selectedPort by remember { mutableStateOf("8001") }
6767
var showPortDropdown by remember { mutableStateOf(false) }
6868
Scaffold {
6969
Box(
@@ -175,7 +175,7 @@ fun CreateProfileScreen(name: String, modifier: Modifier = Modifier) {
175175
expanded = showPortDropdown,
176176
onDismissRequest = { showPortDropdown = false }
177177
) {
178-
val ports = listOf("8081", "8082", "8083", "8084")
178+
val ports = listOf("8001", "8002", "8003", "8004")
179179
ports.forEach { port ->
180180
DropdownMenuItem(
181181
text = { Text(port) },

‎app/src/main/java/com/example/blockchainaccess/LoginActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ fun LoginScreen(name: String, modifier: Modifier = Modifier) {
6262
val coroutineScope = rememberCoroutineScope()
6363
var username by remember { mutableStateOf("") }
6464
var password by remember { mutableStateOf("") }
65-
var selectedPort by remember { mutableStateOf("8081") }
65+
var selectedPort by remember { mutableStateOf("8001") }
6666
var showPortDropdown by remember { mutableStateOf(false) }
6767
Scaffold {
6868
Box(
@@ -152,7 +152,7 @@ fun LoginScreen(name: String, modifier: Modifier = Modifier) {
152152
expanded = showPortDropdown,
153153
onDismissRequest = { showPortDropdown = false }
154154
) {
155-
val ports = listOf("8081", "8082", "8083", "8084")
155+
val ports = listOf("8001", "8002", "8003", "8004")
156156
ports.forEach { port ->
157157
DropdownMenuItem(
158158
text = { Text(port) },

‎app/src/main/java/com/example/blockchainaccess/NetworkClient.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ object NetworkClient {
117117

118118
@Serializable
119119
private data class CreateProfileResponse(
120-
val id: String,
120+
val blockchain_node_id: String,
121121
val whitelist: Set<String>
122122
)
123123

@@ -153,7 +153,7 @@ object NetworkClient {
153153

154154
suspend fun getChain(userId: String, port: String, context: Context): Result<Unit> {
155155
return try {
156-
val url = "http://192.168.0.100:$port/get_chain"
156+
val url = "http://192.168.0.178:$port/get_chain"
157157
val response: HttpResponse = client.post(url) {
158158
contentType(ContentType.Application.Json)
159159
setBody(WhitelistRequest(userId))
@@ -183,7 +183,7 @@ object NetworkClient {
183183

184184
suspend fun requestForWhitelist(userId: String, port: String): Result<Set<String>> {
185185
return try {
186-
val url = "http://192.168.0.100:$port/request_whitelist"
186+
val url = "http://192.168.0.178:$port/request_whitelist"
187187
val response: HttpResponse = client.post(url) {
188188
contentType(ContentType.Application.Json)
189189
setBody(WhitelistRequest(userId))
@@ -206,7 +206,7 @@ object NetworkClient {
206206

207207
suspend fun addWhitelistEntry(userId: String, port: String): Result<Unit> {
208208
return try {
209-
val url = "http://192.168.0.100:$port/new_whitelist_entry"
209+
val url = "http://192.168.0.178:$port/new_whitelist_entry"
210210
val response = client.post(url) {
211211
contentType(ContentType.Application.Json)
212212
setBody(WhitelistRequest(userId))
@@ -224,7 +224,7 @@ object NetworkClient {
224224

225225
suspend fun removeWhitelistEntry(userId: String, port: String): Result<Unit> {
226226
return try {
227-
val url = "http://192.168.0.100:$port/remove_whitelist_entry"
227+
val url = "http://192.168.0.178:$port/remove_whitelist_entry"
228228
val response = client.post(url) {
229229
contentType(ContentType.Application.Json)
230230
setBody(WhitelistRequest(userId))
@@ -246,7 +246,7 @@ object NetworkClient {
246246
port: String
247247
): Result<Pair<String, Set<String>>> {
248248
try {
249-
val loginUrl = "http://192.168.0.100:$port/login"
249+
val loginUrl = "http://192.168.0.178:$port/login"
250250
val response: HttpResponse = client.post(loginUrl) {
251251
contentType(ContentType.Application.Json)
252252
setBody(CreateProfileRequest(username, password))
@@ -259,7 +259,7 @@ object NetworkClient {
259259
}
260260

261261
val creationResponse = response.body<CreateProfileResponse>()
262-
val id = creationResponse.id
262+
val id = creationResponse.blockchain_node_id
263263
val whitelist = creationResponse.whitelist
264264

265265
if (id.isBlank()) {
@@ -280,7 +280,7 @@ object NetworkClient {
280280

281281
suspend fun createAndRegisterProfile(username: String, password: String, port: String): Result<Pair<String, Set<String>>> {
282282
try {
283-
val createProfileUrl = "http://192.168.0.100:$port/register"
283+
val createProfileUrl = "http://192.168.0.178:$port/register"
284284
val response: HttpResponse = client.post(createProfileUrl) {
285285
contentType(ContentType.Application.Json)
286286
setBody(CreateProfileRequest(username, password))
@@ -291,7 +291,7 @@ object NetworkClient {
291291
}
292292

293293
val creationResponse = response.body<CreateProfileResponse>()
294-
val generatedId = creationResponse.id
294+
val generatedId = creationResponse.blockchain_node_id
295295
val whitelist = creationResponse.whitelist
296296

297297
if (generatedId.isBlank()) {
@@ -303,7 +303,7 @@ object NetworkClient {
303303
}
304304
println("Profile created. ID: $generatedId")
305305

306-
val registerUrl = "http://192.168.0.100:$port/app_save_id"
306+
val registerUrl = "http://192.168.0.178:$port/app_save_id"
307307
val registerResponse: HttpResponse = client.post(registerUrl) {
308308
contentType(ContentType.Application.Json)
309309
setBody(UpdateUserRequest(generatedId))

0 commit comments

Comments
 (0)