diff --git a/Source/OEXDBManager.m b/Source/OEXDBManager.m
index fa6888dec8..b08eda4eb0 100644
--- a/Source/OEXDBManager.m
+++ b/Source/OEXDBManager.m
@@ -599,7 +599,7 @@ - (NSArray*)getVideosForDownloadState:(OEXDownloadState)state {
NSMutableArray* filteredArray = [[NSMutableArray alloc] init];
CLS_LOG(@"getVideosForDownloadState: videosForDownloadState...%@", allVideos);
for(VideoData* data in allVideos) {
- if(data && ([data.download_state intValue] == state)) {
+ if(data && [data isKindOfClass:[VideoData class]] && ([data.download_state intValue] == state)) {
[filteredArray addObject:data];
}
}
diff --git a/Source/Resources/WhatsNew/screen_1.png b/Source/Resources/WhatsNew/screen_1.png
index 8b68c029e9..cd791a9cd8 100755
Binary files a/Source/Resources/WhatsNew/screen_1.png and b/Source/Resources/WhatsNew/screen_1.png differ
diff --git a/Source/Resources/WhatsNew/screen_2.png b/Source/Resources/WhatsNew/screen_2.png
index 623a9bbc05..2cf69aa01d 100755
Binary files a/Source/Resources/WhatsNew/screen_2.png and b/Source/Resources/WhatsNew/screen_2.png differ
diff --git a/Source/edX-Info.plist b/Source/edX-Info.plist
index e06cbf2c5d..6923b838ea 100644
--- a/Source/edX-Info.plist
+++ b/Source/edX-Info.plist
@@ -34,7 +34,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.10
+ 2.11
CFBundleSignature
????
CFBundleSpokenName
@@ -53,7 +53,7 @@
CFBundleVersion
- 2.10.0
+ 2.11.2
FIREBASE_ANALYTICS_COLLECTION_ENABLED
FacebookDisplayName
@@ -109,6 +109,8 @@
armv7
+ UIRequiresFullScreen
+
UIStatusBarStyle
UIStatusBarStyleLightContent
UISupportedInterfaceOrientations
diff --git a/Source/en.lproj/whats_new.json b/Source/en.lproj/whats_new.json
index aa60b12080..9af67be17f 100644
--- a/Source/en.lproj/whats_new.json
+++ b/Source/en.lproj/whats_new.json
@@ -1,32 +1,55 @@
- [
- {
- "version": "2.10",
- "messages": [
- {
- "platforms": [
- "ios"
+[
+ {
+ "version": "2.11",
+ "messages": [
+ {
+ "platforms": [
+ "ios",
+ "android"
],
- "image": "screen_1",
- "title": "All Courses Available on Mobile",
- "message": "We've heard you! All courses on platform_name will now be available on mobile."
- },
- {
- "platforms": [
+ "image": "screen_1",
+ "title": "Updated Navigation",
+ "message": "A simplified main menu makes it easier to access and discover courses."
+ },
+ {
+ "platforms": [
+ "ios",
"android"
],
- "image": "screen_1",
- "title": "Videos Being Downloaded",
- "message": "Notification bar will now show the videos being downloaded."
- },
- {
- "platforms": [
+ "image": "screen_2",
+ "title": "Assignment Due Dates",
+ "message": "You can now see due dates for assignments in the course outline."
+ }
+ ]
+ },
+ {
+ "version": "2.10",
+ "messages": [
+ {
+ "platforms": [
"ios",
"android"
],
- "image": "screen_2",
- "title": "Landscape Support",
- "message": "Video player improvements for landscape mode."
- }
- ]
- }
- ]
+ "image": "screen_1",
+ "title": "Videos",
+ "message": "The \"Videos\" tab in each course's menu replaces \"My Videos\" in the main menu. Now you can view all the videos in a course in one place!"
+ },
+ {
+ "platforms": [
+ "android"
+ ],
+ "image": "screen_2",
+ "title": "Delete Videos",
+ "message": "In the list of downloaded course videos, use a long press to select videos that you want to delete."
+ },
+ {
+ "platforms": [
+ "ios"
+ ],
+ "image": "screen_2",
+ "title": "Delete Videos",
+ "message": "Swipe left to delete downloaded videos."
+ }
+ ]
+ }
+ ]
diff --git a/Source/es-419.lproj/whats_new.json b/Source/es-419.lproj/whats_new.json
index aa60b12080..e286458be2 100644
--- a/Source/es-419.lproj/whats_new.json
+++ b/Source/es-419.lproj/whats_new.json
@@ -1,31 +1,54 @@
[
+ {
+ "version": "2.11",
+ "messages": [
+ {
+ "platforms": [
+ "ios",
+ "android"
+ ],
+ "image": "screen_1",
+ "title": "Navegación Actualizada",
+ "message": "Un menú principal simplificado hace que sea más fácil acceder y descubrir cursos."
+ },
+ {
+ "platforms": [
+ "ios",
+ "android"
+ ],
+ "image": "screen_2",
+ "title": "Plazos de Asignación",
+ "message": "Ahora puede ver las fechas límites de las asignaciones en el esquema del curso."
+ }
+ ]
+ },
{
"version": "2.10",
"messages": [
{
"platforms": [
- "ios"
- ],
+ "ios",
+ "android"
+ ],
"image": "screen_1",
- "title": "All Courses Available on Mobile",
- "message": "We've heard you! All courses on platform_name will now be available on mobile."
+ "title": "Videos",
+ "message": "La pestaña \"Videos\" en el menú de cada curso reemplaza \"Mis Videos\" en el menú principal. Ahora puedes ver todos los videos de un curso en un solo lugar!"
},
{
"platforms": [
"android"
],
- "image": "screen_1",
- "title": "Videos Being Downloaded",
- "message": "Notification bar will now show the videos being downloaded."
+ "image": "screen_2",
+ "title": "Borrar Videos",
+ "message": "En la lista de videos de cursos descargados, pulse prolongadamente una vez para seleccionar los videos que desea eliminar."
},
{
"platforms": [
- "ios",
- "android"
+ "ios"
],
"image": "screen_2",
- "title": "Landscape Support",
- "message": "Video player improvements for landscape mode."
+ "title": "Borrar Videos",
+ "message": "Desliza hacia la izquierda para eliminar los videos descargados."
}
]
}
diff --git a/edX.xcodeproj/project.pbxproj b/edX.xcodeproj/project.pbxproj
index 1c6aa4e6ba..333a6b9f4d 100644
--- a/edX.xcodeproj/project.pbxproj
+++ b/edX.xcodeproj/project.pbxproj
@@ -4805,6 +4805,7 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Source/edX-Bridging-Header.h";
SWIFT_VERSION = 3.0;
+ TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = app;
};
name = Profile;
@@ -5230,6 +5231,7 @@
SWIFT_OBJC_BRIDGING_HEADER = "Source/edX-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
+ TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = app;
};
name = Debug;
@@ -5266,6 +5268,7 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Source/edX-Bridging-Header.h";
SWIFT_VERSION = 3.0;
+ TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = app;
};
name = Release;