diff --git a/AlfrescoActiviti/Info.plist b/AlfrescoActiviti/Info.plist
index 4cbaea1f..73167c84 100644
--- a/AlfrescoActiviti/Info.plist
+++ b/AlfrescoActiviti/Info.plist
@@ -21,7 +21,7 @@
CFBundleSignature
????
CFBundleVersion
- 91
+ 92
Fabric
APIKey
diff --git a/AlfrescoActiviti/Resources/Settings.bundle/Root.plist b/AlfrescoActiviti/Resources/Settings.bundle/Root.plist
index e3b83784..f8a6de3a 100755
--- a/AlfrescoActiviti/Resources/Settings.bundle/Root.plist
+++ b/AlfrescoActiviti/Resources/Settings.bundle/Root.plist
@@ -12,7 +12,7 @@
DefaultValue
- 1.1 (91)
+ 1.1 (92)
Key
Prefs_AppVersion
Title
diff --git a/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/AFAModalTaskDetailsViewController.h b/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/AFAModalTaskDetailsViewController.h
index 40f31af3..d8e216fd 100644
--- a/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/AFAModalTaskDetailsViewController.h
+++ b/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/AFAModalTaskDetailsViewController.h
@@ -20,12 +20,6 @@
#import "AFATaskServices.h"
@class ASDKModelTask;
-typedef NS_ENUM(NSInteger, AFAModalTaskDetailsActionType) {
- AFAModalTaskDetailsActionTypeUndefined = -1,
- AFAModalTaskDetailsActionTypeCreate = 0,
- AFAModalTaskDetailsActionTypeUpdate
-};
-
@protocol AFAModalTaskDetailsViewControllerDelegate
@optional
@@ -38,7 +32,6 @@ typedef NS_ENUM(NSInteger, AFAModalTaskDetailsActionType) {
- (void)executeAlertActionWithModel:(id)modelObject
completionBlock:(id)completionBlock;
-- (AFAModalTaskDetailsActionType)actionType;
@end
diff --git a/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/AFAModalTaskDetailsViewController.m b/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/AFAModalTaskDetailsViewController.m
index c73bc444..5ed183f3 100644
--- a/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/AFAModalTaskDetailsViewController.m
+++ b/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/AFAModalTaskDetailsViewController.m
@@ -30,6 +30,9 @@
// Managers
#import "AFAProfileServices.h"
#import "AFAServiceRepository.h"
+#import "AFAModalTaskDetailsCreateTaskAction.h"
+#import "AFAModalTaskDetailsUpdateTaskAction.h"
+#import "AFAModalTaskDetailsCreateChecklistAction.h"
@import ActivitiSDK;
// Models
@@ -198,7 +201,8 @@ - (IBAction)onConfirm:(id)sender {
__strong typeof(self) strongSelf = weakSelf;
if (!error) {
if ([self.confirmAlertAction respondsToSelector:@selector(executeAlertActionWithModel:completionBlock:)]) {
- if (AFAModalTaskDetailsActionTypeCreate == [self.confirmAlertAction actionType]) {
+ if ([self.confirmAlertAction isKindOfClass:[AFAModalTaskDetailsCreateTaskAction class]] ||
+ [self.confirmAlertAction isKindOfClass:[AFAModalTaskDetailsCreateChecklistAction class]]) {
AFATaskCreateModel *taskCreateModel = [AFATaskCreateModel new];
taskCreateModel.taskName = self.nameTextField.text;
taskCreateModel.taskDescription = self.descriptionTextView.text;
@@ -207,7 +211,7 @@ - (IBAction)onConfirm:(id)sender {
[self.confirmAlertAction executeAlertActionWithModel:taskCreateModel
completionBlock:taskDetailsCompletionBlock];
- } else if (AFAModalTaskDetailsActionTypeUpdate == [self.confirmAlertAction actionType]) {
+ } else if ([self.confirmAlertAction isKindOfClass:[AFAModalTaskDetailsUpdateTaskAction class]]) {
AFATaskUpdateModel *taskUpdate = [AFATaskUpdateModel new];
taskUpdate.taskName = self.nameTextField.text;
taskUpdate.taskDescription = self.descriptionTextView.text;
@@ -215,6 +219,7 @@ - (IBAction)onConfirm:(id)sender {
[self.confirmAlertAction executeAlertActionWithModel:taskUpdate
completionBlock:taskDetailsUpdateCompletionBlock];
}
+
}
} else {
[strongSelf.progressHUD dismiss];
diff --git a/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/ModalTaskDetailsCreateChecklistAction/AFAModalTaskDetailsCreateChecklistAction.m b/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/ModalTaskDetailsCreateChecklistAction/AFAModalTaskDetailsCreateChecklistAction.m
index d504cbf7..559e72c6 100644
--- a/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/ModalTaskDetailsCreateChecklistAction/AFAModalTaskDetailsCreateChecklistAction.m
+++ b/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/ModalTaskDetailsCreateChecklistAction/AFAModalTaskDetailsCreateChecklistAction.m
@@ -29,8 +29,4 @@ - (void)executeAlertActionWithModel:(id)modelObject
completionBlock:completionBlock];
}
-- (AFAModalTaskDetailsActionType)actionType {
- return AFAModalTaskDetailsActionTypeCreate;
-}
-
@end
diff --git a/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/ModalTaskDetailsCreateTaskAction/AFAModalTaskDetailsCreateTaskAction.m b/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/ModalTaskDetailsCreateTaskAction/AFAModalTaskDetailsCreateTaskAction.m
index 742e6932..84fb1804 100644
--- a/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/ModalTaskDetailsCreateTaskAction/AFAModalTaskDetailsCreateTaskAction.m
+++ b/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/ModalTaskDetailsCreateTaskAction/AFAModalTaskDetailsCreateTaskAction.m
@@ -28,8 +28,4 @@ - (void)executeAlertActionWithModel:(id)modelObject
completionBlock:completionBlock];
}
-- (AFAModalTaskDetailsActionType)actionType {
- return AFAModalTaskDetailsActionTypeCreate;
-}
-
@end
diff --git a/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/ModalTaskDetailsUpdateTaskAction/AFAModalTaskDetailsUpdateTaskAction.m b/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/ModalTaskDetailsUpdateTaskAction/AFAModalTaskDetailsUpdateTaskAction.m
index a160c1f0..ab4b3120 100644
--- a/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/ModalTaskDetailsUpdateTaskAction/AFAModalTaskDetailsUpdateTaskAction.m
+++ b/AlfrescoActiviti/UI/ViewControllers/ModalTaskDetailsViewController/ModalTaskDetailsUpdateTaskAction/AFAModalTaskDetailsUpdateTaskAction.m
@@ -29,8 +29,4 @@ - (void)executeAlertActionWithModel:(id)modelObject
withCompletionBlock:completionBlock];
}
-- (AFAModalTaskDetailsActionType)actionType {
- return AFAModalTaskDetailsActionTypeUpdate;
-}
-
@end
diff --git a/AlfrescoActiviti/ViewModel/AFAListViewModel/AFATaskListViewModel.m b/AlfrescoActiviti/ViewModel/AFAListViewModel/AFATaskListViewModel.m
index a96422e4..6f60998e 100644
--- a/AlfrescoActiviti/ViewModel/AFAListViewModel/AFATaskListViewModel.m
+++ b/AlfrescoActiviti/ViewModel/AFAListViewModel/AFATaskListViewModel.m
@@ -29,12 +29,9 @@ @implementation AFATaskListViewModel
- (NSString *)noRecordsLabelText {
return NSLocalizedString(kLocalizationListScreenNoTasksAvailableText, @"No tasks available text");
-
- NSLocalizedString(kLocalizationProcessInstanceScreenNoProcessInstancesText, @"No process instances text");
}
- (NSString *)searchTextFieldPlacholderText {
- NSLocalizedString(kLocalizationListScreenProcessInstancesText, @"process instances text");
return [NSString stringWithFormat:NSLocalizedString(kLocalizationListScreenSearchFieldPlaceholderFormat, @"Search bar format"), NSLocalizedString(kLocalizationListScreenTasksText, @"tasks text")];
}