Revision 54037f6f

b/pithos-macos/PithosActivityFacility.m
151 151 
                    default:
152 152 
                        break;
153 153 
                }
154 
                [activity retain];
155 154 
                if (activity.message)
156 155 
                    break;
157 156 
            }
157 
            [activity retain];
158 158 
            [endingActivities removeObjectsInRange:NSMakeRange(0, (index + 1))];
159 159 
            pickedRunning = NO;
160 160 
        } else if (runningActivitiesCount) {
161 161 
            NSUInteger count;
162 162 
            for (count = 0 ; count < runningActivitiesCount; count++) {
163 
                activity = [runningActivities objectAtIndex:0];
163 
                activity = [[runningActivities objectAtIndex:0] retain];
164 164 
                [runningActivities removeObjectAtIndex:0];
165 165 
                [runningActivities addObject:activity];
166 
                if (activity.message)
166 
                if (activity.message) {
167 167 
                    break;
168 
                } else {
169 
                    [activity release];
170 
                    activity = nil;
171 
                }
168 172 
            }
169 
            [activity retain];
170 173 
            pickedRunning = YES;
171 174 
        }
172 175 
        if (activity && activity.message)
b/pithos-macos/PithosSyncDaemon.m
723 723 
            [objectRequest setBytesReceivedBlock:^(unsigned long long size, unsigned long long total){
724 724 
                [activityFacility updateActivity:activity
725 725 
                                     withMessage:[NSString stringWithFormat:@"Sync: Downloading '%@' (%.0f%%)",
726 
                                                  [[objectRequest.userInfo valueForKey:@"pithosObject"] name],
726 
                                                  [[objectRequest.userInfo objectForKey:@"pithosObject"] name],
727 727 
                                                  (100*(activity.currentBytes + size + 0.0)/(activity.totalBytes + 0.0))]
728 728 
                                      totalBytes:activity.totalBytes
729 729 
                                    currentBytes:(activity.currentBytes + size)];
......
915 915 
            objectRequest.didFailSelector = @selector(performRequestFailedDelegateInBackground:);
916 916 
            PithosActivity *activity = [activityFacility startActivityWithType:PithosActivityUpload
917 917 
                                                                       message:[NSString stringWithFormat:@"Sync: Uploading '%@' (0%%)", object.name]
918 
                                                                    totalBytes:[[objectRequest.userInfo valueForKey:@"bytes"] unsignedIntegerValue]
918 
                                                                    totalBytes:[[objectRequest.userInfo objectForKey:@"bytes"] unsignedIntegerValue]
919 919 
                                                                  currentBytes:0];
920 920 
            dispatch_async(dispatch_get_main_queue(), ^{
921 921 
                [activityFacility updateActivity:activity withMessage:activity.message];

Also available in: Unified diff