Merge pull request #353 from KelvnPere/EMA-352-Unable_to_access_content

Additions of New Tags Permission to Android

.gitignore

@@ -55,7 +55,7 @@ captures/
 .externalNativeBuild
 
 # Google Services (e.g. APIs or Firebase)
-google-services.json
+app/google-services.json
 
 # Freeline
 freeline.py

app/src/main/java/com/razeware/emitron/data/login/LoginRepository.kt

@@ -106,4 +106,17 @@ class LoginRepository @Inject constructor(
    * Get stored permissions
    */
   fun getPermissionsFromPrefs(): List<String> = loginPrefs.getPermissions()
+
+  /**
+   * Check if user has permission to stream personal videos
+   */
+  fun isPersonalVideosPlayback(): Boolean =
+    loginPrefs.getPermissions().contains(PermissionTag.StreamPersonal.param)
+
+  /**
+   * Check if user has Team Videos permission
+   */
+
+   fun isStreamTeamsVideosPlayback():Boolean =
+     loginPrefs.getPermissions().contains(PermissionTag.StreamTeams.param)
 }

app/src/main/java/com/razeware/emitron/ui/collection/CollectionViewModel.kt

@@ -311,6 +311,8 @@ class CollectionViewModel @Inject constructor(
     val collection = _collection.value
     val isCollectionFree = collection?.attributes?.free ?: false
     val isProfessionalContent = collection?.isProfessional()
+    val isPersonalContent = collection?.isPersonal()
+    val isTeamsContent = collection?.isTeams()
     val isDownloaded = collection?.isDownloaded()
 
     return when {
@@ -321,6 +323,21 @@ class CollectionViewModel @Inject constructor(
           permissionActionDelegate.isProfessionalVideoPlaybackAllowed()
         }
       }
+
+      isConnected && isPersonalContent == true ->{
+        if (checkDownloadPermission && isDownloaded()){
+          permissionActionDelegate.isDownloadAllowed()
+        }else{
+          permissionActionDelegate.isPersonalVideosPlaybackAllowed()
+        }
+      }
+      isConnected && isTeamsContent == true ->{
+        if (checkDownloadPermission && isDownloaded()){
+          permissionActionDelegate.isDownloadAllowed()
+        }else{
+          permissionActionDelegate.isSteamTeamsVideoPlaybackAllowed()
+        }
+      }
       !isConnected -> permissionActionDelegate.isDownloadAllowed()
       else -> {
         if (checkDownloadPermission && isDownloaded == true) {

app/src/main/java/com/razeware/emitron/ui/login/PermissionActionDelegate.kt

@@ -33,6 +33,16 @@ interface PermissionsAction {
    */
   fun isBeginnerVideoPlaybackAllowed(): Boolean
 
+  /**
+   * @return true if personal videos can be played, else false
+   */
+  fun isPersonalVideosPlaybackAllowed():Boolean
+
+  /**
+   * @return true if teams videos can be played, else false
+   */
+  fun isSteamTeamsVideoPlaybackAllowed():Boolean
+
   /**
    * LiveData for permission action
    */
@@ -77,7 +87,7 @@ class PermissionActionDelegate @Inject constructor(
     get() = _permissionActionResult
 
   /**
-   * We check if the user is in [BuildConfig.DEBUG] mode to allow contributors
+   * We check if the user is in [Build`Config.DEBUG] mode to allow contributors
    * to use the app (we give them fake permissions).
    *
    * Get permissions for the current logged in user
@@ -120,4 +130,10 @@ class PermissionActionDelegate @Inject constructor(
 
   override fun isBeginnerVideoPlaybackAllowed(): Boolean =
     loginRepository.isBeginnerVideoPlaybackAllowed()
+
+  override fun isPersonalVideosPlaybackAllowed(): Boolean =
+    loginRepository.isPersonalVideosPlayback()
+
+  override fun isSteamTeamsVideoPlaybackAllowed(): Boolean =
+    loginRepository.isStreamTeamsVideosPlayback()
 }

app/src/test/java/com/razeware/emitron/data/login/LoginRepositoryTest.kt

@@ -110,11 +110,24 @@ class LoginRepositoryTest {
   fun hasStreamProPermission() {
     // Given
     whenever(loginPrefs.getPermissions()).doReturn(listOf("stream-professional-videos"))
-
     // Then
     repository.isProfessionalVideoPlaybackAllowed() isEqualTo true
   }
 
+  @Test
+  fun hasPersonalPermission(){
+    whenever(loginPrefs.getPermissions()).doReturn(listOf("stream-personal-videos"))
+
+    repository.isPersonalVideosPlayback() isEqualTo true
+  }
+
+  @Test
+  fun hasTeamsPermission(){
+    whenever(loginPrefs.getPermissions()).doReturn(listOf("stream-team-videos"))
+
+    repository.isStreamTeamsVideosPlayback() isEqualTo true
+  }
+
   @Test
   fun hasStreamProPermission_NoPermission() {
     // Given

model/src/main/java/com/razeware/emitron/model/Attributes.kt

@@ -73,6 +73,16 @@ data class Attributes(
    */
   val professional: Boolean? = null,
 
+  /**
+   * Is content free?
+   */
+  val teams:Boolean? = null,
+
+  /**
+   * Is content free?
+   */
+  val personal:Boolean?= null,
+
   /**
    * Content popularity
    */

model/src/main/java/com/razeware/emitron/model/Data.kt

@@ -105,6 +105,14 @@ data class Data(
    */
   fun isProfessional(): Boolean = attributes?.professional == true
 
+  /**
+   *  @return true if content requires a personal subscription, else false
+   */
+  fun isPersonal(): Boolean = attributes?.personal == true
+
+
+  fun isTeams(): Boolean = attributes?.teams == true
+
   /**
    *  If data represents a progression object
    *

model/src/main/java/com/razeware/emitron/model/PermissionTag.kt

@@ -15,7 +15,21 @@ enum class PermissionTag(val param: String) {
   /**
    * Download allowed
    */
-  Download("download-videos");
+  Download("download-videos"),
+
+  /**
+   * For Teams
+   */
+
+  StreamTeams("stream-team-videos"),
+
+  /**
+   * Personal Videos
+   */
+
+  StreamPersonal("stream-personal-videos");
+
+
 
   companion object {
     /**