greg/thorium-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #203 from sschueller/develop

Browse Source 
fix https://github.com/sschueller/peertube-android/issues/202
This commit is contained in:
Stefan Schüller 2020-07-04 22:37:14 +02:00 committed by GitHub
commit b9eeb06b5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
### Version 1.0.43 Tag: v1.0.43 (2020-07-04)
* Fix back button issue
### Version 1.0.42 Tag: v1.0.42 (2020-07-04) ### Version 1.0.42 Tag: v1.0.42 (2020-07-04)
* Added appbar at the top of the SettingsActivity (@Poslovitch) * Added appbar at the top of the SettingsActivity (@Poslovitch)
* Improved and added some French translations (@Poslovitch) * Improved and added some French translations (@Poslovitch)

4
app/build.gradle
View File

@ -6,8 +6,8 @@ android {
applicationId "net.schueller.peertube" applicationId "net.schueller.peertube"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 1042 versionCode 1043
versionName "1.0.42" versionName "1.0.43"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ext { ext {
libVersions = [ libVersions = [

9
app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
View File

@ -415,6 +415,10 @@ public class VideoPlayActivity extends AppCompatActivity {
} }
String backgroundBehavior = sharedPref.getString("pref_background_behavior","backgroundStop"); String backgroundBehavior = sharedPref.getString("pref_background_behavior","backgroundStop");
// Log.v(TAG,"backgroundBehavior: " + backgroundBehavior);
switch (backgroundBehavior){ switch (backgroundBehavior){
case "backgroundStop": case "backgroundStop":
Log.v(TAG,"stop the video"); Log.v(TAG,"stop the video");
@ -440,6 +444,11 @@ public class VideoPlayActivity extends AppCompatActivity {
super.onBackPressed(); super.onBackPressed();
} }
break; break;
default:
// Deal with bad entries from older version
Log.v(TAG,"No setting, fallback");
super.onBackPressed();
break;
} }
Log.v(TAG, "onBackPressed()..."); Log.v(TAG, "onBackPressed()...");
} }