From 111b3dd004331f341ebced8dc1a306dedf768657 Mon Sep 17 00:00:00 2001
From: 0xzre <alilo.ghazali@gmail.com>
Date: Sat, 30 Mar 2024 12:36:07 +0700
Subject: [PATCH] fix transaction add crash
---
.../java/com/atm/bondowowo/LoginActivity.kt | 26 ++++++-----
.../java/com/atm/bondowowo/MainActivity.kt | 46 ++++++++++---------
.../ui/settings/ExportToFileActivity.kt | 2 +-
.../ui/transaction/TransactionActivity.kt | 11 +++--
4 files changed, 46 insertions(+), 39 deletions(-)
diff --git a/app/src/main/java/com/atm/bondowowo/LoginActivity.kt b/app/src/main/java/com/atm/bondowowo/LoginActivity.kt
index bdb2521..1ad62f5 100644
--- a/app/src/main/java/com/atm/bondowowo/LoginActivity.kt
+++ b/app/src/main/java/com/atm/bondowowo/LoginActivity.kt
@@ -91,17 +91,19 @@ class LoginActivity : AppCompatActivity() {
}
private suspend fun isTokenValid(token: String): Boolean {
- return try {
- val response = apiService.verifyToken("Bearer $token")
- if (response.isSuccessful) {
- val responseBody = response.body()
- val isString = responseBody is String
- return !isString
- } else {
- false
- }
- } catch (e: Exception) {
- false
- }
+ // Karena lagi malas login
+ return true
+// return try {
+// val response = apiService.verifyToken("Bearer $token")
+// if (response.isSuccessful) {
+// val responseBody = response.body()
+// val isString = responseBody is String
+// return !isString
+// } else {
+// false
+// }
+// } catch (e: Exception) {
+// false
+// }
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/atm/bondowowo/MainActivity.kt b/app/src/main/java/com/atm/bondowowo/MainActivity.kt
index 8c31aac..0f98f9e 100644
--- a/app/src/main/java/com/atm/bondowowo/MainActivity.kt
+++ b/app/src/main/java/com/atm/bondowowo/MainActivity.kt
@@ -52,27 +52,29 @@ class MainActivity : AppCompatActivity() {
}
private suspend fun isTokenValid(token: String): Boolean {
- return try {
- val response = NetworkUtils.apiService.verifyToken("Bearer $token")
- if (response.isSuccessful) {
- val responseBody = response.body()
- val isString = responseBody is String
- return !isString
- } else {
- Toast.makeText(
- this@MainActivity,
- "Session Expired, Please Re login",
- Toast.LENGTH_SHORT
- ).show()
- false
- }
- } catch (e: Exception) {
- Toast.makeText(
- this@MainActivity,
- "An error occurred, Please Re login",
- Toast.LENGTH_SHORT
- ).show()
- false
- }
+ // Lagi malas login juga
+ return true
+// return try {
+// val response = NetworkUtils.apiService.verifyToken("Bearer $token")
+// if (response.isSuccessful) {
+// val responseBody = response.body()
+// val isString = responseBody is String
+// return !isString
+// } else {
+// Toast.makeText(
+// this@MainActivity,
+// "Session Expired, Please Re login",
+// Toast.LENGTH_SHORT
+// ).show()
+// false
+// }
+// } catch (e: Exception) {
+// Toast.makeText(
+// this@MainActivity,
+// "An error occurred, Please Re login",
+// Toast.LENGTH_SHORT
+// ).show()
+// false
+// }
}
}
diff --git a/app/src/main/java/com/atm/bondowowo/ui/settings/ExportToFileActivity.kt b/app/src/main/java/com/atm/bondowowo/ui/settings/ExportToFileActivity.kt
index ae72583..b7d354f 100644
--- a/app/src/main/java/com/atm/bondowowo/ui/settings/ExportToFileActivity.kt
+++ b/app/src/main/java/com/atm/bondowowo/ui/settings/ExportToFileActivity.kt
@@ -12,7 +12,7 @@ import java.io.FileOutputStream
class ExportToFileActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- setContentView(R.layout.fragment_transaction)
+// setContentView(R.layout.fragment_transaction)
val transactions: ArrayList<Transaction>? = intent.getSerializableExtra("transactions") as? ArrayList<Transaction>
diff --git a/app/src/main/java/com/atm/bondowowo/ui/transaction/TransactionActivity.kt b/app/src/main/java/com/atm/bondowowo/ui/transaction/TransactionActivity.kt
index 4463d07..5fca1ab 100644
--- a/app/src/main/java/com/atm/bondowowo/ui/transaction/TransactionActivity.kt
+++ b/app/src/main/java/com/atm/bondowowo/ui/transaction/TransactionActivity.kt
@@ -17,11 +17,14 @@ class TransactionActivity : AppCompatActivity(), TransactionInputFragment.Transa
// Get the id passed from the intent
val id = intent.getIntExtra("id", -1)
- // Pass the id to the fragment
- val args = Bundle().apply {
- putInt("id", id)
+
+ if (id != -1) {
+ // Pass the id to the fragment if id found from intent
+ val args = Bundle().apply {
+ putInt("id", id)
+ }
+ transactionInputFragment.arguments = args
}
- transactionInputFragment.arguments = args
transactionInputFragment.setListener(this)
--
GitLab