#def SHARE_IN -> EXTENSION

Libraries external/BKPasscodeView/BKPasscodeInputView.m

@@ -276,7 +276,7 @@
 
 - (CGFloat)labelPasscodeSpace
 {
-#ifdef SHARE_IN
+#ifdef EXTENSION
     return (self.frame.size.width < self.frame.size.height) ? kLabelPasscodeSpacePortrait : kLabelPasscodeSpaceLandscape;
 #else
     return UIInterfaceOrientationIsPortrait([[UIApplication sharedApplication] statusBarOrientation]) ? kLabelPasscodeSpacePortrait : kLabelPasscodeSpaceLandscape;

Libraries external/BKPasscodeView/BKPasscodeLockScreenManager.m

@@ -45,7 +45,7 @@ static BKPasscodeLockScreenManager *_sharedManager;
     }
     
     // get the main window
-#ifndef SHARE_IN
+#ifndef EXTENSION
     self.mainWindow = [[UIApplication sharedApplication] keyWindow];
 
     // dismiss keyboard before showing lock screen

Libraries external/BKPasscodeView/BKPasscodeViewController.m

@@ -383,7 +383,7 @@ typedef enum : NSUInteger {
         return NO;
     }
     
-#ifndef SHARE_IN
+#ifndef EXTENSION
     if ([UIApplication sharedApplication].applicationState == UIApplicationStateInactive) {
         return NO;
     }
@@ -563,7 +563,7 @@ typedef enum : NSUInteger {
     CGRect keyboardRect = [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
 
 /*
-#ifdef SHARE_IN
+#ifdef EXTENSION
     self.keyboardHeight = CGRectGetHeight(keyboardRect);
 #else
     UIInterfaceOrientation statusBarOrientation = [[UIApplication sharedApplication] statusBarOrientation];

Nextcloud.xcodeproj/project.pbxproj

@@ -4304,7 +4304,7 @@
 				GCC_PREFIX_HEADER = "$(SRCROOT)/iOSClient/CryptoCloud.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
-					"SHARE_IN=1",
+					"EXTENSION=1",
 					"NC=1",
 				);
 				HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/Libraries external\"/**";
@@ -4344,7 +4344,7 @@
 				GCC_PREFIX_HEADER = "$(SRCROOT)/iOSClient/CryptoCloud.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
-					"SHARE_IN=1",
+					"EXTENSION=1",
 					"NC=1",
 				);
 				HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/Libraries external\"/**";
@@ -4379,7 +4379,7 @@
 				DEVELOPMENT_TEAM = 6JLRKY9ZV7;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/iOSClient/CryptoCloud.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					"SHARE_IN=1",
+					"EXTENSION=1",
 					"DEBUG=1",
 					"NC=1",
 				);
@@ -4412,7 +4412,7 @@
 				DEVELOPMENT_TEAM = 6JLRKY9ZV7;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/iOSClient/CryptoCloud.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					"SHARE_IN=1",
+					"EXTENSION=1",
 					"NC=1",
 				);
 				HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/Libraries external\"/**";

iOSClient/CCGlobal.h

@@ -41,7 +41,7 @@ extern NSString *const urlBaseUploadDB;
 
 extern NSString *const BKPasscodeKeychainServiceName;
 
-#ifndef SHARE_IN
+#ifndef EXTENSION
 
 //AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
 #define app ((AppDelegate *)[[UIApplication sharedApplication] delegate])

iOSClient/Move/CCMove.m

@@ -23,7 +23,7 @@
 
 #import "CCMove.h"
 
-#ifndef SHARE_IN
+#ifndef EXTENSION
 #import "AppDelegate.h"
 #endif
 

iOSClient/Networking/CCNetworking.m

@@ -341,7 +341,7 @@
         });
     }
 
-#ifndef SHARE_IN
+#ifndef EXTENSION
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^(void) {
         [app updateApplicationIconBadgeNumber];
     });
@@ -677,7 +677,7 @@
         
         if (_currentProgressMetadata) {
  
-#ifndef SHARE_IN
+#ifndef EXTENSION
             // Control Center
             [app.controlCenter progressTask:_currentProgressMetadata.fileID serverUrl:serverUrl cryptated:_currentProgressMetadata.cryptated progress:progress];
         
@@ -723,7 +723,7 @@
 
 - (void)downloadFileSuccessFailure:(NSString *)fileName fileID:(NSString *)fileID rev:(NSString *)rev date:(NSDate *)date serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost errorCode:(NSInteger)errorCode
 {
-#ifndef SHARE_IN
+#ifndef EXTENSION
     if (fileID)
         [app.listProgressMetadata removeObjectForKey:fileID];
 #endif
@@ -1224,7 +1224,7 @@
         
         NSLog(@"[LOG] Error reUploadBackground, file not found.");
         
-#ifndef SHARE_IN
+#ifndef EXTENSION
         UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"_error_", nil) message:NSLocalizedString(@"_no_reuploadfile_", nil) delegate:nil cancelButtonTitle:nil otherButtonTitles:NSLocalizedString(@"_ok_", nil), nil];
         [alertView show];
 #endif
@@ -1392,7 +1392,7 @@
         
         if (_currentProgressMetadata) {
             
-#ifndef SHARE_IN
+#ifndef EXTENSION
             // Control Center
             [app.controlCenter progressTask:_currentProgressMetadata.fileID serverUrl:serverUrl cryptated:_currentProgressMetadata.cryptated progress:progress];
 #endif
@@ -1410,7 +1410,7 @@
     // ERRORE
     if (errorCode != 0) {
         
-#ifndef SHARE_IN
+#ifndef EXTENSION
         if (sessionID)
             [app.listProgressMetadata removeObjectForKey:sessionID];
 #endif
@@ -1464,7 +1464,7 @@
     // ALL TASK DONE (PLAIN/CRYPTO)
     if (metadata.sessionTaskIdentifier == taskIdentifierDone && metadata.sessionTaskIdentifierPlist == taskIdentifierDone) {
         
-#ifndef SHARE_IN
+#ifndef EXTENSION
         if (sessionID)
             [app.listProgressMetadata removeObjectForKey:sessionID];
 #endif
@@ -1720,7 +1720,7 @@
 
 - (void)readFileVerifyUpload:(NSString *)fileName fileNamePrint:(NSString *)fileNamePrint serverUrl:(NSString *)serverUrl
 {
-#ifndef SHARE_IN
+#ifndef EXTENSION
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:_activeAccount];
     
     metadataNet.action = actionReadFile;
@@ -1856,7 +1856,7 @@
     
     if (version == 1) {
         
-#ifdef SHARE_IN
+#ifdef EXTENSION
         MPOAuthCredentialConcreteStore *mpoAuth = [[[CCSharedDBSession sharedDBSession] dBSession] credentialStoreForUserId:_activeUID];
 #else
         MPOAuthCredentialConcreteStore *mpoAuth = [[DBSession sharedSession] credentialStoreForUserId:_activeUID];

iOSClient/Networking/OCNetworking.m

@@ -125,7 +125,7 @@
 
 - (void)poolNetworking
 {
-#ifndef SHARE_IN
+#ifndef EXTENSION
     // Animation network
     if (_activityIndicator) {
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -145,7 +145,7 @@
 
 - (void)complete
 {
-#ifndef SHARE_IN
+#ifndef EXTENSION
     // Animation network
     if (_activityIndicator) {
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
@@ -332,7 +332,7 @@
         // Check items > 0
         if ([items count] == 0) {
             
-#ifndef SHARE_IN
+#ifndef EXTENSION
             [app messageNotification:@"Server error" description:@"Read Folder WebDAV : [items NULL] please fix" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
 #endif
 
@@ -378,7 +378,7 @@
                 
                 // ----- BUG #942 ---------
                 if ([itemDto.etag length] == 0) {
-#ifndef SHARE_IN
+#ifndef EXTENSION
                     [app messageNotification:@"Server error" description:@"Metadata etag absent, record excluded, please fix" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
 #endif
                     continue;
@@ -655,7 +655,7 @@
         // BUG 1038
         if ([items count] == 0) {
        
-#ifndef SHARE_IN
+#ifndef EXTENSION
             [app messageNotification:@"Server error" description:@"Read File WebDAV : [items NULL] please fix" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
 #endif
         }
@@ -720,7 +720,7 @@
 
 - (NSMutableDictionary *)getShareID
 {
-#ifndef SHARE_IN
+#ifndef EXTENSION
     return app.sharesID;
 #endif
     return [NSMutableDictionary new];
@@ -846,7 +846,7 @@
         
     } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
         
-#ifndef SHARE_IN
+#ifndef EXTENSION
         [app messageNotification:@"_error_" description:[CCError manageErrorOC:response.statusCode error:error] visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
 #endif
         
@@ -881,7 +881,7 @@
         
     } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
         
-#ifndef SHARE_IN
+#ifndef EXTENSION
         [app messageNotification:@"_error_" description:[CCError manageErrorOC:response.statusCode error:error] visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
 #endif
         

iOSClient/Utility/CCGraphics.m

@@ -225,7 +225,7 @@
     if (move)
         [[NSFileManager defaultManager] moveItemAtPath:fromPath toPath:toPath error:nil];
 
-#ifndef SHARE_IN
+#ifndef EXTENSION
     if (image && fileID)
         [app.icoImagesCache setObject:image forKey:fileID];
 #endif