|
|
@ -383,7 +383,7 @@ public class CacheImporter @Inject constructor( |
|
|
|
|
|
|
|
|
|
|
|
if (overwrite) { |
|
|
|
if (overwrite) { |
|
|
|
newName = name |
|
|
|
newName = name |
|
|
|
} else if (oldName != null && name != null) { |
|
|
|
} else if (oldName != null && name != null && oldName != name) { |
|
|
|
newName = "$oldName/$name" |
|
|
|
newName = "$oldName/$name" |
|
|
|
} else if (oldName != null) { |
|
|
|
} else if (oldName != null) { |
|
|
|
newName = oldName |
|
|
|
newName = oldName |
|
|
@ -393,7 +393,7 @@ public class CacheImporter @Inject constructor( |
|
|
|
|
|
|
|
|
|
|
|
if (overwrite) { |
|
|
|
if (overwrite) { |
|
|
|
newDescription = description |
|
|
|
newDescription = description |
|
|
|
} else if (oldDescription != null && description != null) { |
|
|
|
} else if (oldDescription != null && description != null && oldDescription != description) { |
|
|
|
newDescription = "$oldDescription\n\n$description" |
|
|
|
newDescription = "$oldDescription\n\n$description" |
|
|
|
} else if (oldDescription != null) { |
|
|
|
} else if (oldDescription != null) { |
|
|
|
newDescription = oldDescription |
|
|
|
newDescription = oldDescription |
|
|
|