[tor-commits] [orbot/master] mark TorService methods from EventHandler as overridden

[n8fr8 at torproject.org]

commit 82f82e1c1032519356b11acaa26206ce02084671
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Tue Jun 9 12:16:17 2015 -0400

    mark TorService methods from EventHandler as overridden
    
    This keeps me from getting confused...
---
 src/org/torproject/android/service/TorService.java |   28 +++++---------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index b119a5e..fad50a8 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -1401,35 +1401,28 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
             startService(intent);                                              
         }
 
-        
-
+    @Override
     public void message(String severity, String msg) {
         
-        
         logNotice(severity + ": " + msg);
           
           if (msg.indexOf(TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE)!=-1)
           {
               mCurrentStatus = STATUS_ON;
               sendCallbackStatus(mCurrentStatus);
-              
 
               showToolbarNotification(getString(R.string.status_activated), NOTIFY_ID, R.drawable.ic_stat_tor);
           }
-        
-          
-          
     }
 
-
+    @Override
     public void newDescriptors(List<String> orList) {
         
     }
 
-
+    @Override
     public void orConnStatus(String status, String orName) {
         
-        
             StringBuilder sb = new StringBuilder();
             sb.append("orConnStatus (");
             sb.append(parseNodeName(orName) );
@@ -1437,10 +1430,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
             sb.append(status);
             
             debug(sb.toString());
-        
     }
 
-
+    @Override
     public void streamStatus(String status, String streamID, String target) {
         
             StringBuilder sb = new StringBuilder();
@@ -1450,10 +1442,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
             sb.append(status);
             
             logNotice(sb.toString());
-        
     }
 
-
+    @Override
     public void unrecognized(String type, String msg) {
         
             StringBuilder sb = new StringBuilder();
@@ -1463,10 +1454,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
             sb.append(msg);
             
             logNotice(sb.toString());
-    
-        
     }
-    
+
+    @Override
     public void bandwidthUsed(long read, long written) {
     
         if (read != lastRead || written != lastWritten)
@@ -1488,15 +1478,12 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
 
             mTotalTrafficWritten += written;
             mTotalTrafficRead += read;
-            
-
         }
         
         lastWritten = written;
         lastRead = read;
         
         sendCallbackStatusMessage(lastWritten, lastRead, mTotalTrafficWritten, mTotalTrafficRead);
-
     }
     
     private String formatCount(long count) {
@@ -1516,7 +1503,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
     
     public void circuitStatus(String status, String circID, String path) {
         
-        
             StringBuilder sb = new StringBuilder();
             sb.append("Circuit (");
             sb.append((circID));