X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;fp=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=c14bc3f15c3bdd122aee8cbb45ec066b7015aa3d;hp=35f39358c46efa6d0634bea443c6a5bb01501af5;hb=f5d585d79f8c263476c8fb78ada15f04472d9a91;hpb=a7822614a0442e0de5e65c3b59a9143efb41961a diff --git a/app/src/main/java/net/ktnx/mobileledger/model/Data.java b/app/src/main/java/net/ktnx/mobileledger/model/Data.java index 35f39358..c14bc3f1 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java @@ -18,6 +18,7 @@ package net.ktnx.mobileledger.model; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; @@ -35,7 +36,6 @@ import java.text.ParsePosition; import java.util.Date; import java.util.List; import java.util.Locale; -import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import static net.ktnx.mobileledger.utils.Logger.debug; @@ -45,7 +45,9 @@ public final class Data { new MutableLiveData<>(false); public static final MutableLiveData backgroundTaskProgress = new MutableLiveData<>(); - public static final LiveData> profiles = DB.get().getProfileDAO().getAllOrdered(); + public static final LiveData> profiles = DB.get() + .getProfileDAO() + .getAllOrdered(); public static final MutableLiveData currencySymbolPosition = new MutableLiveData<>(); public static final MutableLiveData currencyGap = new MutableLiveData<>(true); @@ -58,8 +60,7 @@ public final class Data { public static final MutableLiveData lastTransactionsUpdateText = new MutableLiveData<>(); public static final MutableLiveData lastAccountsUpdateText = new MutableLiveData<>(); - private static final MutableLiveData profile = - new InertMutableLiveData<>(); + private static final MutableLiveData profile = new InertMutableLiveData<>(); private static final AtomicInteger backgroundTaskCount = new AtomicInteger(0); private static final Locker profilesLocker = new Locker(); private static NumberFormat numberFormatter; @@ -68,9 +69,9 @@ public final class Data { locale.setValue(Locale.getDefault()); } - @NonNull + @Nullable public static Profile getProfile() { - return Objects.requireNonNull(profile.getValue()); + return profile.getValue(); } public static void backgroundTaskStarted() { int cnt = backgroundTaskCount.incrementAndGet(); @@ -135,8 +136,7 @@ public final class Data { public static String formatNumber(float number) { return numberFormatter.format(number); } - public static void observeProfile(LifecycleOwner lifecycleOwner, - Observer observer) { + public static void observeProfile(LifecycleOwner lifecycleOwner, Observer observer) { profile.observe(lifecycleOwner, observer); } public static void removeProfileObservers(LifecycleOwner owner) {