Merge branch 'sprint_cordoba' into 'master' (91ae722c) · Commits · e / os / Message

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ build:
		stage: build
		script:
		- \|
		./gradlew build
		./gradlew assemble
		retval=$?
		if [$retval -ne 0]; then
		echo "error on building, exit code: "$retval

.travis.yml

+9 −9

Original line number	Diff line number	Diff line
		@@ -9,12 +9,12 @@ notifications:

		env:
		global:
		- COMPILE_API_LEVEL=27
		- COMPILE_API_LEVEL=29
		- EMULATOR_API_LEVEL=24 # It seems emulator levels 25,26,27 from main repos have google_apis by default, and do not support armeabi-v7a. Check commit comment.
		- EMULATOR_TAG=default # Possible values are default, google_apis, android-tv, android-wear, android-wear-cn
		- EMULATOR_ABI=armeabi-v7a # Default is armeabi-v7a, possible options are: x86, x86_64, mips, arm64-v8a, armeabi-v7a. Note: check commit comment
		- EMULATOR_NAME=qksms3
		- ANDROID_BUILD_TOOLS_VERSION=27.0.2 # Match build-tools version used in build.gradle
		- ANDROID_BUILD_TOOLS_VERSION=29.0.2 # Match build-tools version used in build.gradle
		- EMULATOR="system-images;android-${EMULATOR_API_LEVEL};${EMULATOR_TAG};${EMULATOR_ABI}" # Used to install/create emulator

		android:
		@@ -36,8 +36,9 @@ android:

		# Set up Android-sdk and the emulator
		before_install:
		# Decrypt keystore
		- openssl aes-256-cbc -K $encrypted_4d1d940e2c65_key -iv $encrypted_4d1d940e2c65_iv -in keystore.enc -out keystore -d
		# Decrypt keystore and google-services.json
		- openssl aes-256-cbc -K $encrypted_4d1d940e2c65_key -iv $encrypted_4d1d940e2c65_iv -in secrets.tar.enc -out secrets.tar -d
		- tar xvf secrets.tar

		- echo 'count=0' > /home/travis/.android/repositories.cfg # Avoid warning
		- ls -lar $HOME/*/
		@@ -75,7 +76,7 @@ before_script:
		# Build APK
		script:
		- \|
		./gradlew :presentation:assembleWithAnalyticsRelease assembleAndroidTest -PtestCoverageEnabled='true'
		./gradlew :presentation:assembleWithAnalyticsRelease :presentation:bundleWithAnalyticsRelease assembleAndroidTest -PtestCoverageEnabled='true'
		retval=$?
		if [$retval -ne 0]; then
		echo "error on assembling, exit code: "$retval
		@@ -90,9 +91,8 @@ deploy:
		api_key:
		secure: XF7V/I02gpyOzCAFXEFyrThXVUUnKjSaWQ8lppO50mVtdugimjWIPtHrcYASaJQf9INhqo0lamk+khPxtKxc1BSCp8o+c22UKcpczyjD4kK27a3zKfuNQWteBRjCH34vIGnrRFSHSWYLIgeuoIK3q5Lq4IBK/Od3mfpRaDt1ER+IqMzR3L205x1H8dW3MVuxXgdnq3jHlRpq86oOe293+dnblVCtWUvAzwhZPnnbBc4JUaNomMI7dLJ/pAigByCoHHmG9pc2Cky1yyWVAnTZFAlf2PbzPDLRRnXmHuYKfHxiZgd/l8JTiZdhky9cXgFoSxvJyDABRqqLxVNfXt2ZwgdtiulZml8RB1FB0L37qL72mxWgi6y9IbQgt/FG20K2QpSBglk0bCGLS+h5Yz3kV4fhsBY7llpWGw14BvlAx9sUfl3Ej+IUsWoJgA00TFNGDG8sMyOFoCQVz/sB4Dv4h+JfynJZcmm8okcfYrWBHOoHY7cH3chBWp/2A736f2A/aqnBd6z8a03toe2ILC9eSOiIhrVxPyqLmEKBD1rCduVFNteqGwm9G9YwKpvFibTqu0gqEtfF7cmuMH6M5PYExI5EzoewZTYmgp02+lBuFAEMvycVvXcu8VfeeT6cgeLlmz2hsbo93UfoSQyP+gSojMOOkVUsl6mIp1STLiJ5IRY=
		file:
		- /home/travis/build/moezbhatti/qksms/presentation/build/outputs/apk/withAnalytics/release/presentation-withAnalytics-arm64-v8a-release.apk
		- /home/travis/build/moezbhatti/qksms/presentation/build/outputs/apk/withAnalytics/release/presentation-withAnalytics-armeabi-v7a-release.apk
		- /home/travis/build/moezbhatti/qksms/presentation/build/outputs/apk/withAnalytics/release/presentation-withAnalytics-universal-release.apk
		- /home/travis/build/moezbhatti/qksms/presentation/build/outputs/bundle/withAnalyticsRelease/presentation.aab
		- /home/travis/build/moezbhatti/qksms/presentation/build/outputs/apk/withAnalytics/release/presentation-withAnalytics-release.apk
		on:
		repo: moezbhatti/qksms
		tags: true
		No newline at end of file

android-smsmms/build.gradle

+0 −1

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

		dependencies {
		implementation "com.jakewharton.timber:timber:$timber_version"
		implementation 'com.klinkerapps:logger:1.0.3'
		implementation 'com.squareup.okhttp:okhttp:2.5.0'
		implementation 'com.squareup.okhttp:okhttp-urlconnection:2.5.0'
		implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

android-smsmms/src/main/java/android/database/sqlite/SqliteWrapper.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -23,15 +23,14 @@ import android.content.Context;
		import android.database.Cursor;
		import android.net.Uri;
		import android.widget.Toast;
		import com.klinker.android.logger.Log;
		import org.jetbrains.annotations.Nullable;
		import timber.log.Timber;

		/**
		* @hide
		*/

		public final class SqliteWrapper {
		private static final String TAG = "SqliteWrapper";
		private static final String SQLITE_EXCEPTION_DETAIL_MESSAGE
		= "unable to open database file";

		@@ -59,7 +58,7 @@ public final class SqliteWrapper {
		try {
		return resolver.query(uri, projection, selection, selectionArgs, sortOrder);
		} catch (SQLiteException e) {
		Log.e(TAG, "Catch a SQLiteException when query: ", e);
		Timber.e(e, "Catch a SQLiteException when query: ");
		checkSQLiteException(context, e);
		return null;
		}
		@@ -70,7 +69,7 @@ public final class SqliteWrapper {
		try {
		return resolver.update(uri, values, where, selectionArgs);
		} catch (SQLiteException e) {
		Log.e(TAG, "Catch a SQLiteException when update: ", e);
		Timber.e(e, "Catch a SQLiteException when update: ");
		checkSQLiteException(context, e);
		return -1;
		}
		@@ -81,7 +80,7 @@ public final class SqliteWrapper {
		try {
		return resolver.delete(uri, where, selectionArgs);
		} catch (SQLiteException e) {
		Log.e(TAG, "Catch a SQLiteException when delete: ", e);
		Timber.e(e, "Catch a SQLiteException when delete: ");
		checkSQLiteException(context, e);
		return -1;
		}
		@@ -92,7 +91,7 @@ public final class SqliteWrapper {
		try {
		return resolver.insert(uri, values);
		} catch (SQLiteException e) {
		Log.e(TAG, "Catch a SQLiteException when insert: ", e);
		Timber.e(e, "Catch a SQLiteException when insert: ");
		checkSQLiteException(context, e);
		return null;
		}

android-smsmms/src/main/java/android/net/DhcpInfoInternal.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		package android.net;

		import android.text.TextUtils;
		import com.klinker.android.logger.Log;
		import timber.log.Timber;

		import java.net.Inet4Address;
		import java.net.InetAddress;
		@@ -32,7 +32,6 @@ import java.util.Collections;
		* @hide
		*/
		public class DhcpInfoInternal {
		private final static String TAG = "DhcpInfoInternal";
		public String ipAddress;
		public int prefixLength;

		@@ -96,7 +95,7 @@ public class DhcpInfoInternal {

		public LinkAddress makeLinkAddress() {
		if (TextUtils.isEmpty(ipAddress)) {
		Log.e(TAG, "makeLinkAddress with empty ipAddress");
		Timber.e("makeLinkAddress with empty ipAddress");
		return null;
		}
		return new LinkAddress(NetworkUtilsHelper.numericToInetAddress(ipAddress), prefixLength);
		@@ -112,12 +111,12 @@ public class DhcpInfoInternal {
		if (TextUtils.isEmpty(dns1) == false) {
		p.addDns(NetworkUtilsHelper.numericToInetAddress(dns1));
		} else {
		Log.d(TAG, "makeLinkProperties with empty dns1!");
		Timber.d("makeLinkProperties with empty dns1!");
		}
		if (TextUtils.isEmpty(dns2) == false) {
		p.addDns(NetworkUtilsHelper.numericToInetAddress(dns2));
		} else {
		Log.d(TAG, "makeLinkProperties with empty dns2!");
		Timber.d("makeLinkProperties with empty dns2!");
		}
		return p;
		}