Skip to content

Commit 6bf788a

Browse files
Sab44Sab44
committed
switch to API key auth
* TODO: update translations
1 parent dce5d64 commit 6bf788a

19 files changed

Lines changed: 43 additions & 43 deletions

File tree

‎app/src/main/java/org/pyload/android/client/pyLoadApp.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
import org.pyload.android.client.module.TaskQueue;
2424
import org.pyload.android.openapi.ApiClient;
2525
import org.pyload.android.openapi.api.PyLoadRestApi;
26+
import org.pyload.android.openapi.auth.ApiKeyAuth;
2627
import org.pyload.android.openapi.auth.HttpBasicAuth;
28+
import org.pyload.android.openapi.models.ServerStatus;
2729

2830
import javax.net.ssl.*;
2931

@@ -73,8 +75,7 @@ private boolean checkAuth() {
7375
// replace protocol, some user also enter it
7476
String host = prefs.getString("host", "10.0.2.2").replaceFirst("^[a-zA-z]+://", "");
7577
int port = Integer.parseInt(prefs.getString("port", "8000"));
76-
String username = prefs.getString("username", "User");
77-
String password = prefs.getString("password", "pwhere");
78+
String apiKey = prefs.getString("api_key", "");
7879

7980
ApiClient apiClient = new ApiClient();
8081
apiClient.getOkBuilder()
@@ -120,14 +121,14 @@ private boolean checkAuth() {
120121

121122
boolean authSuccessful;
122123
try {
123-
HttpBasicAuth basic_auth = new HttpBasicAuth();
124-
basic_auth.setCredentials(username, password);
125-
apiClient.addAuthorization("basicAuth", basic_auth);
124+
ApiKeyAuth apiKeyAuth = new ApiKeyAuth("header", "X-API-Key");
125+
apiKeyAuth.setApiKey(apiKey);
126+
apiClient.addAuthorization("ApiKeyAuth", apiKeyAuth);
126127

127128
PyLoadRestApi pyLoadRestApi = apiClient.createService(PyLoadRestApi.class);
128129

129-
Response<Map<String, Object>> checkAuth = pyLoadRestApi.apiCheckAuthGet(username, password).execute();
130-
authSuccessful = checkAuth.isSuccessful();
130+
Response<ServerStatus> serverStatus = pyLoadRestApi.apiStatusServerGet().execute();
131+
authSuccessful = serverStatus.isSuccessful();
131132
if (authSuccessful) {
132133
client = pyLoadRestApi;
133134
}

‎app/src/main/res/values-ar/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<string name="ip_desc">عنوان IP او اسم المضيف لمصدر باي لود البعيد.</string>
2222
<string name="port">المنفذ</string>
2323
<string name="port_desc">المنفذ لPyloadBackend اللذي وضعتة في الجزء البعيد.</string>
24-
<string name="username">اسم المستخدم</string>
25-
<string name="username_desc">اسم المستخدم الذي استخدمتة لتسجيل الدخول.</string>
24+
<string name="api_key">اسم المستخدم</string>
25+
<string name="api_key_desc">اسم المستخدم الذي استخدمتة لتسجيل الدخول.</string>
2626
<string name="password">كلمة المرور</string>
2727
<string name="login">تسجيل الدخول</string>
2828
<string name="pref_name">خيارات - باي لود</string>

‎app/src/main/res/values-de/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<string name="ip_desc">IP oder Hostname des pyLoad Servers.</string>
2222
<string name="port">Port</string>
2323
<string name="port_desc">Der Port des PyloadBackend, den sie in den Servereinstellungen gesetzt haben.</string>
24-
<string name="username">Benutzername</string>
25-
<string name="username_desc">Der Benutzername den sie zum Anmelden verwenden.</string>
24+
<string name="api_key">Benutzername</string>
25+
<string name="api_key_desc">Der Benutzername den sie zum Anmelden verwenden.</string>
2626
<string name="password">Passwort</string>
2727
<string name="login">Anmeldung</string>
2828
<string name="pref_name">pyLoad - Einstellungen</string>

‎app/src/main/res/values-el/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<string name="ip_desc">Διεύθυνση IP ή όνομα κεντρικού υπολογιστή του απομακρυσμένου πυρήνα pyLoad.</string>
2222
<string name="port">Θύρα</string>
2323
<string name="port_desc">Η θύρα του PyloadBackend που ορίσατε στην ενότητα απομακρυσμένων ρυθμίσεων.</string>
24-
<string name="username">Όνομα Χρήστη</string>
25-
<string name="username_desc">Το όνομα χρήστη που χρησιμοποιείτε για να συνδεθείτε.</string>
24+
<string name="api_key">Όνομα Χρήστη</string>
25+
<string name="api_key_desc">Το όνομα χρήστη που χρησιμοποιείτε για να συνδεθείτε.</string>
2626
<string name="password">Κωδικός πρόσβασης</string>
2727
<string name="login">Σύνδεση</string>
2828
<string name="pref_name">pyLoad - Προτιμήσεις</string>

‎app/src/main/res/values-es/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<string name="ip_desc">IP o nombre del equipo del núcleo de pyLoad remoto.</string>
2222
<string name="port">Puerto</string>
2323
<string name="port_desc">El puerto del PyloadBackend establecido en la sección remoto.</string>
24-
<string name="username">Usuario</string>
25-
<string name="username_desc">Tu nombre de usuario que usas para iniciar sesión.</string>
24+
<string name="api_key">Usuario</string>
25+
<string name="api_key_desc">Tu nombre de usuario que usas para iniciar sesión.</string>
2626
<string name="password">Contraseña</string>
2727
<string name="login">Iniciar sesión</string>
2828
<string name="pref_name">pyLoad - Preferencias</string>

‎app/src/main/res/values-fr/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<string name="ip_desc">IP ou nom de l\'hôte de l\'accès à distance du centre pyLoad.</string>
2222
<string name="port">Port</string>
2323
<string name="port_desc">Le port du PyloadBackend que vous avez spécifié dans la connexion à distance.</string>
24-
<string name="username">Nom utilisateur</string>
25-
<string name="username_desc">Le nom d\'utilisateur que vous utilisez pour vous connecter.</string>
24+
<string name="api_key">Nom utilisateur</string>
25+
<string name="api_key_desc">Le nom d\'utilisateur que vous utilisez pour vous connecter.</string>
2626
<string name="password">Mot de passe</string>
2727
<string name="login">Identifiant</string>
2828
<string name="pref_name">pyLoad - Préférences</string>

‎app/src/main/res/values-hu/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<string name="ip_desc">A távoli pyLoad Core IP vagy host címe.</string>
2222
<string name="port">Port</string>
2323
<string name="port_desc">A PyloadBackend szerver port-ja, ami a távoli elérésnél van beállítva.</string>
24-
<string name="username">Felhasználónév</string>
25-
<string name="username_desc">A felhasználói név amit a belépéshez használ.</string>
24+
<string name="api_key">Felhasználónév</string>
25+
<string name="api_key_desc">A felhasználói név amit a belépéshez használ.</string>
2626
<string name="password">Jelszó</string>
2727
<string name="login">Bejelentkezés</string>
2828
<string name="pref_name">pyLoad - Beállítások</string>

‎app/src/main/res/values-it/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<string name="ip_desc">IP o nome host del Core pyLoad remoto.</string>
2222
<string name="port">Porta</string>
2323
<string name="port_desc">La porta del PyloadBackend che hai impostato nella sezione remoto.</string>
24-
<string name="username">Nome utente</string>
25-
<string name="username_desc">Il nome utente che usi per il login.</string>
24+
<string name="api_key">Nome utente</string>
25+
<string name="api_key_desc">Il nome utente che usi per il login.</string>
2626
<string name="password">Password</string>
2727
<string name="login">Login</string>
2828
<string name="pref_name">pyLoad - Preferenze</string>

‎app/src/main/res/values-iw/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<string name="ip_desc">IP או hostname של שרת pyLoad המרוחק.</string>
2121
<string name="port">פורט</string>
2222
<string name="port_desc">הפורט של ה- PyloadBackend שקבעת בהגדרות מרוחקות.</string>
23-
<string name="username">שם משתמש</string>
24-
<string name="username_desc">שם המשתמש שבו אתה משתמש כדי להתחבר.</string>
23+
<string name="api_key">שם משתמש</string>
24+
<string name="api_key_desc">שם המשתמש שבו אתה משתמש כדי להתחבר.</string>
2525
<string name="password">סיסמה</string>
2626
<string name="login">התחברות</string>
2727
<string name="pref_name">pyLoad - העדפות</string>

‎app/src/main/res/values-ja/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<string name="ip_desc">リモート pyLoad コアのIp アドレスまたはホスト名。</string>
2222
<string name="port">ポート</string>
2323
<string name="port_desc">リモートのセクションで設定した PyloadBackend のポート。</string>
24-
<string name="username">ユーザー名</string>
25-
<string name="username_desc">あなたのユーザー名を使用してログインします。</string>
24+
<string name="api_key">ユーザー名</string>
25+
<string name="api_key_desc">あなたのユーザー名を使用してログインします。</string>
2626
<string name="password">パスワード</string>
2727
<string name="login">ログイン</string>
2828
<string name="pref_name">pyLoad - 設定</string>

0 commit comments

Comments
 (0)