let's separate Android from not Android
This commit is contained in:
parent
265aa64054
commit
0f9b1929bd
|
@ -45,7 +45,7 @@ public class ApplicationRequest {
|
||||||
if (this == o) return true;
|
if (this == o) return true;
|
||||||
if (o == null || getClass() != o.getClass()) return false;
|
if (o == null || getClass() != o.getClass()) return false;
|
||||||
ApplicationRequest that = (ApplicationRequest) o;
|
ApplicationRequest that = (ApplicationRequest) o;
|
||||||
return vehicleOwner == that.vehicleOwner &&
|
return vehicleOwner.equals(that.vehicleOwner) &&
|
||||||
sessionDetails.equals(that.sessionDetails);
|
sessionDetails.equals(that.sessionDetails);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,8 @@ package com.rusefi.server;
|
||||||
|
|
||||||
import org.json.simple.JSONObject;
|
import org.json.simple.JSONObject;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* rusEFI Online user - ID and username
|
* rusEFI Online user - ID and username
|
||||||
*/
|
*/
|
||||||
|
@ -35,6 +37,19 @@ public class UserDetails {
|
||||||
return userId;
|
return userId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (this == o) return true;
|
||||||
|
if (o == null || getClass() != o.getClass()) return false;
|
||||||
|
UserDetails that = (UserDetails) o;
|
||||||
|
return userId == that.userId && userName.equals(that.userName);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(userName, userId);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "UserDetails{" +
|
return "UserDetails{" +
|
||||||
|
|
Loading…
Reference in New Issue