mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-20 16:49:40 +01:00
Rewrite the AppDependencies system.
This commit is contained in:
committed by
Cody Henthorne
parent
a0131bf39b
commit
b6a4e1f145
@@ -12,7 +12,7 @@ import com.google.i18n.phonenumbers.ShortNumberInfo;
|
||||
|
||||
import org.signal.core.util.logging.Log;
|
||||
import org.signal.libsignal.protocol.util.Pair;
|
||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
|
||||
import org.thoughtcrime.securesms.dependencies.AppDependencies;
|
||||
import org.thoughtcrime.securesms.groups.GroupId;
|
||||
import org.thoughtcrime.securesms.keyvalue.SignalStore;
|
||||
import org.signal.core.util.SetUtil;
|
||||
@@ -79,7 +79,7 @@ public class PhoneNumberFormatter {
|
||||
}
|
||||
|
||||
public static @NonNull String prettyPrint(@NonNull String e164) {
|
||||
return StringUtil.forceLtr(get(ApplicationDependencies.getApplication()).prettyPrintFormat(e164));
|
||||
return StringUtil.forceLtr(get(AppDependencies.getApplication()).prettyPrintFormat(e164));
|
||||
}
|
||||
|
||||
public @NonNull String prettyPrintFormat(@NonNull String e164) {
|
||||
@@ -101,7 +101,7 @@ public class PhoneNumberFormatter {
|
||||
}
|
||||
|
||||
public static int getLocalCountryCode() {
|
||||
Optional<PhoneNumber> localNumber = get(ApplicationDependencies.getApplication()).localNumber;
|
||||
Optional<PhoneNumber> localNumber = get(AppDependencies.getApplication()).localNumber;
|
||||
return localNumber != null && localNumber.isPresent() ? localNumber.get().countryCode : 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user