diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9dfffb9..0025d46 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
-
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/java/fr/mobdev/peertubelive/dialog/AddInstanceDialog.kt b/app/src/main/java/fr/mobdev/peertubelive/dialog/AddInstanceDialog.kt
index 5e702ad..d04342f 100644
--- a/app/src/main/java/fr/mobdev/peertubelive/dialog/AddInstanceDialog.kt
+++ b/app/src/main/java/fr/mobdev/peertubelive/dialog/AddInstanceDialog.kt
@@ -40,6 +40,7 @@ class AddInstanceDialog : DialogFragment() {
if (this::oAuthData.isInitialized)
{
+ builder.setTitle(R.string.connection)
binding.username.isEnabled = false
binding.instance.isEnabled = false
binding.instance.setText(oAuthData.baseUrl)
@@ -86,7 +87,7 @@ class AddInstanceDialog : DialogFragment() {
inError = true
}
}
- if (DatabaseManager.existsCredential(requireContext(),instance,username)) {
+ if (!this::oAuthData.isInitialized && DatabaseManager.existsCredential(requireContext(),instance,username)) {
inError = true
binding.error.visibility = View.VISIBLE
binding.error.text = requireContext().getString(R.string.account_exist)
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4759835..c21c760 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -44,6 +44,7 @@
▶ Paramètres avancés
▼ Paramètres avancés
Ajouter ce compte
+ Connexion
Nom d\'utilisateur
Mot de passe
Instance
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 13fd4dd..44cc73c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,10 +40,11 @@
Category
Privacy
Language
- License
+ Licence
▶ Advanced Settings
▼ Advanced Settings
Add this account
+ Connection
Username
Password
Instance
@@ -294,4 +295,4 @@
- 480p
- 360p
-
\ No newline at end of file
+
diff --git a/build.gradle b/build.gradle
index 6825f01..4a75747 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.2'
+ classpath 'com.android.tools.build:gradle:7.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5'
diff --git a/encoder/build.gradle b/encoder/build.gradle
index 900aaf2..fc032a0 100644
--- a/encoder/build.gradle
+++ b/encoder/build.gradle
@@ -6,8 +6,6 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 30
- versionCode 182
- versionName "1.8.2"
}
buildTypes {
release {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d7577eb..69f08a3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/rtmp/build.gradle b/rtmp/build.gradle
index 2990edf..4f56f3c 100644
--- a/rtmp/build.gradle
+++ b/rtmp/build.gradle
@@ -6,8 +6,6 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 30
- versionCode 182
- versionName "1.8.2"
}
buildTypes {
release {
diff --git a/rtplibrary/build.gradle b/rtplibrary/build.gradle
index b7158d0..5a36bda 100644
--- a/rtplibrary/build.gradle
+++ b/rtplibrary/build.gradle
@@ -6,8 +6,6 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 30
- versionCode 182
- versionName "1.8.2"
}
buildTypes {
release {
diff --git a/rtsp/build.gradle b/rtsp/build.gradle
index d16f3ec..7625382 100644
--- a/rtsp/build.gradle
+++ b/rtsp/build.gradle
@@ -6,8 +6,6 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 30
- versionCode 182
- versionName "1.8.2"
}
buildTypes {
release {