empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add extra conditions for the SMS banner.

Browse source
This commit is contained in:
Greyson Parrelli 2021-01-08 17:31:54 -05:00 • committed by Alan Evans
parent ae5f9fb8ac
commit 3739eb7731
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java
View file

@ -8,6 +8,7 @@ import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
import org.thoughtcrime.securesms.util.SmsUtil; import org.thoughtcrime.securesms.util.SmsUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
@ -41,6 +42,6 @@ public class DefaultSmsReminder extends Reminder {
TextSecurePreferences.setPromptedDefaultSmsProvider(context, false); TextSecurePreferences.setPromptedDefaultSmsProvider(context, false);
} }
return !isDefault && !TextSecurePreferences.hasPromptedDefaultSmsProvider(context); return !isDefault && !TextSecurePreferences.hasPromptedDefaultSmsProvider(context) && PhoneNumberFormatter.getLocalCountryCode() != 91;
} }
} }

6
app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java
View file

@ -110,6 +110,12 @@ public class PhoneNumberFormatter {
} }
} }
public static int getLocalCountryCode() {
Optional<PhoneNumber> localNumber = get(ApplicationDependencies.getApplication()).localNumber;
return localNumber != null && localNumber.isPresent() ? localNumber.get().countryCode : 0;
}
public String format(@Nullable String number) { public String format(@Nullable String number) {
if (number == null) return "Unknown"; if (number == null) return "Unknown";
if (GroupId.isEncodedGroup(number)) return number; if (GroupId.isEncodedGroup(number)) return number;