Merge branch 'master' into Login

app/build.gradle

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

app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java

@@ -64,44 +64,44 @@ public class VideoListActivity extends AppCompatActivity {
 
     private BottomNavigationViewEx.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
             = item -> {
-                switch (item.getItemId()) {
+        switch (item.getItemId()) {
-                    case R.id.navigation_home:
+            case R.id.navigation_home:
-                        //Log.v(TAG, "navigation_home");
+                //Log.v(TAG, "navigation_home");
 
-                        if (!isLoading) {
+                if (!isLoading) {
-                            sort = "-createdAt";
+                    sort = "-createdAt";
-                            currentStart = 0;
+                    currentStart = 0;
-                            loadVideos(currentStart, count, sort, filter);
+                    loadVideos(currentStart, count, sort, filter);
-                        }
-
-                        return true;
-                    case R.id.navigation_trending:
-                        //Log.v(TAG, "navigation_trending");
-
-                        if (!isLoading) {
-                            sort = "-trending";
-                            currentStart = 0;
-                            loadVideos(currentStart, count, sort, filter);
-                        }
-
-                        return true;
-                    case R.id.navigation_subscriptions:
-                        //Log.v(TAG, "navigation_subscriptions");
-                        Toast.makeText(VideoListActivity.this, "Subscriptions Not Implemented", Toast.LENGTH_SHORT).show();
-
-                        return false;
-
-                    case R.id.navigation_account:
-                        //Log.v(TAG, "navigation_account");
-                        Toast.makeText(VideoListActivity.this, "Account Not Implemented", Toast.LENGTH_SHORT).show();
-
-                        Intent intent = new Intent(this, LoginActivity.class);
-                        this.startActivity(intent);
-
-                        return false;
                 }
+
+                return true;
+            case R.id.navigation_trending:
+                //Log.v(TAG, "navigation_trending");
+
+                if (!isLoading) {
+                    sort = "-trending";
+                    currentStart = 0;
+                    loadVideos(currentStart, count, sort, filter);
+                }
+
+                return true;
+            case R.id.navigation_subscriptions:
+                //Log.v(TAG, "navigation_subscriptions");
+                Toast.makeText(VideoListActivity.this, "Subscriptions Not Implemented", Toast.LENGTH_SHORT).show();
+
                 return false;
-            };
+
+            case R.id.navigation_account:
+                //Log.v(TAG, "navigation_account");
+                Toast.makeText(VideoListActivity.this, "Account Not Implemented", Toast.LENGTH_SHORT).show();
+
+//                Intent intent = new Intent(this, LoginActivity.class);
+//                this.startActivity(intent);
+
+                return false;
+        }
+        return false;
+    };
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -215,7 +215,7 @@ public class VideoListActivity extends AppCompatActivity {
 
                 if (dy > 0) {
                     // is at end of list?
-                    if(!recyclerView.canScrollVertically(RecyclerView.FOCUS_DOWN)){
+                    if (!recyclerView.canScrollVertically(RecyclerView.FOCUS_DOWN)) {
                         if (!isLoading) {
                             currentStart = currentStart + count;
                             loadVideos(currentStart, count, sort, filter);
@@ -280,8 +280,8 @@ public class VideoListActivity extends AppCompatActivity {
 
     /**
      * Force android to not use SSLv3
-     *
+     * <p>
-//     * @param callingActivity Activity
+     * //     * @param callingActivity Activity
      */
 //    private void updateAndroidSecurityProvider(Activity callingActivity) {
 //        try {
@@ -294,12 +294,13 @@ public class VideoListActivity extends AppCompatActivity {
 //            Log.e("SecurityException", "Google Play Services not available.");
 //        }
 //    }
-
     @Override
     protected void 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);
         }
     }

app/src/main/res/layout/activity_video_play.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:keepScreenOn="true"
     tools:context="net.schueller.peertube.activity.VideoPlayActivity">
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

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

@@ -0,0 +1,58 @@
+<resources>
+    <string name="app_name">PeerTube</string>
+
+    <string name="title_activity_video_play">VideoPlayActivity</string>
+    <string name="title_activity_settings">Paramètres</string>
+    <string name="title_activity_login">Connexion</string>
+
+    <!-- Strings related to login -->
+    <string name="prompt_server">Serveur</string>
+    <string name="prompt_email">Email</string>
+    <string name="prompt_password">Mot de passe (optionnel)</string>
+    <string name="action_sign_in">Connexion</string>
+    <string name="action_sign_in_short">Connexion</string>
+    <string name="error_invalid_email">Cette adresse mail n\'est pas valide</string>
+    <string name="error_invalid_password">Ce mot de passe est trop court</string>
+    <string name="error_incorrect_password">Ce mot de passe est incorrect</string>
+    <string name="error_field_required">Ce champs est requis</string>
+    <string name="permission_rationale">"L\'autorisation sur les contacts est requise pour la complétion des adresses email."
+    </string>
+
+    <!-- Action bar -->
+    <string name="action_bar_title_search">Rechercher</string>
+    <string name="action_bar_title_settings">Paramètres</string>
+
+    <!-- Bottom navigation bar -->
+    <string name="bottom_nav_title_home">Accueil</string>
+    <string name="bottom_nav_title_trending">Tendances</string>
+    <string name="bottom_nav_title_subscriptions">Abonnements</string>
+    <string name="bottom_nav_title_account">Compte</string>
+
+    <!-- Strings related to Settings -->
+    <string name="peertube_required_server_version">1.0.0-alpha.7</string>
+
+    <string name="pref_default_api_base_url" formatted="false">https://troll.tv</string>
+    <string name="pref_title_peertube_server">PeerTube Server</string>
+
+
+    <!-- Strings related to Video meta data -->
+    <string name="meta_data_seperator">\u0020-\u0020</string>
+    <string name="meta_data_views">\u0020Views</string>
+    <string name="meta_data_owner_seperator">\@</string>
+
+
+    <string name="video_row_video_thumbnail">Miniature vidéo</string>
+    <string name="video_row_account_avatar">Avatar compte</string>
+
+    <string name="pref_title_show_nsfw">Afficher le contenu adulte</string>
+    <string name="pref_description_show_nsfw">Le contenu adulte sera affiché si activé</string>
+    <string name="title_activity_url_video_play">UrlVideoPlayActivity</string>
+    <string name="pref_title_torrent_player">Lecteur Vidéo Torrent</string>
+    <string name="pref_description_torrent_player">Lecture de vidéo via un flux torrent</string>
+    <string name="pref_title_license">Licence</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="search_hint">Rechercher sur PeerTube</string>
+    <string name="title_activity_search">Rechercher</string>
+
+</resources>

app/src/main/res/values/strings.xml

@@ -49,7 +49,7 @@
     <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="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_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>