Merge branch 'ignore_unused_fields' into 'master' (480fc25d) · Commits · e / os / App Lounge

app/build.gradle

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,8 +10,8 @@ android {
		applicationId "foundation.e.apps"
		minSdkVersion 21
		targetSdkVersion 27
		versionCode 8
		versionName "1.1.5"
		versionCode 9
		versionName "1.1.6"
		testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
		}
		buildTypes {

app/src/main/java/foundation/e/apps/api/AppDetailRequest.kt

+3 −6

Original line number	Diff line number	Diff line
		@@ -18,9 +18,7 @@
		package foundation.e.apps.api

		import com.fasterxml.jackson.annotation.JsonCreator
		import com.fasterxml.jackson.annotation.JsonIgnoreProperties
		import com.fasterxml.jackson.annotation.JsonProperty
		import com.fasterxml.jackson.databind.ObjectMapper
		import foundation.e.apps.application.model.data.FullData
		import foundation.e.apps.utils.Common
		import foundation.e.apps.utils.Constants
		@@ -29,7 +27,7 @@ import foundation.e.apps.utils.Error
		class AppDetailRequest(private val id: String) {

		companion object {
		private val reader = ObjectMapper().readerFor(Result::class.java)
		private val reader = Common.getObjectMapper().readerFor(Result::class.java)
		}

		fun request(callback: (Error?, FullData?) -> Unit) {
		@@ -44,7 +42,6 @@ class AppDetailRequest(private val id: String) {
		}
		}

		class Result @JsonCreator @JsonIgnoreProperties(ignoreUnknown = true)
		constructor(@JsonProperty("app") val app: FullData,
		@JsonProperty("success") private val success: Boolean)
		class Result @JsonCreator
		constructor(@JsonProperty("app") val app: FullData)
		}

app/src/main/java/foundation/e/apps/api/AppDownloadedRequest.kt

+2 −4

Original line number	Diff line number	Diff line
		@@ -18,14 +18,12 @@
		package foundation.e.apps.api

		import com.fasterxml.jackson.annotation.JsonCreator
		import com.fasterxml.jackson.annotation.JsonIgnoreProperties
		import com.fasterxml.jackson.databind.ObjectMapper
		import foundation.e.apps.utils.Common
		import foundation.e.apps.utils.Constants

		class AppDownloadedRequest(private val id: String) {
		companion object {
		private val reader = ObjectMapper().readerFor(Result::class.java)
		private val reader = Common.getObjectMapper().readerFor(Result::class.java)
		}

		fun request() {
		@@ -39,6 +37,6 @@ class AppDownloadedRequest(private val id: String) {
		}
		}

		class Result @JsonCreator @JsonIgnoreProperties(ignoreUnknown = true)
		class Result @JsonCreator
		constructor()
		}

app/src/main/java/foundation/e/apps/api/HomeRequest.kt

+4 −8

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ import java.lang.Exception
		class HomeRequest {

		companion object {
		private val reader = ObjectMapper().readerFor(HomeResult::class.java)
		private val reader = Common.getObjectMapper().readerFor(HomeResult::class.java)
		}

		fun request(callback: (Error?, HomeResult?) -> Unit) {
		@@ -51,9 +51,8 @@ class HomeRequest {
		}
		}

		class HomeResult @JsonCreator @JsonIgnoreProperties(ignoreUnknown = true)
		constructor(@JsonProperty("success") private val success: Boolean,
		@JsonProperty("home") private val home: SubHomeResult) {
		class HomeResult @JsonCreator
		constructor(@JsonProperty("home") private val home: SubHomeResult) {

		fun getBannerApps(applicationManager: ApplicationManager, context: Context): ArrayList<Application> {
		return ApplicationParser.parseToApps(applicationManager, context, home.bannerApps)
		@@ -69,7 +68,7 @@ class HomeRequest {

		}

		class SubHomeResult @JsonCreator @JsonIgnoreProperties(ignoreUnknown = true) constructor() {
		class SubHomeResult @JsonCreator constructor() {
		val apps = LinkedHashMap<Category, ArrayList<BasicData>>()
		lateinit var bannerApps: Array<BasicData>

		@@ -83,9 +82,6 @@ class HomeRequest {
		data["package_name"] as String,
		data["_id"] as String,
		data["name"] as String,
		0f,
		data["last_modified"] as String,
		data["latest_version"] as String,
		data["latest_version_number"] as String?,
		data["latest_downloaded_version"].toString(),
		data["author"] as String,

app/src/main/java/foundation/e/apps/api/ListApplicationsRequest.kt

+3 −7

Original line number	Diff line number	Diff line
		@@ -19,9 +19,7 @@ package foundation.e.apps.api

		import android.content.Context
		import com.fasterxml.jackson.annotation.JsonCreator
		import com.fasterxml.jackson.annotation.JsonIgnoreProperties
		import com.fasterxml.jackson.annotation.JsonProperty
		import com.fasterxml.jackson.databind.ObjectMapper
		import foundation.e.apps.application.model.Application
		import foundation.e.apps.application.model.data.BasicData
		import foundation.e.apps.applicationmanager.ApplicationManager
		@@ -34,7 +32,7 @@ import java.net.URLEncoder
		class ListApplicationsRequest(private val category: String, private val page: Int, private val resultsPerPage: Int) {

		companion object {
		private val reader = ObjectMapper().readerFor(ListApplicationsResult::class.java)
		private val reader = Common.getObjectMapper().readerFor(ListApplicationsResult::class.java)
		}

		fun request(callback: (Error?, ListApplicationsResult?) -> Unit) {
		@@ -49,10 +47,8 @@ class ListApplicationsRequest(private val category: String, private val page: In
		}
		}

		class ListApplicationsResult @JsonCreator @JsonIgnoreProperties(ignoreUnknown = true)
		constructor(@JsonProperty("success") success: Boolean,
		@JsonProperty("pages") val pages: Int,
		@JsonProperty("apps") private val apps: Array<BasicData>) {
		class ListApplicationsResult @JsonCreator
		constructor(@JsonProperty("apps") private val apps: Array<BasicData>) {

		fun getApplications(applicationManager: ApplicationManager, context: Context): ArrayList<Application> {
		return ApplicationParser.parseToApps(applicationManager, context, apps)