From 5bb21188e46eaf2496d041220409416562a43a00 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 5 Jun 2019 09:20:00 +0100
Subject: [PATCH 1/1] Fix rubocop warning

---
 .rubocop_todo.yml   |  7 -------
 app/models/trace.rb | 15 +++++++++------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 342275040..76a4cada2 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -100,13 +100,6 @@ Naming/PredicateName:
     - 'app/models/user.rb'
     - 'lib/classic_pagination/pagination.rb'
 
-# Offense count: 1
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/ActiveRecordOverride:
-  Exclude:
-    - 'app/models/trace.rb'
-
 # Offense count: 6
 # Configuration parameters: Database, Include.
 # SupportedDatabases: mysql, postgresql
diff --git a/app/models/trace.rb b/app/models/trace.rb
index af2c0af3b..7c97b4e96 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -43,12 +43,7 @@ class Trace < ActiveRecord::Base
   validates :timestamp, :presence => true
   validates :visibility, :inclusion => %w[private public trackable identifiable]
 
-  def destroy
-    super
-    FileUtils.rm_f(trace_name)
-    FileUtils.rm_f(icon_picture_name)
-    FileUtils.rm_f(large_picture_name)
-  end
+  after_destroy :remove_files
 
   def tagstring
     tags.collect(&:tag).join(", ")
@@ -343,4 +338,12 @@ class Trace < ActiveRecord::Base
 
     gpx
   end
+
+  private
+
+  def remove_files
+    FileUtils.rm_f(trace_name)
+    FileUtils.rm_f(icon_picture_name)
+    FileUtils.rm_f(large_picture_name)
+  end
 end
-- 
2.43.2