FEATURE_CONNECTION_SERVICE still exists on 33

Stephen Paul Weber created 2 years ago

Change summary

src/cheogram/java/eu/siacs/conversations/ui/ManageAccountActivity.java | 2 
src/main/java/eu/siacs/conversations/entities/Contact.java             | 4 
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java     | 2 
3 files changed, 4 insertions(+), 4 deletions(-)

Detailed changes

src/cheogram/java/eu/siacs/conversations/ui/ManageAccountActivity.java

@@ -94,7 +94,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
 
         if (Build.VERSION.SDK_INT < 23) return;
         if (Build.VERSION.SDK_INT >= 33) {
-            if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELECOM)) return;
+            if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELECOM) && !getPackageManager().hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE)) return;
         } else {
             if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE)) return;
         }

src/main/java/eu/siacs/conversations/entities/Contact.java

@@ -653,7 +653,7 @@ public class Contact implements ListItem, Blockable {
     public void registerAsPhoneAccount(XmppConnectionService ctx) {
         if (Build.VERSION.SDK_INT < 23) return;
         if (Build.VERSION.SDK_INT >= 33) {
-            if (!ctx.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELECOM)) return;
+            if (!ctx.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELECOM) && !ctx.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE)) return;
         } else {
             if (!ctx.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE)) return;
         }
@@ -682,7 +682,7 @@ public class Contact implements ListItem, Blockable {
     public void unregisterAsPhoneAccount(Context ctx) {
         if (Build.VERSION.SDK_INT < 23) return;
         if (Build.VERSION.SDK_INT >= 33) {
-            if (!ctx.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELECOM)) return;
+            if (!ctx.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELECOM) && !ctx.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE)) return;
         } else {
             if (!ctx.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE)) return;
         }

src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java

@@ -289,7 +289,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         }
         if (Build.VERSION.SDK_INT < 23) return false;
         if (Build.VERSION.SDK_INT >= 33) {
-            if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELECOM)) return false;
+            if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELECOM) && !getPackageManager().hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE)) return false;
         } else {
             if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE)) return false;
         }