Remove Context from isValidForDelete signature

dev
Laurent 7 years ago
parent 3139395d32
commit 141dbf0f7e
  1. 4
      app/src/main/java/net/pokeranalytics/android/model/interfaces/Manageable.kt
  2. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
  3. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
  4. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt
  5. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt
  6. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
  7. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
  8. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/ReportSetup.kt
  9. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt
  10. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt
  11. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt
  12. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt
  13. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt
  14. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
  15. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/data/DataManagerFragment.kt

@ -107,11 +107,11 @@ interface Deletable : Identifiable {
/** /**
* A method to define if an object is safe for deletion in database * A method to define if an object is safe for deletion in database
*/ */
fun isValidForDelete(context: Context, realm: Realm): Boolean fun isValidForDelete(realm: Realm): Boolean
fun getDeleteStatus(context: Context, realm: Realm): DeleteValidityStatus { fun getDeleteStatus(context: Context, realm: Realm): DeleteValidityStatus {
if (!isValidForDelete(context, realm)) { if (!isValidForDelete(realm)) {
return DeleteValidityStatus.INVALID return DeleteValidityStatus.INVALID
} }
return DeleteValidityStatus.VALID return DeleteValidityStatus.VALID

@ -66,7 +66,7 @@ open class Bankroll : RealmObject(), NameManageable, RowRepresentable {
} }
} }
override fun isValidForDelete(context: Context, realm: Realm): Boolean { override fun isValidForDelete(realm: Realm): Boolean {
return realm.where<Session>().equalTo("bankroll.id", id).findAll().isEmpty() return realm.where<Session>().equalTo("bankroll.id", id).findAll().isEmpty()
&& realm.where<Transaction>().equalTo("bankroll.id", id).findAll().isEmpty() && realm.where<Transaction>().equalTo("bankroll.id", id).findAll().isEmpty()
} }

@ -121,7 +121,7 @@ open class CustomField : RealmObject(), NameManageable, StaticRowRepresentableDa
return realm.where(this::class.java).equalTo("name", this.name).and().notEqualTo("id", this.id).findAll().isNotEmpty() return realm.where(this::class.java).equalTo("name", this.name).and().notEqualTo("id", this.id).findAll().isNotEmpty()
} }
override fun isValidForDelete(context: Context, realm: Realm): Boolean { override fun isValidForDelete(realm: Realm): Boolean {
val sessions = realm.where<Session>().contains("customFieldEntries.customField.id", id).findAll() val sessions = realm.where<Session>().contains("customFieldEntries.customField.id", id).findAll()
return sessions.isEmpty() return sessions.isEmpty()
} }

@ -95,7 +95,7 @@ open class CustomFieldEntry : RealmObject(), NameManageable, RowRepresentable {
this.value = value as String? ?: "" this.value = value as String? ?: ""
} }
override fun isValidForDelete(context: Context, realm: Realm): Boolean { override fun isValidForDelete(realm: Realm): Boolean {
if (realm.where<Session>().contains("customFieldEntries.id", id).findAll().isNotEmpty()) { if (realm.where<Session>().contains("customFieldEntries.id", id).findAll().isNotEmpty()) {
return false return false
} }

@ -173,7 +173,7 @@ open class Filter : RealmObject(), RowRepresentable, Identifiable, Deletable, Co
return this.query.getName(context) return this.query.getName(context)
} }
override fun isValidForDelete(context: Context, realm: Realm): Boolean { override fun isValidForDelete(realm: Realm): Boolean {
return true return true
} }

@ -91,7 +91,7 @@ open class Game : RealmObject(), NameManageable, StaticRowRepresentableDataSourc
} }
} }
override fun isValidForDelete(context: Context, realm: Realm): Boolean { override fun isValidForDelete(realm: Realm): Boolean {
return realm.where<Session>().equalTo("game.id", id).findAll().isEmpty() return realm.where<Session>().equalTo("game.id", id).findAll().isEmpty()
} }
} }

@ -59,7 +59,7 @@ open class Location : RealmObject(), NameManageable, RowRepresentable {
} }
} }
override fun isValidForDelete(context: Context, realm: Realm): Boolean { override fun isValidForDelete(realm: Realm): Boolean {
return realm.where<Session>().equalTo("location.id", id).findAll().isEmpty() return realm.where<Session>().equalTo("location.id", id).findAll().isEmpty()
} }
} }

@ -70,7 +70,7 @@ open class ReportSetup : RealmObject(), RowRepresentable, Deletable {
// Deletable // Deletable
override fun isValidForDelete(context: Context, realm: Realm): Boolean { override fun isValidForDelete(realm: Realm): Boolean {
return true return true
} }

@ -73,7 +73,7 @@ open class TournamentFeature : RealmObject(), NameManageable, StaticRowRepresent
} }
} }
override fun isValidForDelete(context: Context, realm: Realm): Boolean { override fun isValidForDelete(realm: Realm): Boolean {
return realm.where<Session>().equalTo("tournamentFeatures.id", id).findAll().isEmpty() return realm.where<Session>().equalTo("tournamentFeatures.id", id).findAll().isEmpty()
} }
} }

@ -67,7 +67,7 @@ open class TournamentName : RealmObject(), NameManageable, StaticRowRepresentabl
} }
} }
override fun isValidForDelete(context: Context, realm: Realm): Boolean { override fun isValidForDelete(realm: Realm): Boolean {
return realm.where<Session>().equalTo("tournamentName.id", id).findAll().isEmpty() return realm.where<Session>().equalTo("tournamentName.id", id).findAll().isEmpty()
} }
} }

@ -115,7 +115,7 @@ open class Transaction : RealmObject(), Manageable, StaticRowRepresentableDataSo
return realm.findById<Transaction>(id) != null return realm.findById<Transaction>(id) != null
} }
override fun isValidForDelete(context: Context, realm: Realm): Boolean { override fun isValidForDelete(realm: Realm): Boolean {
return true return true
} }

@ -90,7 +90,7 @@ open class TransactionType : RealmObject(), NameManageable, StaticRowRepresentab
} }
} }
override fun isValidForDelete(context: Context, realm: Realm): Boolean { override fun isValidForDelete(realm: Realm): Boolean {
return true return true
} }

@ -88,7 +88,7 @@ abstract class DeletableItemFragment : RealmFragment() {
val deletableItem = (itemToDelete as Deletable) val deletableItem = (itemToDelete as Deletable)
// Check if the object is valid for the deletion // Check if the object is valid for the deletion
if (deletableItem.isValidForDelete(requireContext(), this.getRealm())) { if (deletableItem.isValidForDelete(this.getRealm())) {
deletedItem = getRealm().copyFromRealm(itemToDelete) deletedItem = getRealm().copyFromRealm(itemToDelete)
lastDeletedItemPosition = itemPosition lastDeletedItemPosition = itemPosition
getRealm().executeTransaction { getRealm().executeTransaction {

@ -180,7 +180,7 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa
super.onRowDeleted(row) super.onRowDeleted(row)
when (row) { when (row) {
is CustomFieldEntry -> { is CustomFieldEntry -> {
if (!row.isValidForDelete(requireContext(), getRealm())) { if (!row.isValidForDelete(getRealm())) {
val status = row.getDeleteStatus(requireContext(), getRealm()) val status = row.getDeleteStatus(requireContext(), getRealm())
val message = row.getFailedDeleteMessage(status) val message = row.getFailedDeleteMessage(status)
showAlertDialog(requireContext(), R.string.cf_entry_delete_popup_title, message, showCancelButton = true, positiveAction = { showAlertDialog(requireContext(), R.string.cf_entry_delete_popup_title, message, showCancelButton = true, positiveAction = {

@ -126,7 +126,7 @@ open class DataManagerFragment : RealmFragment() {
val deletable = this.item as Deletable val deletable = this.item as Deletable
val realm = this.getRealm() val realm = this.getRealm()
if (deletable.isValidForDelete(requireContext(), realm)) { if (deletable.isValidForDelete(realm)) {
val intent = Intent() val intent = Intent()
intent.putExtra(DataListActivity.IntentKey.ITEM_DELETED.keyName, deletable.id) intent.putExtra(DataListActivity.IntentKey.ITEM_DELETED.keyName, deletable.id)
activity?.setResult(Activity.RESULT_OK, intent) activity?.setResult(Activity.RESULT_OK, intent)

Loading…
Cancel
Save