diff --git a/openvidu-android/app/build.gradle b/openvidu-android/app/build.gradle index b0b3ea64..38928518 100644 --- a/openvidu-android/app/build.gradle +++ b/openvidu-android/app/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 29 buildToolsVersion "29.0.1" defaultConfig { - applicationId "com.example.openviduandroid" + applicationId "io.openvidu.openvidu_android" minSdkVersion 21 targetSdkVersion 29 versionCode 1 @@ -33,11 +33,11 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation 'com.jakewharton:butterknife:10.1.0' - implementation 'com.squareup.okhttp3:okhttp:4.1.1' + implementation 'com.jakewharton:butterknife:10.2.0' + implementation 'com.squareup.okhttp3:okhttp:4.2.0' implementation 'com.neovisionaries:nv-websocket-client:2.9' implementation 'org.webrtc:google-webrtc:1.0.28513' - annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0' + annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/openvidu-android/app/src/androidTest/java/com/example/openviduandroid/ExampleInstrumentedTest.java b/openvidu-android/app/src/androidTest/java/io/openvidu/openvidu_android/ExampleInstrumentedTest.java similarity index 84% rename from openvidu-android/app/src/androidTest/java/com/example/openviduandroid/ExampleInstrumentedTest.java rename to openvidu-android/app/src/androidTest/java/io/openvidu/openvidu_android/ExampleInstrumentedTest.java index a4148420..247ac721 100644 --- a/openvidu-android/app/src/androidTest/java/com/example/openviduandroid/ExampleInstrumentedTest.java +++ b/openvidu-android/app/src/androidTest/java/io/openvidu/openvidu_android/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.example.openviduandroid; +package io.openvidu.openvidu_android; import android.content.Context; @@ -22,6 +22,6 @@ public class ExampleInstrumentedTest { // Context of the app under test. Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("com.example.openviduandroid", appContext.getPackageName()); + assertEquals("io.openvidu.openvidu_android", appContext.getPackageName()); } } diff --git a/openvidu-android/app/src/main/AndroidManifest.xml b/openvidu-android/app/src/main/AndroidManifest.xml index 4c7f34bb..e752cb56 100644 --- a/openvidu-android/app/src/main/AndroidManifest.xml +++ b/openvidu-android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="io.openvidu.openvidu_android"> - diff --git a/openvidu-android/app/src/main/java/com/example/openviduandroid/activities/SessionActivity.java b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/activities/SessionActivity.java similarity index 96% rename from openvidu-android/app/src/main/java/com/example/openviduandroid/activities/SessionActivity.java rename to openvidu-android/app/src/main/java/io/openvidu/openvidu_android/activities/SessionActivity.java index 04b8df3d..2371f09a 100644 --- a/openvidu-android/app/src/main/java/com/example/openviduandroid/activities/SessionActivity.java +++ b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/activities/SessionActivity.java @@ -1,4 +1,4 @@ -package com.example.openviduandroid.activities; +package io.openvidu.openvidu_android.activities; import android.Manifest; import android.content.pm.ActivityInfo; @@ -21,13 +21,13 @@ import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import androidx.fragment.app.DialogFragment; -import com.example.openviduandroid.R; -import com.example.openviduandroid.fragments.PermissionsDialogFragment; -import com.example.openviduandroid.openvidu.LocalParticipant; -import com.example.openviduandroid.openvidu.RemoteParticipant; -import com.example.openviduandroid.openvidu.Session; -import com.example.openviduandroid.utils.CustomHttpClient; -import com.example.openviduandroid.websocket.CustomWebSocket; +import io.openvidu.openvidu_android.R; +import io.openvidu.openvidu_android.fragments.PermissionsDialogFragment; +import io.openvidu.openvidu_android.openvidu.LocalParticipant; +import io.openvidu.openvidu_android.openvidu.RemoteParticipant; +import io.openvidu.openvidu_android.openvidu.Session; +import io.openvidu.openvidu_android.utils.CustomHttpClient; +import io.openvidu.openvidu_android.websocket.CustomWebSocket; import org.jetbrains.annotations.NotNull; import org.json.JSONException; diff --git a/openvidu-android/app/src/main/java/com/example/openviduandroid/constants/JsonConstants.java b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/constants/JsonConstants.java similarity index 98% rename from openvidu-android/app/src/main/java/com/example/openviduandroid/constants/JsonConstants.java rename to openvidu-android/app/src/main/java/io/openvidu/openvidu_android/constants/JsonConstants.java index 71cf868a..6d0ac2ac 100644 --- a/openvidu-android/app/src/main/java/com/example/openviduandroid/constants/JsonConstants.java +++ b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/constants/JsonConstants.java @@ -1,4 +1,4 @@ -package com.example.openviduandroid.constants; +package io.openvidu.openvidu_android.constants; public final class JsonConstants { diff --git a/openvidu-android/app/src/main/java/com/example/openviduandroid/fragments/PermissionsDialogFragment.java b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/fragments/PermissionsDialogFragment.java similarity index 85% rename from openvidu-android/app/src/main/java/com/example/openviduandroid/fragments/PermissionsDialogFragment.java rename to openvidu-android/app/src/main/java/io/openvidu/openvidu_android/fragments/PermissionsDialogFragment.java index 51d0eb02..f8847271 100644 --- a/openvidu-android/app/src/main/java/com/example/openviduandroid/fragments/PermissionsDialogFragment.java +++ b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/fragments/PermissionsDialogFragment.java @@ -1,4 +1,4 @@ -package com.example.openviduandroid.fragments; +package io.openvidu.openvidu_android.fragments; import android.app.Dialog; import android.os.Bundle; @@ -8,8 +8,8 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; -import com.example.openviduandroid.R; -import com.example.openviduandroid.activities.SessionActivity; +import io.openvidu.openvidu_android.R; +import io.openvidu.openvidu_android.activities.SessionActivity; public class PermissionsDialogFragment extends DialogFragment { diff --git a/openvidu-android/app/src/main/java/com/example/openviduandroid/observers/CustomPeerConnectionObserver.java b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/observers/CustomPeerConnectionObserver.java similarity index 98% rename from openvidu-android/app/src/main/java/com/example/openviduandroid/observers/CustomPeerConnectionObserver.java rename to openvidu-android/app/src/main/java/io/openvidu/openvidu_android/observers/CustomPeerConnectionObserver.java index 7e5e56c6..26482628 100644 --- a/openvidu-android/app/src/main/java/com/example/openviduandroid/observers/CustomPeerConnectionObserver.java +++ b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/observers/CustomPeerConnectionObserver.java @@ -1,4 +1,4 @@ -package com.example.openviduandroid.observers; +package io.openvidu.openvidu_android.observers; import android.util.Log; diff --git a/openvidu-android/app/src/main/java/com/example/openviduandroid/observers/CustomSdpObserver.java b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/observers/CustomSdpObserver.java similarity index 94% rename from openvidu-android/app/src/main/java/com/example/openviduandroid/observers/CustomSdpObserver.java rename to openvidu-android/app/src/main/java/io/openvidu/openvidu_android/observers/CustomSdpObserver.java index 1bce70ce..c6824a3c 100644 --- a/openvidu-android/app/src/main/java/com/example/openviduandroid/observers/CustomSdpObserver.java +++ b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/observers/CustomSdpObserver.java @@ -1,4 +1,4 @@ -package com.example.openviduandroid.observers; +package io.openvidu.openvidu_android.observers; import android.util.Log; diff --git a/openvidu-android/app/src/main/java/com/example/openviduandroid/openvidu/LocalParticipant.java b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/LocalParticipant.java similarity index 98% rename from openvidu-android/app/src/main/java/com/example/openviduandroid/openvidu/LocalParticipant.java rename to openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/LocalParticipant.java index e6262e16..1dc36337 100644 --- a/openvidu-android/app/src/main/java/com/example/openviduandroid/openvidu/LocalParticipant.java +++ b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/LocalParticipant.java @@ -1,4 +1,4 @@ -package com.example.openviduandroid.openvidu; +package io.openvidu.openvidu_android.openvidu; import android.content.Context; import android.os.Build; diff --git a/openvidu-android/app/src/main/java/com/example/openviduandroid/openvidu/Participant.java b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/Participant.java similarity index 98% rename from openvidu-android/app/src/main/java/com/example/openviduandroid/openvidu/Participant.java rename to openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/Participant.java index c11e6677..704ab032 100644 --- a/openvidu-android/app/src/main/java/com/example/openviduandroid/openvidu/Participant.java +++ b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/Participant.java @@ -1,4 +1,4 @@ -package com.example.openviduandroid.openvidu; +package io.openvidu.openvidu_android.openvidu; import android.util.Log; diff --git a/openvidu-android/app/src/main/java/com/example/openviduandroid/openvidu/RemoteParticipant.java b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/RemoteParticipant.java similarity index 95% rename from openvidu-android/app/src/main/java/com/example/openviduandroid/openvidu/RemoteParticipant.java rename to openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/RemoteParticipant.java index e07b6ebc..2ce739b5 100644 --- a/openvidu-android/app/src/main/java/com/example/openviduandroid/openvidu/RemoteParticipant.java +++ b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/RemoteParticipant.java @@ -1,4 +1,4 @@ -package com.example.openviduandroid.openvidu; +package io.openvidu.openvidu_android.openvidu; import android.view.View; import android.widget.TextView; diff --git a/openvidu-android/app/src/main/java/com/example/openviduandroid/openvidu/Session.java b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/Session.java similarity index 95% rename from openvidu-android/app/src/main/java/com/example/openviduandroid/openvidu/Session.java rename to openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/Session.java index 36e2c45b..691b5925 100644 --- a/openvidu-android/app/src/main/java/com/example/openviduandroid/openvidu/Session.java +++ b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/Session.java @@ -1,13 +1,13 @@ -package com.example.openviduandroid.openvidu; +package io.openvidu.openvidu_android.openvidu; import android.util.Log; import android.view.View; import android.widget.LinearLayout; -import com.example.openviduandroid.activities.SessionActivity; -import com.example.openviduandroid.observers.CustomPeerConnectionObserver; -import com.example.openviduandroid.observers.CustomSdpObserver; -import com.example.openviduandroid.websocket.CustomWebSocket; +import io.openvidu.openvidu_android.activities.SessionActivity; +import io.openvidu.openvidu_android.observers.CustomPeerConnectionObserver; +import io.openvidu.openvidu_android.observers.CustomSdpObserver; +import io.openvidu.openvidu_android.websocket.CustomWebSocket; import org.webrtc.IceCandidate; import org.webrtc.MediaConstraints; diff --git a/openvidu-android/app/src/main/java/com/example/openviduandroid/utils/CustomHttpClient.java b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/utils/CustomHttpClient.java similarity index 98% rename from openvidu-android/app/src/main/java/com/example/openviduandroid/utils/CustomHttpClient.java rename to openvidu-android/app/src/main/java/io/openvidu/openvidu_android/utils/CustomHttpClient.java index 50f62d3d..a3cf387d 100644 --- a/openvidu-android/app/src/main/java/com/example/openviduandroid/utils/CustomHttpClient.java +++ b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/utils/CustomHttpClient.java @@ -1,4 +1,4 @@ -package com.example.openviduandroid.utils; +package io.openvidu.openvidu_android.utils; import java.io.IOException; import java.security.SecureRandom; diff --git a/openvidu-android/app/src/main/java/com/example/openviduandroid/websocket/CustomWebSocket.java b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/websocket/CustomWebSocket.java similarity index 97% rename from openvidu-android/app/src/main/java/com/example/openviduandroid/websocket/CustomWebSocket.java rename to openvidu-android/app/src/main/java/io/openvidu/openvidu_android/websocket/CustomWebSocket.java index 1387aab5..12d908d3 100644 --- a/openvidu-android/app/src/main/java/com/example/openviduandroid/websocket/CustomWebSocket.java +++ b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/websocket/CustomWebSocket.java @@ -1,17 +1,17 @@ -package com.example.openviduandroid.websocket; +package io.openvidu.openvidu_android.websocket; import android.os.AsyncTask; import android.os.Handler; import android.util.Log; import android.widget.Toast; -import com.example.openviduandroid.activities.SessionActivity; -import com.example.openviduandroid.constants.JsonConstants; -import com.example.openviduandroid.observers.CustomSdpObserver; -import com.example.openviduandroid.openvidu.LocalParticipant; -import com.example.openviduandroid.openvidu.Participant; -import com.example.openviduandroid.openvidu.RemoteParticipant; -import com.example.openviduandroid.openvidu.Session; +import io.openvidu.openvidu_android.activities.SessionActivity; +import io.openvidu.openvidu_android.constants.JsonConstants; +import io.openvidu.openvidu_android.observers.CustomSdpObserver; +import io.openvidu.openvidu_android.openvidu.LocalParticipant; +import io.openvidu.openvidu_android.openvidu.Participant; +import io.openvidu.openvidu_android.openvidu.RemoteParticipant; +import io.openvidu.openvidu_android.openvidu.Session; import com.neovisionaries.ws.client.ThreadType; import com.neovisionaries.ws.client.WebSocket; import com.neovisionaries.ws.client.WebSocketException; diff --git a/openvidu-android/app/src/main/res/layout/activity_main.xml b/openvidu-android/app/src/main/res/layout/activity_main.xml index 696a5ab8..a881ed5e 100644 --- a/openvidu-android/app/src/main/res/layout/activity_main.xml +++ b/openvidu-android/app/src/main/res/layout/activity_main.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.example.openviduandroid.activities.SessionActivity"> + tools:context="io.openvidu.openvidu_android.activities.SessionActivity">