Merge branch 'dev' into 'master' (a4724552) · Commits · e / os / Message

.gitlab-ci.yml

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:latest"

		stages:
		- build

		before_script:
		- export GRADLE_USER_HOME=$(pwd)/.gradle
		- chmod +x ./gradlew
		- ./gradlew clean

		cache:
		key: ${CI_PROJECT_ID}
		paths:
		- .gradle/

		build:
		stage: build
		script:
		- \|
		./gradlew build
		retval=$?
		if [$retval -ne 0]; then
		echo "error on building, exit code: "$retval
		exit $retval
		fi
		artifacts:
		paths:
		- presentation/build/outputs/apk

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		© Moez Bhatti 2014-2019
		© ECORP SAS 2019 - Author: Romain Hunault
		© eFoundation 2019 - Author: Amit Kumar
		No newline at end of file

+0 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ android {
		}

		dependencies {
		implementation "androidx.core:core-ktx:$androidx_core_version"
		implementation "com.jakewharton.timber:timber:$timber_version"
		implementation 'com.klinkerapps:logger:1.0.3'
		implementation 'com.squareup.okhttp:okhttp:2.5.0'

+7 −4

Original line number	Diff line number	Diff line
		@@ -21,8 +21,8 @@ import android.content.ContentResolver
		import android.content.Context
		import android.content.Intent
		import android.net.Uri
		import android.os.Bundle
		import android.telephony.SmsManager
		import androidx.core.os.bundleOf
		import com.android.mms.MmsConfig
		import com.android.mms.dom.smil.parser.SmilXmlSerializer
		import com.android.mms.util.DownloadManager
		@@ -122,9 +122,12 @@ class Transaction @JvmOverloads constructor(private val context: Context, settin
		null
		}

		val configOverrides = bundleOf(
		Pair(SmsManager.MMS_CONFIG_GROUP_MMS_ENABLED, true),
		Pair(SmsManager.MMS_CONFIG_MAX_MESSAGE_SIZE, MmsConfig.getMaxMessageSize()))

		// Removed android-ktx bundleOf() function because android-ktx cause build failure with sdk 25
		// TODO: Either use android-ktx or write own bundleOf() function.
		val configOverrides = Bundle()
		configOverrides.putBoolean(SmsManager.MMS_CONFIG_GROUP_MMS_ENABLED, true)
		configOverrides.putInt(SmsManager.MMS_CONFIG_MAX_MESSAGE_SIZE, MmsConfig.getMaxMessageSize())

		MmsConfig.getHttpParams()
		?.takeIf { it.isNotEmpty() }

+8 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,14 @@ allprojects {
		}
		}

		subprojects {
		tasks.whenTaskAdded { task ->
		if (task.name.equals("lint")) {
		task.enabled = false
		}
		}
		}

		task clean(type: Delete) {
		delete rootProject.buildDir
		}