Peertube
/
TubeLab-App-Android
mirror of https://framagit.org/tom79/fedilab-tube
1
0
Fork 0
Code Issues Releases Wiki Activity

Release 1.4.1

This commit is contained in:
Thomas 2020-10-11 17:21:45 +02:00
parent 5872f5c99f
commit 62af5c54aa
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ android {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 15 versionCode 16
versionName "1.4.0" versionName "1.4.1"
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

2
app/src/fdroid_acad/play/release-notes/en-US/default.txt
View File

@ -1 +1 @@
- Quelques améliorations - Corrige un bug lors de la connexion

4
app/src/fdroid_full/play/release-notes/en-US/default.txt
View File

@ -1,3 +1 @@
- Sepia search - Fix an issue with the authentication of some accounts
- Some fixes with overlay
- Fix issue when changing the instance

3
app/src/main/java/app/fedilab/fedilabtube/LoginActivity.java
View File

@ -134,6 +134,7 @@ public class LoginActivity extends AppCompatActivity {
String[] emailArray = login_uid.getText().toString().split("@"); String[] emailArray = login_uid.getText().toString().split("@");
if (emailArray.length > 1 && !Arrays.asList(Helper.valideEmails).contains(emailArray[1])) { if (emailArray.length > 1 && !Arrays.asList(Helper.valideEmails).contains(emailArray[1])) {
Toasty.error(LoginActivity.this, getString(R.string.email_error_domain, emailArray[1])).show(); Toasty.error(LoginActivity.this, getString(R.string.email_error_domain, emailArray[1])).show();
connectionButton.setEnabled(true);
return; return;
} }
host = emailArray[1]; host = emailArray[1];
@ -141,6 +142,7 @@ public class LoginActivity extends AppCompatActivity {
} else { } else {
if (login_instance == null || login_instance.getText() == null || login_instance.getText().toString().trim().length() == 0) { if (login_instance == null || login_instance.getText() == null || login_instance.getText().toString().trim().length() == 0) {
Toasty.error(LoginActivity.this, getString(R.string.not_valide_instance)).show(); Toasty.error(LoginActivity.this, getString(R.string.not_valide_instance)).show();
connectionButton.setEnabled(true);
return; return;
} }
instance = host = login_instance.getText().toString().trim().toLowerCase(); instance = host = login_instance.getText().toString().trim().toLowerCase();
@ -215,6 +217,7 @@ public class LoginActivity extends AppCompatActivity {
} catch (Error error) { } catch (Error error) {
Error.displayError(LoginActivity.this, error); Error.displayError(LoginActivity.this, error);
error.printStackTrace(); error.printStackTrace();
runOnUiThread(() -> connectionButton.setEnabled(true));
} }
} }
}).start(); }).start();

16
app/src/main/java/app/fedilab/fedilabtube/MainActivity.java
View File

@ -226,14 +226,16 @@ public class MainActivity extends AppCompatActivity {
editor.putString(Helper.PREF_KEY_NAME, account.getUsername()); editor.putString(Helper.PREF_KEY_NAME, account.getUsername());
//Sync languages from server //Sync languages from server
List<String> videoLanguageServer = userMe.getVideoLanguages(); List<String> videoLanguageServer = userMe.getVideoLanguages();
Set<String> videoLanguageServerSet = new TreeSet<>(videoLanguageServer); if( videoLanguageServer != null) {
videoLanguageServerSet.addAll(videoLanguageServer); Set<String> videoLanguageServerSet = new TreeSet<>(videoLanguageServer);
Set<String> videoLanguageLocal = sharedpreferences.getStringSet(getString(R.string.set_video_language_choice), null); videoLanguageServerSet.addAll(videoLanguageServer);
if (videoLanguageServerSet.size() > 0 && videoLanguageLocal != null) { Set<String> videoLanguageLocal = sharedpreferences.getStringSet(getString(R.string.set_video_language_choice), null);
videoLanguageServer.addAll(videoLanguageLocal); if (videoLanguageServerSet.size() > 0 && videoLanguageLocal != null) {
videoLanguageServer.addAll(videoLanguageLocal);
}
editor.putStringSet(getString(R.string.set_video_language_choice), videoLanguageServerSet);
editor.apply();
} }
editor.putStringSet(getString(R.string.set_video_language_choice), videoLanguageServerSet);
editor.apply();
} }
} catch (Error error) { } catch (Error error) {
error.printStackTrace(); error.printStackTrace();