Fixes crashes

perftest
Laurent 3 years ago
parent e94a677cbb
commit e0279fcc85
  1. 4
      app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
  2. 1
      app/src/main/java/net/pokeranalytics/android/ui/activity/components/BaseActivity.kt
  3. 15
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt

@ -75,7 +75,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
session.result = result
if (bankroll != null) {
session.bankroll = bankroll
session.bankroll = realm.copyFromRealm(bankroll)
} else {
realm.where<Bankroll>().findFirst()?.let { br ->
session.bankroll = realm.copyFromRealm(br)
@ -87,7 +87,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
realm.where(Game::class.java)
.equalTo("shortName", "HE").findFirst()?.let {
session.game = it
session.game = realm.copyFromRealm(it)
}
return session

@ -129,7 +129,6 @@ abstract class BaseActivity : AppCompatActivity() {
fragmentTransaction.commit()
}
/**
* Return the realm instance
*/

@ -25,6 +25,7 @@ import net.pokeranalytics.android.ui.view.rows.SessionPropertiesRow
import net.pokeranalytics.android.ui.view.rows.TransactionPropertiesRow
import net.pokeranalytics.android.ui.viewmodel.BottomSheetViewModel
import net.pokeranalytics.android.ui.viewmodel.BottomSheetViewModelFactory
import timber.log.Timber
import java.util.*
class BottomSheetConfig(var row: RowRepresentable,
@ -169,10 +170,18 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
val primaryKey = data.getStringExtra(EditableDataActivity.IntentKey.PRIMARY_KEY.keyName)
val pokerAnalyticsActivity = activity as BaseActivity
val liveDataType = LiveData.values()[dataType]
this.model.addedData = liveDataType.getData(pokerAnalyticsActivity.getRealm(), primaryKey)
this.onRowValueChanged()
val realm = pokerAnalyticsActivity.getRealm()
liveDataType.getData(realm, primaryKey)?.let {
this.model.addedData = realm.copyFromRealm(it)
this.onRowValueChanged()
dismiss()
} ?: run {
Timber.w("Data not found with primary key = $primaryKey")
}
// this.model.addedData = liveDataType.getData(pokerAnalyticsActivity.getRealm(), primaryKey)
// this.delegate.onRowValueChanged(proxyItem, this.row)
dismiss()
}
}

Loading…
Cancel
Save