Make pnp settings changes synchronous.

greyson-signal · greyson-signal · commit 998a5c09ae2e · 2025-02-20T16:25:41.000-05:00
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PhoneNumberPrivacyValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PhoneNumberPrivacyValues.java
@@ -54,7 +54,7 @@ public boolean isPhoneNumberSharingEnabled() {
 
   public void setPhoneNumberSharingMode(@NonNull PhoneNumberSharingMode phoneNumberSharingMode) {
     Log.i(TAG, "Setting phone number sharing to: " + phoneNumberSharingMode.name(), new Throwable());
-    putInteger(SHARING_MODE, phoneNumberSharingMode.serialize());
+    getStore().beginWrite().putInteger(SHARING_MODE, phoneNumberSharingMode.serialize()).commit();
   }
 
   public @NonNull PhoneNumberDiscoverabilityMode getPhoneNumberDiscoverabilityMode() {
@@ -68,7 +68,7 @@ public void setPhoneNumberDiscoverabilityMode(@NonNull PhoneNumberDiscoverabilit
         .beginWrite()
         .putInteger(DISCOVERABILITY_MODE, phoneNumberDiscoverabilityMode.serialize())
         .putLong(DISCOVERABILITY_TIMESTAMP, System.currentTimeMillis())
-        .apply();
+        .commit();
   }
 
   public long getPhoneNumberDiscoverabilityModeTimestamp() {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public boolean isPhoneNumberSharingEnabled() {`
`54`	`54`
`55`	`55`	`public void setPhoneNumberSharingMode(@NonNull PhoneNumberSharingMode phoneNumberSharingMode) {`
`56`	`56`	`Log.i(TAG, "Setting phone number sharing to: " + phoneNumberSharingMode.name(), new Throwable());`
`57`		`- putInteger(SHARING_MODE, phoneNumberSharingMode.serialize());`
	`57`	`+ getStore().beginWrite().putInteger(SHARING_MODE, phoneNumberSharingMode.serialize()).commit();`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public @NonNull PhoneNumberDiscoverabilityMode getPhoneNumberDiscoverabilityMode() {`
`@@ -68,7 +68,7 @@ public void setPhoneNumberDiscoverabilityMode(@NonNull PhoneNumberDiscoverabilit`
`68`	`68`	`.beginWrite()`
`69`	`69`	`.putInteger(DISCOVERABILITY_MODE, phoneNumberDiscoverabilityMode.serialize())`
`70`	`70`	`.putLong(DISCOVERABILITY_TIMESTAMP, System.currentTimeMillis())`
`71`		`- .apply();`
	`71`	`+ .commit();`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`public long getPhoneNumberDiscoverabilityModeTimestamp() {`