Skip to content

Commit

Permalink
[FIX] "is_superuser" becoming null on Odoo 10
Browse files Browse the repository at this point in the history
  • Loading branch information
Kasim Rangwala committed Mar 24, 2019
1 parent 1aa9967 commit c034a27
Show file tree
Hide file tree
Showing 59 changed files with 213 additions and 188 deletions.
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
Binary file removed Odoo.JsonRpc.Client.1.041.apk
Binary file not shown.
Binary file added Odoo.JsonRpc.Client.1.042.apk
Binary file not shown.
15 changes: 7 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ android {
applicationId "io.gripxtech.odoojsonrpcclient"
minSdkVersion 17
targetSdkVersion 28
versionCode 6
versionName "1.041"
versionCode 7
versionName "1.042"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true

Expand Down Expand Up @@ -60,12 +60,11 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
implementation 'com.google.android.material:material:1.1.0-alpha03'
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha02'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.preference:preference-ktx:1.1.0-alpha03'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.preference:preference-ktx:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.multidex:multidex:2.0.1'
implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
Expand Down
30 changes: 15 additions & 15 deletions app/src/main/java/io/gripxtech/odoojsonrpcclient/core/OdooUser.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ import io.gripxtech.odoojsonrpcclient.GlideApp
import io.gripxtech.odoojsonrpcclient.core.utils.Retrofit2Helper

data class OdooUser(
val protocol: Retrofit2Helper.Companion.Protocol = Retrofit2Helper.Companion.Protocol.HTTP,
val host: String = "",
val login: String = "",
val password: String = "",
val database: String = "",
val serverVersion: String = "",
val isAdmin: Boolean = false,
val isSuperUser: Boolean = false,
val id: Int = 0,
val name: String = "",
val imageSmall: String = "",
val partnerId: Int = 0,
val context: JsonObject = JsonObject(),
val isActive: Boolean = false,
val account: Account = Account("false", App.KEY_ACCOUNT_TYPE)
var protocol: Retrofit2Helper.Companion.Protocol = Retrofit2Helper.Companion.Protocol.HTTP,
var host: String = "",
var login: String = "",
var password: String = "",
var database: String = "",
var serverVersion: String = "",
var isAdmin: Boolean = false,
var isSuperUser: Boolean = false,
var id: Int = 0,
var name: String = "",
var imageSmall: String = "",
var partnerId: Int = 0,
var context: JsonObject = JsonObject(),
var isActive: Boolean = false,
var account: Account = Account("false", App.KEY_ACCOUNT_TYPE)
) {
val androidName: String
get() = "$login[$database]"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import io.gripxtech.odoojsonrpcclient.toJsonElement
import io.gripxtech.odoojsonrpcclient.toStringList

data class Many2One(
private val jsonElement: JsonElement
private var jsonElement: JsonElement
) : Parcelable {
val isManyToOne: Boolean
get() = jsonElement.isJsonArray && jsonElement.asJsonArray.size() == 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ data class ListDb(

@field:Expose
@field:SerializedName("result")
val result: List<String> = listOf(),
var result: List<String> = listOf(),

@field:Expose
@field:SerializedName("error")
val odooError: OdooError = OdooError()
var odooError: OdooError = OdooError()
) {
val isSuccessful get() = !isOdooError
val isOdooError get() = odooError.message.isNotEmpty()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ data class ListDbReqBody(

@Expose
@SerializedName("id")
val id: String = "0",
var id: String = "0",

@Expose
@SerializedName("jsonrpc")
val jsonRPC: String = "2.0",
var jsonRPC: String = "2.0",

@Expose
@SerializedName("method")
val method: String = "call",
var method: String = "call",

@Expose
@SerializedName("params")
val params: JsonObject = JsonObject()
var params: JsonObject = JsonObject()
)
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ data class CallKw(

@field:Expose
@field:SerializedName("result")
val result: JsonElement = JsonObject(),
var result: JsonElement = JsonObject(),

@field:Expose
@field:SerializedName("error")
val odooError: OdooError = OdooError()
var odooError: OdooError = OdooError()

) {
val isSuccessful get() = !isOdooError
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ import com.google.gson.annotations.SerializedName
data class CallKwParams(
@field:Expose
@field:SerializedName("model")
val model: String = "",
var model: String = "",

@field:Expose
@field:SerializedName("method")
val method: String = "",
var method: String = "",

@field:Expose
@field:SerializedName("args")
val args: List<Any> = listOf(),
var args: List<Any> = listOf(),

@field:Expose
@field:SerializedName("kwargs")
val kwArgs: Map<String, Any> = mapOf(),
var kwArgs: Map<String, Any> = mapOf(),

@field:Expose
@field:SerializedName("context")
val context: JsonObject = JsonObject()
var context: JsonObject = JsonObject()
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ data class CallKwReqBody(

@field:Expose
@field:SerializedName("id")
val id: String = "0",
var id: String = "0",

@field:Expose
@field:SerializedName("jsonrpc")
val jsonRPC: String = "2.0",
var jsonRPC: String = "2.0",

@field:Expose
@field:SerializedName("method")
val method: String = "call",
var method: String = "call",

@field:Expose
@field:SerializedName("params")
val params: CallKwParams = CallKwParams()
var params: CallKwParams = CallKwParams()
)
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ data class ExecWorkflow(

@field:Expose
@field:SerializedName("result")
val result: JsonObject = JsonObject(),
var result: JsonObject = JsonObject(),

@field:Expose
@field:SerializedName("error")
val odooError: OdooError = OdooError()
var odooError: OdooError = OdooError()
) {
val isSuccessful get() = !isOdooError
val isOdooError get() = odooError.message.isNotEmpty()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ import com.google.gson.annotations.SerializedName
data class ExecWorkflowParams(
@field:Expose
@field:SerializedName("model")
val model: String = "",
var model: String = "",

@field:Expose
@field:SerializedName("id")
val id: Int = 0,
var id: Int = 0,

@field:Expose
@field:SerializedName("signal")
val signal: String = "",
var signal: String = "",

@field:Expose
@field:SerializedName("context")
val context: JsonObject = JsonObject()
var context: JsonObject = JsonObject()
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ data class ExecWorkflowReqBody(

@field:Expose
@field:SerializedName("id")
val id: String = "0",
var id: String = "0",

@field:Expose
@field:SerializedName("jsonrpc")
val jsonRPC: String = "2.0",
var jsonRPC: String = "2.0",

@field:Expose
@field:SerializedName("method")
val method: String = "call",
var method: String = "call",

@field:Expose
@field:SerializedName("params")
val params: ExecWorkflowParams = ExecWorkflowParams()
var params: ExecWorkflowParams = ExecWorkflowParams()
)
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ data class Load(

@field:Expose
@field:SerializedName("result")
val result: LoadResult = LoadResult(),
var result: LoadResult = LoadResult(),

@field:Expose
@field:SerializedName("error")
val odooError: OdooError = OdooError()
var odooError: OdooError = OdooError()

) {
val isSuccessful get() = !isOdooError
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ import com.google.gson.annotations.SerializedName
data class LoadParams(
@field:Expose
@field:SerializedName("id")
val id: Int = 0,
var id: Int = 0,

@field:Expose
@field:SerializedName("model")
val model: String = "",
var model: String = "",

@field:Expose
@field:SerializedName("fields")
val fields: List<String> = listOf(),
var fields: List<String> = listOf(),

@field:Expose
@field:SerializedName("context")
val context: JsonObject = JsonObject()
var context: JsonObject = JsonObject()
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ data class LoadReqBody(

@field:Expose
@field:SerializedName("id")
val id: String = "0",
var id: String = "0",

@field:Expose
@field:SerializedName("jsonrpc")
val jsonRPC: String = "2.0",
var jsonRPC: String = "2.0",

@field:Expose
@field:SerializedName("method")
val method: String = "call",
var method: String = "call",

@field:Expose
@field:SerializedName("params")
val params: LoadParams = LoadParams()
var params: LoadParams = LoadParams()

)
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ data class LoadResult(

@field:Expose
@field:SerializedName("value")
val value: JsonObject = JsonObject()
var value: JsonObject = JsonObject()
)
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ data class SearchRead(

@field:Expose
@field:SerializedName("result")
val result: SearchReadResult = SearchReadResult(),
var result: SearchReadResult = SearchReadResult(),

@field:Expose
@field:SerializedName("error")
val odooError: OdooError = OdooError()
var odooError: OdooError = OdooError()
) {
val isSuccessful get() = !isOdooError
val isOdooError get() = odooError.message.isNotEmpty()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,29 @@ data class SearchReadParams(

@field:Expose
@field:SerializedName("model")
val model: String = "",
var model: String = "",

@field:Expose
@field:SerializedName("fields")
val fields: List<String> = listOf(),
var fields: List<String> = listOf(),

@field:Expose
@field:SerializedName("domain")
val domain: List<Any> = listOf(),
var domain: List<Any> = listOf(),

@field:Expose
@field:SerializedName("offset")
val offset: Int = 0,
var offset: Int = 0,

@field:Expose
@field:SerializedName("limit")
val limit: Int = 0,
var limit: Int = 0,

@field:Expose
@field:SerializedName("sort")
val sort: String = "",
var sort: String = "",

@field:Expose
@field:SerializedName("context")
val context: JsonObject = JsonObject()
var context: JsonObject = JsonObject()
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ data class SearchReadReqBody(

@field:Expose
@field:SerializedName("id")
val id: String = "0",
var id: String = "0",

@field:Expose
@field:SerializedName("jsonrpc")
val jsonRPC: String = "2.0",
var jsonRPC: String = "2.0",

@field:Expose
@field:SerializedName("method")
val method: String = "call",
var method: String = "call",

@field:Expose
@field:SerializedName("params")
val params: SearchReadParams = SearchReadParams()
var params: SearchReadParams = SearchReadParams()
)
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ data class SearchReadResult(

@field:Expose
@field:SerializedName("records")
val records: JsonArray = JsonArray(),
var records: JsonArray = JsonArray(),

@field:Expose
@field:SerializedName("length")
val length: Int = 0
var length: Int = 0
)
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ data class CheckAccessRights(

@field:Expose
@field:SerializedName("result")
val result: Boolean = false,
var result: Boolean = false,

@field:Expose
@field:SerializedName("error")
val odooError: OdooError = OdooError()
var odooError: OdooError = OdooError()
) {
val isSuccessful get() = !isOdooError
val isOdooError get() = odooError.message.isNotEmpty()
Expand Down
Loading

0 comments on commit c034a27

Please sign in to comment.