Peertube
/
peertube-live-streaming
mirror of https://codeberg.org/Schoumi/PeerTubeLive.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'fix_request_password_error' (#14) from fix_request_password_error into master 

Reviewed-on: https://codeberg.org/Schoumi/PeerTubeLive/pulls/14
This commit is contained in:
Schoumi 2021-09-22 18:13:53 +02:00
parent e41d4b475b 55df589c2a
commit b1537af30a
23 changed files with 9 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/gradle.xml
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>

10
.idea/runConfigurations.xml
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>

3
app/src/main/java/fr/mobdev/peertubelive/dialog/AddInstanceDialog.kt
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)

66
app/src/main/res/values-de/strings.xml
View File

@ -1,66 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="no_instance">Kein Konto registriert. Um ein Peertube-Konto hinzuzufügen, klicken Sie auf das + in der oberen Leiste</string>
<string name="german">Deutsch</string>
<string name="arabic">Arabisch</string>
<string name="food">Essen</string>
<string name="kids">Kinder</string>
<string name="animals">Tiere</string>
<string name="science_tech">Wissenschaft und Technik</string>
<string name="activism">Aktivismus</string>
<string name="education">Bildung</string>
<string name="how_to">Tutorials</string>
<string name="news_politics">Nachrichten und Politik</string>
<string name="entertainment">Unterhaltung</string>
<string name="comedy">Humor</string>
<string name="people">Menschen</string>
<string name="gaming">Videospiele</string>
<string name="travels">Reise</string>
<string name="sports">Sport</string>
<string name="art">Kunst</string>
<string name="vehicles">Fahrzeuge</string>
<string name="films">Filme</string>
<string name="music">Musik</string>
<string name="description">Beschreibung</string>
<string name="tags">Markierungen</string>
<string name="nsfw">Enthält sensible Inhalte</string>
<string name="download_enabled">Herunterladen-Option aktivieren</string>
<string name="comments_enabled">Videokommentare aktivieren</string>
<string name="delete_account_title">Dieses Konto löschen</string>
<string name="instance">Instanz</string>
<string name="password">Passwort</string>
<string name="username">Benutzername</string>
<string name="add_instance">Dieses Konto hinzufügen</string>
<string name="advanced_settings_expand">▼ Erweiterte Einstellungen</string>
<string name="advanced_settings">▶ Erweiterte Einstellungen</string>
<string name="stream_licence">Lizenz</string>
<string name="stream_language">Sprache</string>
<string name="stream_privacy">Privatsphäre</string>
<string name="stream_category">Kategorie</string>
<string name="stream_title">Titel</string>
<string name="connect">Verbinden</string>
<string name="goto_permissions">Einstellungen anzeigen</string>
<string name="no">Nein</string>
<string name="yes">Ja</string>
<string name="cancel">Abbrechen</string>
<string name="choose_channel">Kanal</string>
<string name="stop_reason">Ihr Live ist beendet</string>
<string name="background_reason">Ihr Live ist beendet, weil die Anwendung in den Hintergrund gegangen ist</string>
<string name="back_reason">Ihr Leben wurde beendet, nachdem Sie die Zurück-Taste gedrückt haben</string>
<string name="tags_rules">Maximal 5 Markierungen, jeweils zwischen 2 und 30 Zeichen, durch Komma getrennt</string>
<string name="delete_account">Sind Sie sicher, dass Sie das Konto %s, das mit dem Server %s verbunden ist, löschen möchten\?</string>
<string name="permissions">Wir benötigen den Zugriff auf die Kamera und das Mikrofon, um live zu streamen. Zum Ändern der Berechtigungseinstellungen klicken Sie unten</string>
<string name="try_connect">Warten auf Verbindung</string>
<string name="loading_channels">Ihr Kanalliste wird geladen</string>
<string name="account_exist">Dieses Konto existiert bereits</string>
<string name="malformed_instance_error">Instanz sollte eine gültige URL sein</string>
<string name="password_error">Passwort kann nicht leer sein</string>
<string name="username_error">Benutzername kann nicht leer sein</string>
<string name="instance_error">Instanz kann nicht leer sein</string>
<string name="stream_title_error">Titel sollte nicht leer sein</string>
<string name="json_error">JSON-Fehler</string>
<string name="unknown_host">Unbekannter Host</string>
<string name="unknwon_error">Unbekannter Fehler</string>
<string name="network_error">Keine Internetverbindung gefunden</string>
<string name="app_name">Peertube Live</string>
</resources>

1
app/src/main/res/values-fr/strings.xml
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>

2
app/src/main/res/values-nb-rNO/strings.xml
View File

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>

6
app/src/main/res/values-ru/strings.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">PeerTube Live</string>
<string name="json_error">Ошибка JSON</string>
<string name="unknwon_error">Неизвестная ошибка</string>
</resources>

5
app/src/main/res/values/strings.xml
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>

2
build.gradle
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'

2
encoder/build.gradle
View File

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

1
fastlane/metadata/android/de/short_description.txt
View File

@ -1 +0,0 @@
hilft Dir, einen Live-Stream von Deinem Gerät zu erstellen

BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/create.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 301 KiB

BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/home.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 217 KiB

BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/stream.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 MiB

BIN
fastlane/metadata/android/fr/images/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 229 KiB

BIN
fastlane/metadata/android/fr/images/phoneScreenshots/create.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 301 KiB

BIN
fastlane/metadata/android/fr/images/phoneScreenshots/home.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 217 KiB

BIN
fastlane/metadata/android/fr/images/phoneScreenshots/stream.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 MiB

1
fastlane/metadata/android/ru/short_description.txt
View File

@ -1 +0,0 @@
Транслируйте камеру устройства на свой канал PeerTube!

2
gradle/wrapper/gradle-wrapper.properties vendored
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

2
rtmp/build.gradle
View File

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

2
rtplibrary/build.gradle
View File

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

2
rtsp/build.gradle
View File

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