From c294a24f4e470baaea23aebd2e3d579d5b1cd1ff Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 4 Apr 2024 09:57:01 +0200 Subject: [PATCH] add some call integration debug aids --- build.gradle | 2 +- .../CallIntegrationConnectionService.java | 1 + .../conversations/ui/AboutPreference.java | 23 ++++++++++--------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 70cecf825..6b36db34a 100644 --- a/build.gradle +++ b/build.gradle @@ -82,7 +82,7 @@ dependencies { implementation 'com.google.guava:guava:32.1.3-android' quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.13.28' - implementation 'im.conversations.webrtc:webrtc-android:119.0.0' + implementation 'im.conversations.webrtc:webrtc-android:119.0.1' } ext { diff --git a/src/main/java/eu/siacs/conversations/services/CallIntegrationConnectionService.java b/src/main/java/eu/siacs/conversations/services/CallIntegrationConnectionService.java index e86f6c4f8..ce4d9fb8a 100644 --- a/src/main/java/eu/siacs/conversations/services/CallIntegrationConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/CallIntegrationConnectionService.java @@ -357,6 +357,7 @@ public class CallIntegrationConnectionService extends ConnectionService { try { service.getSystemService(TelecomManager.class).placeCall(address, extras); } catch (final SecurityException e) { + Log.e(Config.LOGTAG, "call integration not available", e); Toast.makeText(service, R.string.call_integration_not_available, Toast.LENGTH_LONG) .show(); } diff --git a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java b/src/main/java/eu/siacs/conversations/ui/AboutPreference.java index f2cd1e348..acfa0be8c 100644 --- a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java +++ b/src/main/java/eu/siacs/conversations/ui/AboutPreference.java @@ -2,26 +2,28 @@ package eu.siacs.conversations.ui; import android.content.Context; import android.content.Intent; +import android.os.Build; import android.preference.Preference; import android.util.AttributeSet; +import com.google.common.base.Strings; + import eu.siacs.conversations.BuildConfig; import eu.siacs.conversations.R; -import eu.siacs.conversations.utils.PhoneHelper; public class AboutPreference extends Preference { - public AboutPreference(final Context context, final AttributeSet attrs, final int defStyle) { - super(context, attrs, defStyle); + public AboutPreference(final Context context, final AttributeSet attrs, final int defStyle) { + super(context, attrs, defStyle); setSummaryAndTitle(context); - } + } - public AboutPreference(final Context context, final AttributeSet attrs) { - super(context, attrs); - setSummaryAndTitle(context); - } + public AboutPreference(final Context context, final AttributeSet attrs) { + super(context, attrs); + setSummaryAndTitle(context); + } - private void setSummaryAndTitle(final Context context) { - setSummary(String.format("%s %s", BuildConfig.APP_NAME, BuildConfig.VERSION_NAME)); + private void setSummaryAndTitle(final Context context) { + setSummary(String.format("%s%s %s (%s)", BuildConfig.APP_NAME, BuildConfig.VERSION_NAME, im.conversations.webrtc.BuildConfig.WEBRTC_VERSION, Strings.nullToEmpty(Build.DEVICE))); setTitle(context.getString(R.string.title_activity_about_x, BuildConfig.APP_NAME)); } @@ -32,4 +34,3 @@ public class AboutPreference extends Preference { getContext().startActivity(intent); } } -