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

- Moved permissions to only ask when required

Browse Source
This commit is contained in:
Stefan Schueller 2018-12-02 14:40:44 +01:00
parent 484de114a4
commit 0cd6972a30
3 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -6,8 +6,8 @@ android {
applicationId "net.schueller.peertube" applicationId "net.schueller.peertube"
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 28 targetSdkVersion 28
versionCode 103 versionCode 104
versionName "1.0.3" versionName "1.0.4"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])

13
app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
View File

@ -214,7 +214,7 @@ public class VideoListActivity extends AppCompatActivity {
if (dy > 0) { if (dy > 0) {
// is at end of list? // is at end of list?
if(!recyclerView.canScrollVertically(RecyclerView.FOCUS_DOWN)){ if (!recyclerView.canScrollVertically(RecyclerView.FOCUS_DOWN)) {
if (!isLoading) { if (!isLoading) {
currentStart = currentStart + count; currentStart = currentStart + count;
loadVideos(currentStart, count, sort, filter); loadVideos(currentStart, count, sort, filter);
@ -279,8 +279,8 @@ public class VideoListActivity extends AppCompatActivity {
/** /**
* Force android to not use SSLv3 * Force android to not use SSLv3
* * <p>
// * @param callingActivity Activity * // * @param callingActivity Activity
*/ */
// private void updateAndroidSecurityProvider(Activity callingActivity) { // private void updateAndroidSecurityProvider(Activity callingActivity) {
// try { // try {
@ -293,12 +293,13 @@ public class VideoListActivity extends AppCompatActivity {
// Log.e("SecurityException", "Google Play Services not available."); // Log.e("SecurityException", "Google Play Services not available.");
// } // }
// } // }
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
// only check when we actually need the permission
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED &&
sharedPref.getBoolean("pref_torrent_player", false)) {
ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0); ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0);
} }
} }

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

@ -49,7 +49,7 @@
<string name="pref_description_show_nsfw">NSFW content will be shown if enabled.</string> <string name="pref_description_show_nsfw">NSFW content will be shown if enabled.</string>
<string name="title_activity_url_video_play">UrlVideoPlayActivity</string> <string name="title_activity_url_video_play">UrlVideoPlayActivity</string>
<string name="pref_title_torrent_player">Torrent Video Player</string> <string name="pref_title_torrent_player">Torrent Video Player</string>
<string name="pref_description_torrent_player">Videos playback via a torrent stream</string> <string name="pref_description_torrent_player">Video playback via a torrent stream. This requires Storage Permissions.</string>
<string name="pref_title_license">License</string> <string name="pref_title_license">License</string>
<string name="pref_description_license">\n<b>GNU Affero General Public License v3.0</b>\n\nPermissions of this strongest copyleft license are conditioned on making available complete source code of licensed works and modifications, which include larger works using a licensed work, under the same license. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. When a modified version is used to provide a service over a network, the complete source code of the modified version must be made available.</string> <string name="pref_description_license">\n<b>GNU Affero General Public License v3.0</b>\n\nPermissions of this strongest copyleft license are conditioned on making available complete source code of licensed works and modifications, which include larger works using a licensed work, under the same license. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. When a modified version is used to provide a service over a network, the complete source code of the modified version must be made available.</string>
<string name="pref_title_version">Version</string> <string name="pref_title_version">Version</string>