- Bug fix that when app ask for password after longtime without connexion, it says that credentials already exists.

- Update gradle version
This commit is contained in:
Schoumi 2021-09-22 17:40:54 +02:00
parent e41d4b475b
commit 619cb0a8e0
11 changed files with 9 additions and 25 deletions

View File

@ -4,7 +4,7 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="PLATFORM" />
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
@ -20,7 +20,6 @@
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings>
</option>
</component>

View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

View File

@ -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)

View File

@ -44,6 +44,7 @@
<string name="advanced_settings">▶ Paramètres avancés</string>
<string name="advanced_settings_expand">▼ Paramètres avancés</string>
<string name="add_instance">Ajouter ce compte</string>
<string name="connection">Connexion</string>
<string name="username">Nom d\'utilisateur</string>
<string name="password">Mot de passe</string>
<string name="instance">Instance</string>

View File

@ -40,10 +40,11 @@
<string name="stream_category">Category</string>
<string name="stream_privacy">Privacy</string>
<string name="stream_language">Language</string>
<string name="stream_licence">License</string>
<string name="stream_licence">Licence</string>
<string name="advanced_settings">▶ Advanced Settings</string>
<string name="advanced_settings_expand">▼ Advanced Settings</string>
<string name="add_instance">Add this account</string>
<string name="connection">Connection</string>
<string name="username">Username</string>
<string name="password">Password</string>
<string name="instance">Instance</string>
@ -294,4 +295,4 @@
<item>480p</item>
<item>360p</item>
</array>
</resources>
</resources>

View File

@ -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'

View File

@ -6,8 +6,6 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 30
versionCode 182
versionName "1.8.2"
}
buildTypes {
release {

View File

@ -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

View File

@ -6,8 +6,6 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 30
versionCode 182
versionName "1.8.2"
}
buildTypes {
release {

View File

@ -6,8 +6,6 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 30
versionCode 182
versionName "1.8.2"
}
buildTypes {
release {

View File

@ -6,8 +6,6 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 30
versionCode 182
versionName "1.8.2"
}
buildTypes {
release {