[chore:] big code-cleanup session
This commit is contained in:
+10
-19
@@ -30,15 +30,15 @@ public class CombineAddresses
|
||||
{
|
||||
var result = await Execute(address_lists,type,comb_type,exportUnused);
|
||||
|
||||
if (deleteOld == true)
|
||||
{
|
||||
foreach (var list in address_lists)
|
||||
{
|
||||
Settings._instance.addressSets.addresses.Remove(list);
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
if (deleteOld == true)
|
||||
{
|
||||
foreach (var list in address_lists)
|
||||
{
|
||||
Settings._instance.addressSets.addresses.Remove(list);
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -46,8 +46,6 @@ public class CombineAddresses
|
||||
}
|
||||
|
||||
return (null,null);
|
||||
|
||||
|
||||
}
|
||||
|
||||
private async Task<(KasAddressList, KasAddressList)> Execute(List<KasAddressList> address_lists, string type, CombineType comb_type,
|
||||
@@ -67,7 +65,6 @@ public class CombineAddresses
|
||||
}
|
||||
|
||||
return (null,null);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -144,8 +141,7 @@ public class CombineAddresses
|
||||
result.KasPersons.Add(person);
|
||||
else
|
||||
second_result.KasPersons.Add(person);
|
||||
|
||||
|
||||
|
||||
progress.Increment();
|
||||
if (progress.LogAction == null) continue;
|
||||
var logMessage =
|
||||
@@ -162,7 +158,6 @@ public class CombineAddresses
|
||||
}
|
||||
|
||||
return (null,null);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -211,7 +206,6 @@ public class CombineAddresses
|
||||
}
|
||||
|
||||
return (null,null);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -274,7 +268,6 @@ public class CombineAddresses
|
||||
}
|
||||
|
||||
return (null,null);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -343,9 +336,7 @@ public class CombineAddresses
|
||||
}
|
||||
|
||||
return (null,null);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public class Progress
|
||||
|
||||
Reference in New Issue
Block a user