{
+
+ /**
+ * Callback that will be called after a sucessfull reponse from the XBMC JSON RPC method
+ * @param result The result that was obtained and sucessfully parsed from XBMC
+ */
+ void onSuccess(T result);
+
+ /**
+ * Calllback that will be called when an error occurs executing the method on XBMC.
+ * This can be a general error (like a connection error), or an error reported by XBMC (like
+ * an incorrect call)
+ * @param errorCode Error code. Check {@link ApiException} for detailed error codes
+ * @param description Error description
+ */
+ void onError(int errorCode, String description);
+}
diff --git a/app/src/main/java/org/xbmc/kore/jsonrpc/ApiException.java b/app/src/main/java/org/xbmc/kore/jsonrpc/ApiException.java
new file mode 100644
index 0000000..40e878b
--- /dev/null
+++ b/app/src/main/java/org/xbmc/kore/jsonrpc/ApiException.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2015 Synced Synapse. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.xbmc.kore.jsonrpc;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.xbmc.kore.utils.JsonUtils;
+
+/**
+ * Exception class for errors on JSON API.
+ * Some communication exceptions are catched and casted to this type.
+ * Response error from the JSON API are also returned as an instance of this exception.
+ */
+public class ApiException extends Exception {
+
+ /**
+ * We got an invalid JSON response
+ */
+ public static final int INVALID_JSON_RESPONSE_FROM_HOST = 0;
+
+ /**
+ * IO Exception while connecting
+ */
+ public static final int IO_EXCEPTION_WHILE_CONNECTING = 1;
+
+ /**
+ * IO Exception while sending
+ */
+ public static final int IO_EXCEPTION_WHILE_SENDING_REQUEST = 2;
+
+ /**
+ * IO Exception while sending
+ */
+ public static final int IO_EXCEPTION_WHILE_READING_RESPONSE = 3;
+
+ /**
+ * HTTP response code unknown/unhandled
+ */
+ public static final int HTTP_RESPONSE_CODE_UNKNOWN = 4;
+
+ /**
+ * HTTP response code unknown/unhandled
+ */
+ public static final int HTTP_RESPONSE_CODE_UNAUTHORIZED = 5;
+
+ /**
+ * HTTP response code unknown/unhandled
+ */
+ public static final int HTTP_RESPONSE_CODE_NOT_FOUND = 6;
+
+ /**
+ *
+ */
+ public static final int HTTP_HOST_URL_INVALID = 7;
+
+ /**
+ * API returned an error
+ */
+ public static int API_ERROR = 100;
+
+ /**
+ * Attempted to send a method while not connected to host
+ */
+ public static int API_NO_CONNECTION = 101;
+
+ /**
+ * Attempted to execute a method with the same id of another already running
+ */
+ public static int API_METHOD_WITH_SAME_ID_ALREADY_EXECUTING = 102;
+
+ public static int API_WAITING_ON_RESULT_TIMEDOUT = 103;
+
+ public static int API_WAITING_ON_RESULT_INTERRUPTED = 104;
+
+ private final int code;
+
+ /**
+ * Constructor
+ * @param code Exception code
+ * @param message Message
+ */
+ public ApiException(int code, String message) {
+ super(message);
+ this.code = code;
+ }
+
+ /**
+ * Construct exception from other exception
+ * @param code Exception code
+ * @param originalException Original exception
+ */
+ public ApiException(int code, Exception originalException) {
+ super(originalException);
+ this.code = code;
+ }
+
+ /**
+ * Construct exception from JSON response
+ * @param code Exception code
+ * @param jsonResponse Json response, with an Error node
+ */
+ public ApiException(int code, ObjectNode jsonResponse) {
+ super((jsonResponse.get(ApiMethod.ERROR_NODE) != null) ?
+ JsonUtils.stringFromJsonNode(jsonResponse.get(ApiMethod.ERROR_NODE), "message") :
+ "No message returned");
+ this.code = code;
+ }
+
+ /**
+ * Internal code of the exception
+ * @return Code of the exception
+ */
+ public int getCode() {
+ return code;
+ }
+}
diff --git a/app/src/main/java/org/xbmc/kore/jsonrpc/ApiFuture.java b/app/src/main/java/org/xbmc/kore/jsonrpc/ApiFuture.java
new file mode 100644
index 0000000..b69587c
--- /dev/null
+++ b/app/src/main/java/org/xbmc/kore/jsonrpc/ApiFuture.java
@@ -0,0 +1,111 @@
+package org.xbmc.kore.jsonrpc;
+
+import androidx.annotation.NonNull;
+
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * A Java future implementation, with explicit methods to complete the Future
+ *
+ * Don't forget that a call to {@link ApiFuture#get()} blocks the current
+ * thread until it's unblocked by {@link ApiFuture#cancel(boolean)},
+ * {@link ApiFuture#complete(Object)} or {@link ApiFuture#completeExceptionally(Throwable)}
+ *
+ * @param The type of the result returned by {@link ApiFuture#get()}
+ */
+public class ApiFuture implements Future {
+ private enum Status { WAITING, OK, ERROR, CANCELLED }
+ private final Object lock = new Object();
+ private Status status = Status.WAITING;
+ private T ok;
+ private Throwable error;
+
+ public ApiFuture() {}
+
+ @Override
+ public T get() throws InterruptedException, ExecutionException {
+ try {
+ return get(0, TimeUnit.MILLISECONDS);
+ } catch (TimeoutException e) {
+ throw new IllegalStateException("Request timed out. This should not happen when time out is disabled!");
+ }
+ }
+
+ @Override
+ public T get(long timeout, @NonNull TimeUnit unit)
+ throws InterruptedException, ExecutionException, TimeoutException
+ {
+ boolean timed = timeout > 0;
+ long remaining = unit.toNanos(timeout);
+ while (true) synchronized (lock) {
+ switch (status) {
+ case OK: return ok;
+ case ERROR: throw new ExecutionException(error);
+ case CANCELLED: throw new CancellationException();
+ case WAITING:
+ if (timed && remaining <= 0) {
+ throw new TimeoutException();
+ }
+ if (!timed) {
+ lock.wait();
+ } else {
+ long start = System.nanoTime();
+ TimeUnit.NANOSECONDS.timedWait(lock, remaining);
+ remaining -= System.nanoTime() - start;
+ }
+ }
+ }
+ }
+
+ private boolean setResultAndNotify(Status status, T ok, Throwable error) {
+ synchronized (lock) {
+ if (this.status != Status.WAITING) {
+ return false;
+ }
+
+ this.status = status;
+ if (status == Status.OK) this.ok = ok;
+ if (status == Status.ERROR) this.error = error;
+
+ this.lock.notifyAll();
+ return true;
+ }
+ }
+
+ @Override
+ public boolean cancel(boolean b) {
+ return setResultAndNotify(Status.CANCELLED, null, null);
+ }
+
+ @Override
+ public boolean isCancelled() {
+ return status == Status.CANCELLED;
+ }
+
+ @Override
+ public boolean isDone() {
+ return status != Status.WAITING;
+ }
+
+ /**
+ * If not already completed, sets the value returned by get() to the given value.
+ * @param value - the result value
+ * @return true if this invocation caused this CompletableFuture to transition to a completed state, else false
+ */
+ public boolean complete(T value) {
+ return setResultAndNotify(Status.OK, value, null);
+ }
+
+ /**
+ * If not already completed, causes invocations of get() to throw the given exception.
+ * @param ex = the exception
+ * @return true if this invocation caused this CompletableFuture to transition to a completed state, else false
+ */
+ public boolean completeExceptionally(Throwable ex) {
+ return setResultAndNotify(Status.ERROR, null, ex);
+ }
+}
diff --git a/app/src/main/java/org/xbmc/kore/jsonrpc/ApiList.java b/app/src/main/java/org/xbmc/kore/jsonrpc/ApiList.java
new file mode 100644
index 0000000..86d42bd
--- /dev/null
+++ b/app/src/main/java/org/xbmc/kore/jsonrpc/ApiList.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016 Martijn Brekhof. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.xbmc.kore.jsonrpc;
+
+import org.xbmc.kore.jsonrpc.type.ListType;
+
+import java.util.List;
+
+public class ApiList {
+ public final List items;
+ public final ListType.LimitsReturned limits;
+
+ public ApiList(List items, ListType.LimitsReturned limits) {
+ this.items = items;
+ this.limits = limits;
+ }
+}
diff --git a/app/src/main/java/org/xbmc/kore/jsonrpc/ApiMethod.java b/app/src/main/java/org/xbmc/kore/jsonrpc/ApiMethod.java
new file mode 100644
index 0000000..68e2849
--- /dev/null
+++ b/app/src/main/java/org/xbmc/kore/jsonrpc/ApiMethod.java
@@ -0,0 +1,277 @@
+/*
+ * Copyright 2015 Synced Synapse. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.xbmc.kore.jsonrpc;
+
+
+import android.os.Handler;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import org.xbmc.kore.host.HostConnection;
+import org.xbmc.kore.jsonrpc.type.ApiParameter;
+import org.xbmc.kore.utils.LogUtils;
+
+import java.io.IOException;
+
+/**
+ * Abstract class base of all the JSON RPC API calls
+ *
+ * Every subclass represents a method on the JSON RPC API.
+ *
+ * Each subclass should implement constructors to represent each of the API call variations, and
+ * call this class {@link #execute(HostConnection, ApiCallback, android.os.Handler) execute()} to send
+ * the call to the server.
+ *
+ * This class is a template which should be typed with the return type of specific the method call.
+ */
+public abstract class ApiMethod {
+ private static final String TAG = LogUtils.makeLogTag(ApiMethod.class);
+
+ public static final String RESULT_NODE = "result";
+ public static final String ERROR_NODE = "error";
+ public static final String ID_NODE = "id";
+ public static final String METHOD_NODE = "method";
+ public static final String PARAMS_NODE = "params";
+
+ /**
+ * Id of the method call. Autoincremented for each method call
+ */
+ private static int lastId = 0;
+ protected final int id;
+
+ protected static final ObjectMapper objectMapper = new ObjectMapper();
+ /**
+ * Json object that will be used to generate the json representation of the current method call
+ */
+ protected final ObjectNode jsonRequest;
+
+ /**
+ * Constructor, sets up the necessary items to make the call later
+ */
+ public ApiMethod() {
+ this(true);
+ }
+
+ /**
+ * Constructor, sets up the necessary items to make the call later
+ */
+ public ApiMethod(boolean sendId) {
+ // Create the rpc request object with the common fields according to JSON RPC spec
+ jsonRequest = objectMapper.createObjectNode();
+ jsonRequest.put("jsonrpc", "2.0");
+ jsonRequest.put(METHOD_NODE, getMethodName());
+
+ if(sendId) {
+ synchronized (this) {
+ this.id = (++lastId % 10000);
+ }
+ jsonRequest.put(ID_NODE, id);
+ }
+ else {
+ id = -1;
+ }
+ }
+
+ /**
+ * Returns the parameters node of the json request object
+ * Creates one if necessary
+ * @return Parameters node
+ */
+ protected ObjectNode getParametersNode() {
+ ObjectNode params;
+ if (jsonRequest.has(PARAMS_NODE)) {
+ params = (ObjectNode)jsonRequest.get(PARAMS_NODE);
+ } else {
+ params = objectMapper.createObjectNode();
+ jsonRequest.set(PARAMS_NODE, params);
+ }
+
+ return params;
+ }
+
+ /**
+ * Adds a parameter to the request
+ * @param parameter Parameter name
+ * @param value Value to add
+ */
+ protected void addParameterToRequest(String parameter, int value) {
+ getParametersNode().put(parameter, value);
+ }
+
+ /**
+ * Adds a parameter to the request
+ * @param parameter Parameter name
+ * @param value Value to add
+ */
+ protected void addParameterToRequest(String parameter, String value) {
+ if (value != null)
+ getParametersNode().put(parameter, value);
+ }
+
+ /**
+ * Adds a parameter to the request
+ * @param parameter Parameter name
+ * @param value Value to add
+ */
+ protected void addParameterToRequest(String parameter, Integer value) {
+ if (value != null)
+ getParametersNode().put(parameter, value);
+ }
+
+ /**
+ * Adds a parameter to the request
+ * @param parameter Parameter name
+ * @param value Value to add
+ */
+ protected void addParameterToRequest(String parameter, Double value) {
+ if (value != null)
+ getParametersNode().put(parameter, value);
+ }
+
+ /**
+ * Adds a parameter to the request
+ * @param parameter Parameter name
+ * @param value Value to add
+ */
+ protected void addParameterToRequest(String parameter, boolean value) {
+ getParametersNode().put(parameter, value);
+ }
+
+ /**
+ * Adds a parameter to the request
+ * @param parameter Parameter name
+ * @param values Values to add
+ */
+ protected void addParameterToRequest(String parameter, String[] values) {
+ if (values != null) {
+ final ArrayNode arrayNode = objectMapper.createArrayNode();
+ for (String value : values) {
+ arrayNode.add(value);
+ }
+ getParametersNode().set(parameter, arrayNode);
+ }
+ }
+
+ /**
+ * Adds a parameter to the request
+ * @param parameter Parameter name
+ * @param value Value to add
+ */
+ protected void addParameterToRequest(String parameter, ApiParameter value) {
+ if (value != null)
+ getParametersNode().set(parameter, value.toJsonNode());
+ }
+
+ /**
+ * Adds a parameter to the request
+ * @param parameter Parameter name
+ * @param value Value to add
+ */
+ protected void addParameterToRequest(String parameter, JsonNode value) {
+ if (value != null)
+ getParametersNode().set(parameter, value);
+ }
+
+ /**
+ * Returns the id to identify the current method call.
+ * An id is generated for each object that is created.
+ * @return Method call id
+ */
+ public int getId() {
+ return id;
+ }
+
+ /**
+ * Returns the string json representation of the current method.
+ * @return Json string representation of the current method
+ */
+ public String toJsonString() { return jsonRequest.toString(); }
+
+ /**
+ * Returns the json object representation of the current method.
+ * @return JsonObject representation of the current method
+ */
+ public ObjectNode toJsonObject() { return jsonRequest; }
+
+ /**
+ * Calls the method represented by this object on the server asynchronously.
+ * The results will be posted through the callback function on the specified handler.
+ *
+ * @param hostConnection Host connection on which to call the method
+ * @param callback Callbacks to post the response to
+ * @param handler Handler to invoke callbacks on
+ */
+ public void execute(HostConnection hostConnection, ApiCallback callback, Handler handler) {
+ if (hostConnection != null) {
+ hostConnection.execute(this, callback, handler);
+ } else if (callback != null) {
+ callback.onError(ApiException.API_NO_CONNECTION, "No connection specified.");
+ }
+ }
+
+ /**
+ * Returns the current method name
+ * @return Current method name
+ */
+ public abstract String getMethodName();
+
+ /**
+ * Constructs an object of this method's return type from a json response.
+ * This method must be implemented by each subcall to parse the json reponse and create
+ * an return object of the appropriate type for this api method.
+ *
+ * @param jsonResult Json response obtained from a call
+ * @return Result object of the appropriate type for this api method
+ */
+ public T resultFromJson(String jsonResult) throws ApiException{
+ try {
+ return resultFromJson((ObjectNode)objectMapper.readTree(jsonResult));
+ } catch (IOException e) {
+ throw new ApiException(ApiException.INVALID_JSON_RESPONSE_FROM_HOST, e);
+ }
+ }
+
+ /**
+ * Constructs an object of this method's return type from a json response.
+ * This method must be implemented by each subcall to parse the json reponse and create
+ * an return object of the appropriate type for this api method.
+ *
+ * @param jsonObject Json response obtained from a call
+ * @return Result object of the appropriate type for this api method
+ */
+ public abstract T resultFromJson(ObjectNode jsonObject) throws ApiException;
+
+ /**
+ * Default callback for methods which the result doesnt matter
+ */
+ public static ApiCallback getDefaultActionCallback() {
+
+ return new ApiCallback
+
+
+
+# Kore - Kodi/XBMC remote for Android
+
+GitHub repository for the [Kore][1] Android app.
+
+Kore is the official remote for [Kodi](http://kodi.tv/), and aims to be a simple and easy to use remote.
+
+
+## Building
+
+1. Make sure you have a working [Android build system](http://developer.android.com/sdk/installing/studio-build.html);
+2. The version of Android SDK and Build Tools needed is specified in app/build.gradle. Make sure you have them installed;
+3. Install the version of [Android support library](http://developer.android.com/tools/support-library/setup.html) that is specified in app/gradle (dependencies section);
+4. Git pull
+5. Gradle should be able to fetch all the other needed libraries.
+
+## Testing
+
+1. Make sure you are able to build Kore as described in the previous section.
+2. To run the local tests see [README](https://github.com/xbmc/Kore/blob/master/app/src/test/README.md)
+3. To run the instrumented tests see [README](https://github.com/xbmc/Kore/blob/master/app/src/androidTest/README.md)
+
+We use [GitHub Actions](https://github.com/xbmc/Kore/actions) to automatically build and run the local tests for each pull request.
+
+## Using Docker
+
+1. Make sure you have a working [Docker installation](https://docs.docker.com/docker-for-windows/install/);
+2. Check out the repository
+3. Build the container image: `docker build -t kore:latest .`
+4. Start container: `docker run -it -v $(pwd):/opt/kore kore:latest bash`
+
+For listing all tasks, run `gradle tasks`, for building the app, execute `gradle assembleRelease`.
+If you want to run tests, execute `gradle testDebugUnitTest`.
+
+## Credits
+
+**Libraries used**
+- [Jackson](https://github.com/FasterXML/jackson)
+- [Picasso](http://square.github.io/picasso/)
+- [OkHttp](http://square.github.io/okhttp/)
+- [EventBus](https://github.com/greenrobot/EventBus)
+- [JmDNS](https://github.com/jmdns/jmdns)
+- [ExpandableTextView](https://github.com/Blogcat/Android-ExpandableTextView)
+
+## Links
+
+- [Kodi forum thread](http://forum.kodi.tv/forumdisplay.php?fid=129)
+- [F-Droid](https://f-droid.org/repository/browse/?fdid=org.xbmc.kore)
+- [Google Play][1]
+- [Google+ community](https://plus.google.com/communities/115506510322045554124)
+
+## License
+
+ Copyright 2022 XBMC Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+Google Play and the Google Play logo are trademarks of Google Inc.
+
+[1]: https://play.google.com/store/apps/details?id=org.xbmc.kore
diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 0000000..fc5cefd
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,173 @@
+apply plugin: 'com.android.application'
+
+def getVersionName = { ->
+ def stdout = new ByteArrayOutputStream()
+ exec {
+ commandLine 'git', 'describe', '--tags', '--always'
+ standardOutput = stdout
+ }
+ return stdout.toString().trim()
+}
+
+android {
+ compileSdk 34
+
+ defaultConfig {
+ applicationId "org.xbmc.kore"
+ minSdkVersion 24
+ targetSdkVersion 34
+ versionCode 33
+ versionName = getVersionName()
+ testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+
+ def supportedLocales = ["en",
+ "af-za", "ast", "be-by", "bg", "ca", "cs", "da-dk", "de",
+ "es", "es-MX", "eu", "fi", "fr", "hr", "hu", "it", "iw", "ja",
+ "ko", "lt", "nl", "pl", "pt", "pt-BR", "ru", "sk", "sl", "zh-CN"]
+ buildConfigField "String[]", "SUPPORTED_LOCALES", "new String[]{\""+
+ supportedLocales.join("\",\"")+"\"}"
+ }
+
+ signingConfigs {
+ release {
+ if (System.getenv("KODI_ANDROID_STORE_FILE") != null) {
+ keyAlias System.getenv("KODI_ANDROID_KEY_ALIAS")
+ keyPassword System.getenv("KODI_ANDROID_KEY_PASSWORD")
+ storeFile file(System.getenv("KODI_ANDROID_STORE_FILE"))
+ storePassword System.getenv("KODI_ANDROID_STORE_PASSWORD")
+ enableV1Signing true
+ enableV2Signing true
+ enableV3Signing true
+ }
+ }
+ }
+
+ testOptions {
+ execution 'ANDROIDX_TEST_ORCHESTRATOR'
+ unitTests {
+ includeAndroidResources = true
+ }
+ }
+
+ buildTypes {
+ release {
+ if (System.getenv("KODI_ANDROID_STORE_FILE") != null) {
+ signingConfig signingConfigs.release
+ zipAlignEnabled true
+ }
+ minifyEnabled true
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+
+ buildFeatures {
+ viewBinding true
+ }
+
+ packagingOptions {
+ resources {
+ excludes += ['META-INF/DEPENDENCIES', 'META-INF/NOTICE', 'META-INF/LICENSE', 'META-INF/LICENSE.txt', 'META-INF/NOTICE.txt']
+ }
+ }
+
+ lint {
+ // Too much trouble keeping all translations in sync
+ disable 'MissingTranslation'
+ }
+
+ bundle {
+ language {
+ enableSplit = false
+ }
+ }
+ namespace 'org.xbmc.kore'
+
+}
+
+java {
+ toolchain {
+ languageVersion = JavaLanguageVersion.of(17)
+ }
+}
+
+ext {
+ supportLibVersion = '28.0.0'
+}
+
+dependencies {
+ implementation 'com.google.android.material:material:1.10.0'
+ implementation 'androidx.preference:preference:1.2.1'
+ implementation 'androidx.appcompat:appcompat:1.6.1'
+ implementation 'androidx.recyclerview:recyclerview:1.3.2'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+ implementation('androidx.core:core-google-shortcuts:1.1.0') {
+ exclude group:'com.google.android.gms'
+ }
+ implementation 'androidx.media:media:1.6.0'
+ implementation "androidx.viewpager2:viewpager2:1.1.0-beta02"
+ implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+
+ implementation "androidx.fragment:fragment:1.6.2"
+ implementation "androidx.fragment:fragment-ktx:1.6.2"
+
+// Dependency resolution
+ implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
+ implementation "androidx.lifecycle:lifecycle-viewmodel:2.6.2"
+
+ // Jackson v2.13 kept. v2.14 and later require minSDK >= 26
+ // https://github.com/FasterXML/jackson/wiki/Jackson-Releases
+ implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.5'
+ implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+ // Ignore the new version warning as it refers to v2.71... which is older on maven
+ implementation 'com.squareup.picasso:picasso:2.8'
+ implementation 'org.greenrobot:eventbus:3.3.1'
+ implementation 'org.jmdns:jmdns:3.5.8'
+ implementation 'at.blogc:expandabletextview:1.0.5'
+ implementation 'com.simplecityapps:recyclerview-fastscroll:2.0.1'
+ implementation 'org.nanohttpd:nanohttpd:2.3.1'
+
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+ androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+ androidTestImplementation 'androidx.test:rules:1.5.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1'
+ androidTestImplementation 'androidx.legacy:legacy-support-v13:1.0.0'
+ androidTestImplementation 'org.hamcrest:hamcrest-library:2.2'
+ androidTestImplementation 'junit:junit:4.13.2'
+ androidTestUtil 'androidx.test:orchestrator:1.4.2'
+
+ testImplementation 'org.robolectric:robolectric:4.8.1'
+ testImplementation 'androidx.test:core:1.5.0'
+ testImplementation 'androidx.test.ext:junit:1.1.5'
+ debugImplementation 'junit:junit:4.13.2'
+}
+
+def adb = android.getAdbExecutable().toString()
+afterEvaluate {
+ tasks.register('grantAnimationPermissionDev', Exec) {
+ dependsOn installDebug
+ doFirst {
+ println("Executing: $adb shell pm grant $android.defaultConfig.applicationId android.permission.SET_ANIMATION_SCALE")
+ commandLine "$adb shell pm grant $android.defaultConfig.applicationId android.permission.SET_ANIMATION_SCALE".split(' ')
+ }
+ }
+ tasks.each { task ->
+ if (task.name.startsWith('connectedDebugAndroidTest')) {
+ task.dependsOn grantAnimationPermissionDev
+ }
+ }
+}
+
+/**
+ * Makes sure assets are copied before running the unit tests
+ */
+tasks.configureEach { task ->
+ if (task.name.contains("testDebugUnitTest")) {
+ task.dependsOn assembleDebug
+ }
+}
+
+tasks.withType(JavaCompile).configureEach {
+ options.compilerArgs << '-Xlint:unchecked' // << '-Xlint:deprecation'
+}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
new file mode 100644
index 0000000..77bbdd5
--- /dev/null
+++ b/app/proguard-rules.pro
@@ -0,0 +1,44 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /opt/android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# Don't obfuscate for now. Obfuscation decreases apk size by about 300k
+-dontobfuscate
+
+# Picasso
+-dontwarn com.squareup.okhttp.**
+
+# okio via OkHttp
+-dontwarn okio.**
+
+# Jackson
+-dontskipnonpubliclibraryclassmembers
+-keepattributes EnclosingMethod, Signature
+#-keep class org.codehaus.** { *; }
+-keepnames class com.fasterxml.jackson.** { *; }
+-dontwarn com.fasterxml.jackson.databind.**
+
+# EventBus
+-keepclassmembers class ** {
+ public void onEvent*(**);
+}
+
+# SearchView
+-keep class androidx.appcompat.widget.SearchView { *; }
+
+#JmDNS
+-dontwarn org.slf4j.*
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
diff --git a/app/src/androidTest/README.md b/app/src/androidTest/README.md
new file mode 100644
index 0000000..a03fa54
--- /dev/null
+++ b/app/src/androidTest/README.md
@@ -0,0 +1,19 @@
+Integration tests that need to be executed on an Android device.
+
+## Run tests
+
+You can run the tests as follows:
+
+### Android Studio
+
+1. Select build variant "instrumentationTestDebug"
+2. Set the [Project view](https://developer.android.com/studio/projects/index.html) to Android
+3. Right-click on the directory "androidTest" and select "Run tests"
+
+### Commandline
+
+Run the following command from the top of the project:
+
+ ./gradlew connectedInstrumentationTestDebugAndroidTest
+
+This will run the tests on all connected devices in parallel
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/xbmc/kore/testhelpers/EspressoTestUtils.java b/app/src/androidTest/java/org/xbmc/kore/testhelpers/EspressoTestUtils.java
new file mode 100644
index 0000000..5907e45
--- /dev/null
+++ b/app/src/androidTest/java/org/xbmc/kore/testhelpers/EspressoTestUtils.java
@@ -0,0 +1,372 @@
+/*
+ * Copyright 2016 Martijn Brekhof. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.xbmc.kore.testhelpers;
+
+import android.app.Activity;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
+import android.view.View;
+import android.widget.AutoCompleteTextView;
+import android.widget.TextView;
+
+import androidx.test.espresso.Espresso;
+import androidx.test.espresso.NoMatchingViewException;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.ViewInteraction;
+import androidx.test.espresso.contrib.RecyclerViewActions;
+
+import com.sothree.slidinguppanel.SlidingUpPanelLayout;
+
+import org.hamcrest.Matcher;
+import org.xbmc.kore.R;
+import org.xbmc.kore.testhelpers.action.ViewActions;
+import org.xbmc.kore.ui.widgets.NowPlayingPanel;
+
+import static androidx.test.espresso.Espresso.onData;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
+import static androidx.test.espresso.Espresso.pressBack;
+import static androidx.test.espresso.action.ViewActions.clearText;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
+import static androidx.test.espresso.action.ViewActions.typeText;
+import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withParent;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.CoreMatchers.anything;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.xbmc.kore.testhelpers.action.ViewActions.clearFocus;
+
+public class EspressoTestUtils {
+
+ public static void rotateDevice(Activity activity) {
+ int orientation
+ = activity.getResources().getConfiguration().orientation;
+ activity.setRequestedOrientation(
+ (orientation == Configuration.ORIENTATION_PORTRAIT) ?
+ ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE :
+ ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ }
+
+ /**
+ * Clicks a menu item regardless if it is in the overflow menu or
+ * visible as icon in the action bar
+ * @param activity
+ * @param name Name of the menu item in the overflow menu
+ * @param resourceId Resource identifier of the menu item
+ */
+ public static void clickMenuItem(Activity activity, String name, int resourceId) {
+ try {
+ onView(withId(resourceId)).perform(click());
+ } catch (NoMatchingViewException e) {
+ openActionBarOverflowOrOptionsMenu(activity);
+ //Use onData as item might not be visible in the View without scrolling
+ onData(allOf(
+ Matchers.withMenuTitle(name)))
+ .perform(click());
+ }
+ }
+
+ /**
+ * Clicks the arrow button in the toolbar when its function is collapsing a view. For instance,
+ * collapse the search view in the toolbar.
+ */
+ public static void clickToolbarCollapseButton() {
+ /**
+ * The image button in the toolbar used as home/collapse/back button has no ID we can use.
+ * In appcompat v7 the arrow button in the toolbar used to collapse a search view has a
+ * description "Collapse". We use this to find the button in the view and perform the click
+ * action.
+ */
+ onView(withContentDescription("Collapse")).perform(click());
+ }
+
+ /**
+ * Clicks the button with given resourceId and checks if the
+ * button is displayed. As we occasionally use the same identifiers
+ * in multiple fragments, we need to check if it is visible as well
+ * to prevent Espresso from finding multiple views that match the
+ * resource identifier.
+ * @param resourceId
+ */
+ public static void clickButton(int resourceId) {
+ onView(allOf(withId(resourceId), isDisplayed())).perform(click());
+ }
+
+ /**
+ * Clicks on the search menu item and enters the given search query
+ * @param activity
+ * @param query
+ */
+ public static void enterSearchQuery(Activity activity, String query) {
+ EspressoTestUtils.clickMenuItem(activity, activity.getString(R.string.action_search), R.id.action_search);
+
+ onView(isAssignableFrom(AutoCompleteTextView.class))
+ .perform(click(), typeText(query), closeSoftKeyboard());
+ onView(isRoot()).perform(clearFocus());
+ }
+
+ /**
+ * Clicks on the search menu item and clears the search query by entering the empty string
+ * @param activity
+ */
+ public static void clearSearchQuery(Activity activity) {
+ EspressoTestUtils.clickMenuItem(activity, activity.getString(R.string.action_search), R.id.action_search);
+
+ onView(isAssignableFrom(AutoCompleteTextView.class))
+ .perform(click(), clearText(), closeSoftKeyboard());
+ }
+
+ /**
+ * Clears the search query by pressing the X button
+ * @param activity
+ */
+ public static void clearSearchQueryXButton(Activity activity) {
+ try {
+ onView(withId(R.id.search_close_btn)).perform(click());
+ } catch (NoMatchingViewException e) {
+ EspressoTestUtils.clickMenuItem(activity, activity.getString(R.string.action_search), R.id.action_search);
+ onView(withId(R.id.search_close_btn)).perform(click());
+ }
+ Espresso.closeSoftKeyboard();
+ }
+
+ /**
+ * Performs a click on an item in an adapter view, such as GridView or ListView
+ * @param position
+ * @param resourceId of adapter view holding the item that should be clicked
+ */
+ public static void clickAdapterViewItem(int position, int resourceId) {
+ onData(anything()).inAdapterView(allOf(withId(resourceId), isDisplayed()))
+ .atPosition(position).perform(click());
+ }
+
+
+ public static void clickRecyclerViewItem(int position, int resourceId) {
+ onView(withId(resourceId)).perform(RecyclerViewActions.actionOnItemAtPosition(position, click()));
+ }
+
+ public static void clickRecyclerViewItem(String text, int resourceId) {
+ ViewInteraction viewInteraction = onView(allOf(withId(resourceId),
+ hasDescendant(withText(containsString(text))),
+ isDisplayed()));
+ viewInteraction.perform(RecyclerViewActions.scrollTo(hasDescendant(withText(containsString(text)))));
+ viewInteraction.perform(RecyclerViewActions.actionOnItem(hasDescendant(withText(containsString(text))),
+ click()));
+ }
+
+ /**
+ * Checks that SearchView contains the given text
+ * @param query text that SearchView should contain
+ */
+ public static void checkTextInSearchQuery(String query) {
+ onView(isAssignableFrom(AutoCompleteTextView.class)).check(matches(withText(query)));
+ }
+
+ /**
+ * Checks that the list contains item(s) matching search query
+ * @param query text each element must contain
+ * @param listSize amount of elements expected in list
+ * @param resourceId resource identifier or list view
+ */
+ public static void checkListMatchesSearchQuery(String query, int listSize, int resourceId) {
+ onView(isRoot()).perform(ViewActions.waitForView(resourceId, new ViewActions.CheckStatus() {
+ @Override
+ public boolean check(View v) {
+ return v.isShown();
+ }
+ }, 10000));
+
+ onView(allOf(withId(resourceId), isDisplayed()))
+ .check(matches(Matchers.withOnlyMatchingDataItems(hasDescendant(withText(containsString(query))))));
+ checkRecyclerViewListsize(listSize, resourceId);
+ }
+
+ /**
+ * Checks that the list size matches the given list size
+ * @param listSize amount of elements expected in list
+ */
+ public static void checkRecyclerViewListsize(int listSize, int resourceId) {
+ onView(allOf(withId(resourceId), isDisplayed()))
+ .check(matches(Matchers.withRecyclerViewSize(listSize)));
+ }
+
+ /**
+ * Checks that the list size matches the given list size
+ * @param listSize amount of elements expected in list
+ */
+ public static void checkListViewSize(int listSize, int resourceId) {
+ onView(allOf(withId(resourceId), isDisplayed()))
+ .check(matches(Matchers.withListViewSize(listSize)));
+ }
+
+ /**
+ * Checks if search action view does not exist in the current view hierarchy
+ */
+ public static void checkSearchMenuCollapsed() {
+ onView(isAssignableFrom(AutoCompleteTextView.class)).check(doesNotExist());
+ }
+
+ /**
+ * Returns the current active activity. Use this when the originally started activity
+ * started a new activity and you need the reference to the new activity.
+ * @return reference to the current active activity
+ */
+ public static Activity getActivity() {
+ final Activity[] activity = new Activity[1];
+ onView(allOf(withId(android.R.id.content), isDisplayed())).perform(new ViewAction() {
+ @Override
+ public Matcher