Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
linphone-android
Commits
5ebb4ee6
Commit
5ebb4ee6
authored
5 months ago
by
Sylvain Berfini
Browse files
Options
Download
Patches
Plain Diff
Updated AGP, trying to fix crash due to disabled crashlytics with latest changes
parent
a9d11543
master
feature/show_unsecure_conversation_event_at_top
feature/use_theme_main_color_for_icon_and_splashscreen
fix/insistent_notification
fix/restore_previous_release_ringtone_player
fix/telecom_default_audio_endpoint
release/6.0
6.1.0-alpha
6.0.0
6.0.0-beta
1 merge request
!1536
Updated AGP, trying to fix crash due to disabled crashlytics with latest changes
Pipeline
#83675
passed with stages
in 19 minutes and 35 seconds
Changes
4
Pipelines
7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci-files/job-android.yml
+1
-0
.gitlab-ci-files/job-android.yml
app/build.gradle.kts
+7
-17
app/build.gradle.kts
app/src/main/java/org/linphone/core/CoreContext.kt
+10
-3
app/src/main/java/org/linphone/core/CoreContext.kt
gradle/libs.versions.toml
+2
-2
gradle/libs.versions.toml
with
20 additions
and
22 deletions
.gitlab-ci-files/job-android.yml
+
1
−
0
View file @
5ebb4ee6
...
...
@@ -18,6 +18,7 @@ job-android:
-
echo keyAlias=$ANDROID_KEYSTORE_KEY_ALIAS >> keystore.properties
-
echo storeFile=$ANDROID_KEYSTORE_FILE >> keystore.properties
-
./gradlew app:dependencies | grep org.linphone
-
./gradlew clean
-
./gradlew assembleDebug
-
./gradlew assembleRelease
...
...
This diff is collapsed.
Click to expand it.
app/build.gradle.kts
+
7
−
17
View file @
5ebb4ee6
import
com.android.build.gradle.internal.tasks.factory.dependsOn
import
com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
import
com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsPlugin
import
com.google.gms.googleservices.GoogleServicesPlugin
import
java.io.ByteArrayOutputStream
import
java.io.FileInputStream
...
...
@@ -12,8 +11,7 @@ plugins {
alias
(
libs
.
plugins
.
ktlint
)
alias
(
libs
.
plugins
.
jetbrainsKotlinAndroid
)
alias
(
libs
.
plugins
.
navigation
)
alias
(
libs
.
plugins
.
googleGmsServices
)
apply
false
alias
(
libs
.
plugins
.
crashlytics
)
apply
false
alias
(
libs
.
plugins
.
crashlytics
)
}
val
packageName
=
"org.linphone"
...
...
@@ -32,12 +30,6 @@ if (firebaseCloudMessagingAvailable) {
}
else
{
println
(
"google-services.json not found, disabling CloudMessaging feature"
)
}
if
(
crashlyticsAvailable
)
{
println
(
"google-services.json, libs & libs-debug found, enabling Crashlytics feature"
)
apply
<
CrashlyticsPlugin
>()
}
else
{
println
(
"google-services.json, libs & libs-debug not found, disabling Crashlytics feature"
)
}
var
gitBranch
=
ByteArrayOutputStream
()
var
gitVersion
=
"6.0.0"
...
...
@@ -163,14 +155,13 @@ android {
resValue
(
"string"
,
"linphone_app_branch"
,
gitBranch
.
toString
().
trim
())
if
(
crashlyticsAvailable
)
{
val
path
=
File
(
"$sdkPath/libs-debug/"
).
toString
()
configure
<
CrashlyticsExtension
>
{
nativeSymbolUploadEnabled
=
true
unstrippedNativeLibsDir
=
File
(
"$sdkPath/libs-debug/"
).
toString
()
unstrippedNativeLibsDir
=
path
}
resValue
(
"bool"
,
"crashlytics_enabled"
,
"true"
)
}
else
{
resValue
(
"bool"
,
"crashlytics_enabled"
,
"false"
)
}
buildConfigField
(
"Boolean"
,
"CRASHLYTICS_ENABLED"
,
crashlyticsAvailable
.
toString
())
}
getByName
(
"release"
)
{
...
...
@@ -186,14 +177,13 @@ android {
resValue
(
"string"
,
"linphone_app_branch"
,
gitBranch
.
toString
().
trim
())
if
(
crashlyticsAvailable
)
{
val
path
=
File
(
"$sdkPath/libs-debug/"
).
toString
()
configure
<
CrashlyticsExtension
>
{
nativeSymbolUploadEnabled
=
true
unstrippedNativeLibsDir
=
File
(
"$sdkPath/libs-debug/"
).
toString
()
unstrippedNativeLibsDir
=
path
}
resValue
(
"bool"
,
"crashlytics_enabled"
,
"true"
)
}
else
{
resValue
(
"bool"
,
"crashlytics_enabled"
,
"false"
)
}
buildConfigField
(
"Boolean"
,
"CRASHLYTICS_ENABLED"
,
crashlyticsAvailable
.
toString
())
}
}
...
...
This diff is collapsed.
Click to expand it.
app/src/main/java/org/linphone/core/CoreContext.kt
+
10
−
3
View file @
5ebb4ee6
...
...
@@ -375,9 +375,16 @@ class CoreContext @UiThread constructor(val context: Context) : HandlerThread("C
Log
.
i
(
"$TAG Creating Core"
)
Looper
.
prepare
()
if
(
context
.
resources
.
getBoolean
(
org
.
linphone
.
R
.
bool
.
crashlytics_enabled
))
{
Factory
.
instance
().
loggingService
.
addListener
(
loggingServiceListener
)
Log
.
i
(
"$TAG Crashlytics enabled, register logging service listener"
)
if
(
BuildConfig
.
CRASHLYTICS_ENABLED
)
{
Log
.
i
(
"$TAG Crashlytics is enabled, registering logging service listener"
)
try
{
FirebaseCrashlytics
.
getInstance
()
Factory
.
instance
().
loggingService
.
addListener
(
loggingServiceListener
)
}
catch
(
e
:
Exception
)
{
Log
.
e
(
"$TAG Failed to instantiate Crashlytics: $e"
)
}
}
else
{
Log
.
i
(
"$TAG Crashlytics is disabled"
)
}
Log
.
i
(
"========================================="
)
Log
.
i
(
"==== Linphone-android information dump ===="
)
...
...
This diff is collapsed.
Click to expand it.
gradle/libs.versions.toml
+
2
−
2
View file @
5ebb4ee6
[versions]
agp
=
"8.
5.2
"
kotlin
=
"
1.9
.2
3
"
agp
=
"8.
6.1
"
kotlin
=
"
2.0
.2
0
"
gmsGoogleServices
=
"4.4.2"
firebaseCrashlytics
=
"3.0.2"
firebaseBomVersion
=
"33.3.0"
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets