Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved information in about page

Browse source
This commit is contained in:
Sylvain Berfini 2021-02-03 15:27:55 +01:00
parent dcee88826d
commit 337236da4c
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/build.gradle
View file

@ -15,6 +15,7 @@ static def firebaseEnabled() {
return googleFile.exists()
}
def gitBranch = new ByteArrayOutputStream()
task getGitVersion() {
def gitVersion = "5.0.0"
def gitVersionStream = new ByteArrayOutputStream()
@ -34,6 +35,10 @@ task getGitVersion() {
executable "git" args "rev-parse", "--short", "HEAD"
standardOutput = gitCommitHash
}
exec {
executable "git" args "name-rev", "--name-only", "HEAD"
standardOutput = gitBranch
}
if (gitCommitsCount.toString().toInteger() == 0) {
gitVersion = gitVersionStream.toString().trim()
@ -123,6 +128,7 @@ android {
signingConfig signingConfigs.release
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
resValue "string", "linphone_app_branch", gitBranch.toString().trim()
resValue "string", "sync_account_type", getPackageName() + ".sync"
resValue "string", "file_provider", getPackageName() + ".fileprovider"
resValue "string", "linphone_address_mime_type", "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address"
@ -142,6 +148,7 @@ android {
debuggable true
jniDebuggable true
resValue "string", "linphone_app_branch", gitBranch.toString().trim()
resValue "string", "sync_account_type", getPackageName() + ".sync"
resValue "string", "file_provider", getPackageName() + ".debug.fileprovider"
resValue "string", "linphone_address_mime_type", "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address"
@ -186,8 +193,8 @@ dependencies {
implementation 'androidx.media:media:1.2.0'
implementation 'androidx.fragment:fragment-ktx:1.2.5'
implementation 'androidx.core:core-ktx:1.5.0-beta01'
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.3'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.3'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'

8
app/src/main/java/org/linphone/core/CoreContext.kt
View file

@ -55,13 +55,17 @@ class CoreContext(val context: Context, coreConfig: Config) {
val handler: Handler = Handler(Looper.getMainLooper())
val appVersion: String by lazy {
"${org.linphone.BuildConfig.VERSION_NAME} (${org.linphone.BuildConfig.BUILD_TYPE})"
val appVersion = org.linphone.BuildConfig.VERSION_NAME
val appBranch = context.getString(R.string.linphone_app_branch)
val appBuildType = org.linphone.BuildConfig.BUILD_TYPE
"$appVersion ($appBranch, $appBuildType)"
}
val sdkVersion: String by lazy {
val sdkVersion = context.getString(R.string.linphone_sdk_version)
val sdkBranch = context.getString(R.string.linphone_sdk_branch)
"$sdkVersion ($sdkBranch)"
val sdkBuildType = org.linphone.core.BuildConfig.BUILD_TYPE
"$sdkVersion ($sdkBranch, $sdkBuildType)"
}
val contactsManager: ContactsManager by lazy {