From 6ae948f0cd8f50fc28989e6dee762f76a3bf77a0 Mon Sep 17 00:00:00 2001 From: Anthony Chomienne Date: Wed, 7 Jul 2021 17:24:56 +0200 Subject: [PATCH] Change remaining old project name/config to PeerTube Live --- .idea/.name | 2 +- .../fr/mobdev/peertubelive/ExampleInstrumentedTest.kt | 4 ++-- .../fr/mobdev/peertubelive/manager/DatabaseHelper.kt | 2 +- .../fr/mobdev/peertubelive/manager/OAuthManager.kt | 10 +++++----- app/src/main/res/values-fr/strings.xml | 2 +- .../java/fr/mobdev/peertubelive/ExampleUnitTest.kt | 2 +- settings.gradle | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.idea/.name b/.idea/.name index 53f5df5..14313b5 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -Peeriscope \ No newline at end of file +Peertube Live \ No newline at end of file diff --git a/app/src/androidTest/java/fr/mobdev/peertubelive/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/mobdev/peertubelive/ExampleInstrumentedTest.kt index 8c6a63c..4ae5232 100644 --- a/app/src/androidTest/java/fr/mobdev/peertubelive/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/fr/mobdev/peertubelive/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package org.framasoft.peertubelive +package fr.mobdev.peertubelive import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("org.framasoft.peeriscope", appContext.packageName) + assertEquals("fr.mobdev.peertubelive", appContext.packageName) } } \ No newline at end of file diff --git a/app/src/main/java/fr/mobdev/peertubelive/manager/DatabaseHelper.kt b/app/src/main/java/fr/mobdev/peertubelive/manager/DatabaseHelper.kt index ba8321b..c148193 100644 --- a/app/src/main/java/fr/mobdev/peertubelive/manager/DatabaseHelper.kt +++ b/app/src/main/java/fr/mobdev/peertubelive/manager/DatabaseHelper.kt @@ -9,7 +9,7 @@ import android.database.sqlite.SQLiteOpenHelper class DatabaseHelper(context: Context) : SQLiteOpenHelper(context, DB_NAME, null, 2) { companion object { - const val DB_NAME: String = "peeriscope.db" + const val DB_NAME: String = "PeerTubeLive.db" const val TABLE_CREDS: String = "Credentials" const val CREDS_USERNAME: String = "Username" const val CREDS_BASE_URL: String = "Instance" diff --git a/app/src/main/java/fr/mobdev/peertubelive/manager/OAuthManager.kt b/app/src/main/java/fr/mobdev/peertubelive/manager/OAuthManager.kt index 1eddfbd..2a8bc86 100644 --- a/app/src/main/java/fr/mobdev/peertubelive/manager/OAuthManager.kt +++ b/app/src/main/java/fr/mobdev/peertubelive/manager/OAuthManager.kt @@ -146,7 +146,7 @@ class OAuthManager { val registerUrl = URL(url) val connection: HttpURLConnection = registerUrl.openConnection() as HttpURLConnection connection.requestMethod = "GET" - connection.setRequestProperty("User-Agent", "Peeriscope") + connection.setRequestProperty("User-Agent", message.context.getString(R.string.app_name)) connection.setRequestProperty("Content-Type", "application/json") connection.setRequestProperty("Accept", "application/json") connection.doInput = true @@ -200,7 +200,7 @@ class OAuthManager { val getUserTokenUrl = URL(url) val connection: HttpURLConnection = getUserTokenUrl.openConnection() as HttpURLConnection connection.requestMethod = "POST" - connection.setRequestProperty("User-Agent", "Peeriscope") + connection.setRequestProperty("User-Agent", message.context.getString(R.string.app_name)) connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded") connection.setRequestProperty("Accept", "application/json") connection.doInput = true @@ -281,7 +281,7 @@ class OAuthManager { val getUserTokenUrl = URL(url) val connection: HttpURLConnection = getUserTokenUrl.openConnection() as HttpURLConnection connection.requestMethod = "POST" - connection.setRequestProperty("User-Agent", "Peeriscope") + connection.setRequestProperty("User-Agent", message.context.getString(R.string.app_name)) connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded") connection.setRequestProperty("Accept", "application/json") connection.doInput = true @@ -359,7 +359,7 @@ class OAuthManager { val data = message.args.getBundle(DATA)!! val connection: HttpURLConnection = postUrl.openConnection() as HttpURLConnection connection.requestMethod = "POST" - connection.setRequestProperty("User-Agent", "Peeriscope") + connection.setRequestProperty("User-Agent", message.context.getString(R.string.app_name)) connection.setRequestProperty("Content-Type", data.getString(CONTENT_TYPE,"application/json")) connection.setRequestProperty("Accept", "application/json") connection.doInput = true @@ -437,7 +437,7 @@ class OAuthManager { val getUserTokenUrl = URL(url) val connection: HttpURLConnection = getUserTokenUrl.openConnection() as HttpURLConnection connection.requestMethod = "GET" - connection.setRequestProperty("User-Agent", "Peeriscope") + connection.setRequestProperty("User-Agent", message.context.getString(R.string.app_name)) connection.setRequestProperty("Content-Type", "application/json") connection.setRequestProperty("Accept", "application/json") diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 024031f..0e305b0 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,5 +1,5 @@ - Peertube Live + PeerTube Live Aucune connexion internet détecté diff --git a/app/src/test/java/fr/mobdev/peertubelive/ExampleUnitTest.kt b/app/src/test/java/fr/mobdev/peertubelive/ExampleUnitTest.kt index 8f0e8be..cb31ec7 100644 --- a/app/src/test/java/fr/mobdev/peertubelive/ExampleUnitTest.kt +++ b/app/src/test/java/fr/mobdev/peertubelive/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package org.framasoft.peertubelive +package fr.mobdev.peertubelive import org.junit.Test diff --git a/settings.gradle b/settings.gradle index be6e17b..3cdf018 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,4 +3,4 @@ include ':rtplibrary' include ':rtmp' include ':encoder' include ':app' -rootProject.name = "Peeriscope" \ No newline at end of file +rootProject.name = "Peertube Live" \ No newline at end of file