Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
e
os
App Lounge
Commits
21f4f282
Commit
21f4f282
authored
Jan 21, 2019
by
Nihar Thakkar
Browse files
Handle changes in API
parent
3659a532
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/io/eelo/appinstaller/api/HomeRequest.kt
View file @
21f4f282
...
...
@@ -6,18 +6,14 @@ import com.fasterxml.jackson.annotation.JsonCreator
import
com.fasterxml.jackson.annotation.JsonProperty
import
com.fasterxml.jackson.databind.ObjectMapper
import
io.eelo.appinstaller.application.model.Application
import
io.eelo.appinstaller.application.model.data.BasicData
import
io.eelo.appinstaller.applicationmanager.ApplicationManager
import
io.eelo.appinstaller.application.model.data.FullData
import
io.eelo.appinstaller.categories.model.Category
import
io.eelo.appinstaller.utils.Error
import
io.eelo.appinstaller.utils.ApplicationParser
import
io.eelo.appinstaller.utils.Common
import
io.eelo.appinstaller.utils.Constants
import
java.io.IOException
import
java.lang.Exception
import
java.net.SocketTimeoutException
import
java.net.URL
import
javax.net.ssl.HttpsURLConnection
class
HomeRequest
{
...
...
@@ -56,20 +52,21 @@ class HomeRequest {
}
class
SubHomeResult
@JsonCreator
constructor
(
@JsonProperty
(
"banner_apps"
)
val
bannerApps
:
Array
<
Full
Data
>)
{
constructor
(
@JsonProperty
(
"banner_apps"
)
val
bannerApps
:
Array
<
Basic
Data
>)
{
val
apps
=
HashMap
<
Category
,
ArrayList
<
Full
Data
>>()
val
apps
=
HashMap
<
Category
,
ArrayList
<
Basic
Data
>>()
@JsonAnySetter
fun
append
(
key
:
String
,
value
:
Any
)
{
val
apps
=
value
as
ArrayList
<
*
>
val
appsData
=
ArrayList
<
Full
Data
>()
val
appsData
=
ArrayList
<
Basic
Data
>()
apps
.
forEach
{
val
data
=
it
as
LinkedHashMap
<
*
,
*
>
val
appData
=
Full
Data
(
val
appData
=
Basic
Data
(
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
?,
...
...
@@ -77,16 +74,8 @@ class HomeRequest {
data
[
"author"
]
as
String
,
data
[
"icon_image_path"
]
as
String
,
(
data
[
"other_images_path"
]
as
List
<
String
>).
toTypedArray
(),
data
[
"category"
]
as
String
,
data
[
"created_on"
]
as
String
,
data
[
"source"
]
as
String
,
data
[
"description"
]
as
String
,
data
[
"app_link"
]
as
String
,
data
[
"licence"
]
as
String
,
null
)
for
(
pair
in
data
)
{
appData
.
jsonCreator
(
pair
.
key
as
String
,
pair
.
value
)
}
data
[
"exodus_score"
].
toString
().
toFloat
(),
BasicData
.
Ratings
(
0f
,
0f
))
appsData
.
add
(
appData
)
}
this
.
apps
[
Category
(
key
)]
=
appsData
...
...
app/src/main/java/io/eelo/appinstaller/api/ListApplicationsRequest.kt
View file @
21f4f282
...
...
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonCreator
import
com.fasterxml.jackson.annotation.JsonProperty
import
com.fasterxml.jackson.databind.ObjectMapper
import
io.eelo.appinstaller.application.model.Application
import
io.eelo.appinstaller.application.model.data.
Full
Data
import
io.eelo.appinstaller.application.model.data.
Basic
Data
import
io.eelo.appinstaller.applicationmanager.ApplicationManager
import
io.eelo.appinstaller.utils.ApplicationParser
import
io.eelo.appinstaller.utils.Common
...
...
@@ -34,7 +34,7 @@ class ListApplicationsRequest(private val category: String, private val page: In
class
ListApplicationsResult
@JsonCreator
constructor
(
@JsonProperty
(
"success"
)
success
:
Boolean
,
@JsonProperty
(
"pages"
)
val
pages
:
Int
,
@JsonProperty
(
"apps"
)
private
val
apps
:
Array
<
Full
Data
>)
{
@JsonProperty
(
"apps"
)
private
val
apps
:
Array
<
Basic
Data
>)
{
fun
getApplications
(
applicationManager
:
ApplicationManager
,
context
:
Context
):
ArrayList
<
Application
>
{
return
ApplicationParser
.
parseToApps
(
applicationManager
,
context
,
apps
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment