add option allowPassive

Cenmrev · Sep 11, 2016 · d3283db · d3283db
1 parent 6495219
commit d3283db
Show file tree

Hide file tree

Showing 6 changed files with 151 additions and 51 deletions.
diff --git a/V2RayX/AppDelegate.h b/V2RayX/AppDelegate.h
@@ -16,7 +16,7 @@
 - (IBAction)chooseGlobalMode:(id)sender;
 - (IBAction)showConfigWindow:(id)sender;
 - (IBAction)editPac:(id)sender;
-- (NSArray*)readDefaultsAsArray;
+//- (NSArray*)readDefaultsAsArray;
 - (NSDictionary*)readDefaultsAsDictionary;
 @property (strong, nonatomic)  NSStatusItem *statusBarItem;
 @property (strong, nonatomic) IBOutlet NSMenu *statusBarMenu;

diff --git a/V2RayX/AppDelegate.m b/V2RayX/AppDelegate.m
@@ -182,7 +182,7 @@ - (void)switchServer:(id)sender {
     [self reloadV2ray];
     [self updateServerMenuList];
 }
-
+/*
 - (NSArray*)readDefaultsAsArray {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSNumber *dProxyState = [defaults objectForKey:@"proxyIsOn"];
@@ -201,6 +201,10 @@ - (NSArray*)readDefaultsAsArray {
     if (dUdpSupport == nil) {
         dUdpSupport = [NSNumber numberWithBool:NO];// do not support udp as default
     }
+    NSNumber* dAllowPassive = [defaults objectForKey:@"allowPassive"];
+    if (dAllowPassive == nil) {
+        dAllowPassive = [NSNumber numberWithBool:YES]; // allow passive as default
+    }
     NSMutableArray *dProfilesInPlist = [defaults objectForKey:@"profiles"];
     NSMutableArray *dProfiles = [[NSMutableArray alloc] init];
     NSNumber *dServerIndex;
@@ -223,7 +227,7 @@ - (NSArray*)readDefaultsAsArray {
         dServerIndex = [NSNumber numberWithInteger:-1];
     }
     return @[dProxyState,dMode,dLocalPort,dUdpSupport,dProfiles,dServerIndex];
-}
+}*/
 
 - (void)readDefaults {
     /*
@@ -287,6 +291,7 @@ - (NSDictionary*)readDefaultsAsDictionary {
             [newProfile setUserId:aProfile[@"userId"]];
             [newProfile setAlterId:[aProfile[@"alterId"] integerValue]];
             [newProfile setRemark:aProfile[@"remark"]];
+            [newProfile setAllowPassive:aProfile[@"allowPassive"]];
             [dProfiles addObject:newProfile];
         }
         dServerIndex = [defaults objectForKey:@"selectedServerIndex"];