Completed Backup service + lint fixes

codimoc · codimoc · commit d872cec63102 · 2016-05-05T08:35:13.000+01:00
diff --git a/app/src/androidTest/java/com/prismaqf/callblocker/EditFiltersTest.java b/app/src/androidTest/java/com/prismaqf/callblocker/EditFiltersTest.java
@@ -42,14 +42,14 @@
 @RunWith(AndroidJUnit4.class)
 public class EditFiltersTest {
 
-    private static String FILTER_NAME = "dummy filter";
-    private static String FILTER_NAME_2 = "My filter with existing rules";
-    private static String CAL_RULE = "cal rule";
-    private static String PATTERNS_RULE = "patterns rule";
-    private static String ACTION_NAME = "action name";
-    private static String TEST_CAL_RULE = "My calendar rule for testing";
-    private static String TEST_PAT_RULE = "My filter rule for testing";
-    private static String NEW_RULE = "New rule";
+    private static final String FILTER_NAME = "dummy filter";
+    private static final String FILTER_NAME_2 = "My filter with existing rules";
+    private static final String CAL_RULE = "cal rule";
+    private static final String PATTERNS_RULE = "patterns rule";
+    private static final String ACTION_NAME = "action name";
+    private static final String TEST_CAL_RULE = "My calendar rule for testing";
+    private static final String TEST_PAT_RULE = "My filter rule for testing";
+    private static final String NEW_RULE = "New rule";
     @ClassRule
     public static final DebugDBFileName myDebugDB = new DebugDBFileName();
 
diff --git a/app/src/androidTest/java/com/prismaqf/callblocker/FilterCreationTest.java b/app/src/androidTest/java/com/prismaqf/callblocker/FilterCreationTest.java
@@ -35,8 +35,8 @@
 @RunWith(AndroidJUnit4.class)
 public class FilterCreationTest {
 
-    private static String CAL_RULE = "my calendar rule";
-    private static String FIL_RULE = "my filter rule";
+    private static final String CAL_RULE = "my calendar rule";
+    private static final String FIL_RULE = "my filter rule";
 
     @ClassRule
     public static final DebugDBFileName myDebugDB = new DebugDBFileName();
diff --git a/app/src/androidTest/java/com/prismaqf/callblocker/utils/DebugDBFileName.java b/app/src/androidTest/java/com/prismaqf/callblocker/utils/DebugDBFileName.java
@@ -13,7 +13,7 @@ public class DebugDBFileName extends ExternalResource {
 
     static class MyKey extends DebugKey {}
 
-    private MyKey myKey = new MyKey();
+    private final MyKey myKey = new MyKey();
 
     @Override
     protected void before() throws Throwable {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
     <application
         android:allowBackup="true"
         android:backupAgent=".utils.BackupAgent"
+        android:fullBackupContent="@xml/backupscheme"
         android:icon="@mipmap/police_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
diff --git a/app/src/main/java/com/prismaqf/callblocker/CallBlockerManager.java b/app/src/main/java/com/prismaqf/callblocker/CallBlockerManager.java
@@ -24,6 +24,8 @@
 import android.widget.TextView;
 import android.widget.ToggleButton;
 
+import java.util.Locale;
+
 public class CallBlockerManager extends AppCompatActivity {
 
     private static final String TAG = CallBlockerManager.class.getCanonicalName();
@@ -63,7 +65,8 @@ public void onReceive(Context context, Intent intent) {
             String number = intent.getStringExtra(context.getString(R.string.ky_number_called));
             int numReceived = intent.getIntExtra(context.getString(R.string.ky_received), 0);
             int numTriggered = intent.getIntExtra(context.getString(R.string.ky_triggered), 0);
-            String message = String.format("Incoming: %s, Num received: %d, Num triggered: %d",
+            String message = String.format(Locale.getDefault(),
+                                           "Incoming: %s, Num received: %d, Num triggered: %d",
                                            number, numReceived, numTriggered);
             Log.i(TAG,message);
 
diff --git a/app/src/main/java/com/prismaqf/callblocker/CallHelper.java b/app/src/main/java/com/prismaqf/callblocker/CallHelper.java
@@ -24,6 +24,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Helper class to detect incoming and outgoing calls
@@ -148,8 +149,8 @@ protected Void doInBackground(Context... ctxs) {
                 Log.e(TAG, e.getMessage());
             } finally {
                 String msg = myFilters.size() > 1 ?
-                        String.format("%d filters loaded", myFilters.size()):
-                        String.format("%d filter loaded", myFilters.size());
+                        String.format(Locale.getDefault(),"%d filters loaded", myFilters.size()):
+                        String.format(Locale.getDefault(),"%d filter loaded", myFilters.size());
                 Log.i(TAG,msg);
                 if (db != null) db.close();
             }
@@ -160,8 +161,8 @@ protected Void doInBackground(Context... ctxs) {
         protected void onPostExecute (Void v) {
             if (myContext==null) return;
             String msg = myFilters.size() > 1 ?
-                    String.format("%d filters loaded", myFilters.size()):
-                    String.format("%d filter loaded", myFilters.size());
+                    String.format(Locale.getDefault(),"%d filters loaded", myFilters.size()):
+                    String.format(Locale.getDefault(),"%d filter loaded", myFilters.size());
             Toast.makeText(myContext, msg, Toast.LENGTH_LONG).show();
         }
     }
@@ -183,7 +184,7 @@ protected Integer doInBackground(Context... ctxs) {
                 Log.e(TAG, e.getMessage());
             } finally {
                 String msg = purged > 0  ?
-                        String.format("%d service run records purged", purged):
+                        String.format(Locale.getDefault(),"%d service run records purged", purged):
                         "No service run records purged";
                 Log.i(TAG,msg);
                 if (db != null) db.close();
@@ -195,7 +196,7 @@ protected Integer doInBackground(Context... ctxs) {
         protected void onPostExecute (Integer purged) {
             if (myContext==null) return;
             String msg = purged > 0  ?
-                    String.format("%d service run records purged", purged):
+                    String.format(Locale.getDefault(),"%d service run records purged", purged):
                     "No service run records purged";
             Toast.makeText(myContext, msg, Toast.LENGTH_LONG).show();
         }
@@ -307,7 +308,7 @@ public void loadFilters(final Context context) {
         new LoadFilters().execute(context);
     }
 
-    public void purgeLogs(final Context context) {
+    private void purgeLogs(final Context context) {
         new PurgeLogs().execute(context);
     }
 
diff --git a/app/src/main/java/com/prismaqf/callblocker/NewEditCalendarRule.java b/app/src/main/java/com/prismaqf/callblocker/NewEditCalendarRule.java
@@ -5,6 +5,7 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.TimePickerDialog;
+import android.app.backup.BackupManager;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
@@ -141,7 +142,8 @@ protected CalendarRule doInBackground(CalendarRule... rules) {
                 }
             }
             finally {
-                db.close();    
+                db.close();
+                BackupManager.dataChanged(NewEditCalendarRule.this.getPackageName());
             }
             return rule;
         }
@@ -359,7 +361,7 @@ public void onCheckDay(View view) {
 
 
     @Override
-    protected void refreshWidgets(boolean validate) {
+    void refreshWidgets(boolean validate) {
         ed_name.setText(ptRule.getName());
         cb_Monday.setChecked(ptRule.getDayMask().contains(CalendarRule.DayOfWeek.MONDAY));
         cb_Tuesday.setChecked(ptRule.getDayMask().contains(CalendarRule.DayOfWeek.TUESDAY));
diff --git a/app/src/main/java/com/prismaqf/callblocker/NewEditFilter.java b/app/src/main/java/com/prismaqf/callblocker/NewEditFilter.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.backup.BackupManager;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
@@ -62,6 +63,7 @@ protected Void doInBackground(FilterHandle... filters) {
             }
             finally {
                 db.close();
+                BackupManager.dataChanged(NewEditFilter.this.getPackageName());
             }
             return null;
         }
@@ -428,7 +430,7 @@ protected void enableWidgets(boolean nameFlag, boolean widgetFlag) {
     }
 
     @Override
-    protected void refreshWidgets(boolean validate) {
+    void refreshWidgets(boolean validate) {
         ed_name.setText(ptFilter.getName());
         tv_calendar_name.setText(String.format("%s %s", getString(R.string.tx_calendar_rule_name), ptFilter.getCalendarRuleName()));
         tv_paterns_name.setText(String.format("%s %s", getString(R.string.tx_filter_rule_name), ptFilter.getFilterRuleName()));
diff --git a/app/src/main/java/com/prismaqf/callblocker/NewEditFilterRule.java b/app/src/main/java/com/prismaqf/callblocker/NewEditFilterRule.java
@@ -26,6 +26,7 @@
 import com.prismaqf.callblocker.sql.FilterRuleProvider;
 
 import java.util.ArrayList;
+import java.util.Locale;
 
 /**
  * Class to create and edit a filter rule
@@ -196,7 +197,7 @@ public void afterTextChanged(Editable s) {
     private String makeRuleDescription() {
         StringBuilder builder = new StringBuilder("Patterns in rule. ");
         if (ptRule!=null) {
-            builder.append(String.format("Total of %d\n",ptRule.getPatternKeys().size()));
+            builder.append(String.format(Locale.getDefault(),"Total of %d\n",ptRule.getPatternKeys().size()));
             int i=0;
             for (String p : ptRule.getPatternKeys()){
                 builder.append(p);
@@ -372,7 +373,7 @@ protected void enableWidgets(boolean nameFlag, boolean widgetFlag) {
     }
 
     @Override
-    protected void refreshWidgets(boolean validate) {
+    void refreshWidgets(boolean validate) {
         ed_name.setText(ptRule.getName());
         ed_description.setText(ptRule.getDescription());
         tv_patterns.setText(makeRuleDescription());
diff --git a/app/src/main/java/com/prismaqf/callblocker/rules/CalendarRule.java b/app/src/main/java/com/prismaqf/callblocker/rules/CalendarRule.java
@@ -69,13 +69,13 @@ public void setEndMin(int endMin) {
         this.endMin = endMin;
     }
 
-    public String getStartTime() { return String.format("From %02d:%02d",startHour, startMin);}
+    public String getStartTime() { return String.format(Locale.getDefault(),"From %02d:%02d",startHour, startMin);}
 
-    public String getBareStartTime() { return String.format("%02d:%02d",startHour, startMin);}
+    public String getBareStartTime() { return String.format(Locale.getDefault(),"%02d:%02d",startHour, startMin);}
 
-    public String getEndTime() { return String.format("To %02d:%02d",endHour, endMin);}
+    public String getEndTime() { return String.format(Locale.getDefault(),"To %02d:%02d",endHour, endMin);}
 
-    public String getBareEndTime() { return String.format("%02d:%02d",endHour, endMin);}
+    public String getBareEndTime() { return String.format(Locale.getDefault(),"%02d:%02d",endHour, endMin);}
 
     /**
      * A calendar rule based on a mask for the days of the week when the rule should be active
@@ -269,7 +269,7 @@ public String toString() {
         else buffer.append('-');
         if (dayMask.contains(DayOfWeek.SUNDAY)) buffer.append('S');
         else buffer.append('-');
-        buffer.append(String.format(", from %02d:%02d to %02d:%02d]",startHour,startMin,endHour,endMin));
+        buffer.append(String.format(Locale.getDefault(),", from %02d:%02d to %02d:%02d]",startHour,startMin,endHour,endMin));
         return buffer.toString();
     }
 
diff --git a/app/src/main/java/com/prismaqf/callblocker/rules/FilterRule.java b/app/src/main/java/com/prismaqf/callblocker/rules/FilterRule.java
@@ -4,6 +4,7 @@
 import android.os.Parcelable;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -152,7 +153,7 @@ public synchronized boolean Matches(String number) {
 
     @Override
     public String toString() {
-        return String.format("Rule %s [description = %s, total number of patterns = %d]",name,description,patterns.size());
+        return String.format(Locale.getDefault(),"Rule %s [description = %s, total number of patterns = %d]",name,description,patterns.size());
     }
 
     @Override
diff --git a/app/src/main/java/com/prismaqf/callblocker/sql/DbHelper.java b/app/src/main/java/com/prismaqf/callblocker/sql/DbHelper.java
@@ -15,6 +15,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Helper class extending SQLiteOpenHelper to manage the DB in Android fashion
@@ -68,7 +69,7 @@ public void onCreate(SQLiteDatabase db) {
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         synchronized (lock) {
-            String msg = String.format("The DB version has changed from v.%d to v.%d and a destructive upgrade (drop/recreate) is performed",oldVersion,newVersion);
+            String msg = String.format(Locale.getDefault(),"The DB version has changed from v.%d to v.%d and a destructive upgrade (drop/recreate) is performed",oldVersion,newVersion);
             Log.w(TAG, msg);
 
             Cursor c = ServiceRunProvider.LatestRuns(db, -1, false);
diff --git a/app/src/main/java/com/prismaqf/callblocker/sql/ServiceRunProvider.java b/app/src/main/java/com/prismaqf/callblocker/sql/ServiceRunProvider.java
@@ -129,7 +129,7 @@ public static synchronized ServiceRun LatestCompletedRun(SQLiteDatabase db) {
      * @param maxRecords the total number of records returned
      * @return a cursor
      */
-    public static Cursor LatestRuns(SQLiteDatabase db, int maxRecords) {
+    public static synchronized Cursor LatestRuns(SQLiteDatabase db, int maxRecords) {
         return LatestRuns(db, maxRecords, true);
     }
 
@@ -218,7 +218,7 @@ public static synchronized void UpdateWhileRunning(SQLiteDatabase db, long runid
      * @param db the SQLite connection
      * @return the run id
      */
-    public static long InsertAtServiceStart(SQLiteDatabase db) {
+    public static synchronized long InsertAtServiceStart(SQLiteDatabase db) {
         ServiceRun lrun = LatestRun(db);
         Calendar cal = Calendar.getInstance(Locale.getDefault());
         Date start = cal.getTime();
@@ -232,13 +232,13 @@ public static long InsertAtServiceStart(SQLiteDatabase db) {
      * @param numReceived the number of calls received during the service run
      * @param numTriggered the number of events triggered during the service run
      */
-    public static void UpdateAtServiceStop(SQLiteDatabase db, long runid, int numReceived, int numTriggered) {
+    public static synchronized void UpdateAtServiceStop(SQLiteDatabase db, long runid, int numReceived, int numTriggered) {
         Calendar cal = Calendar.getInstance(Locale.getDefault());
         Date end = cal.getTime();
         UpdateRow(db,runid, end,numReceived,numTriggered);
     }
 
-    public static synchronized void DeleteServiceRun(SQLiteDatabase db, long runid) {
+    private static synchronized void DeleteServiceRun(SQLiteDatabase db, long runid) {
         String where = DbContract.ServiceRuns._ID + " = ?";
         String[] args = {String.valueOf(runid)};
         db.delete(DbContract.ServiceRuns.TABLE_NAME, where, args);
diff --git a/app/src/main/java/com/prismaqf/callblocker/utils/BackupAgent.java b/app/src/main/java/com/prismaqf/callblocker/utils/BackupAgent.java
@@ -18,9 +18,7 @@
  */
 public class BackupAgent extends BackupAgentHelper {
 
-    private static String dbname="../databases/pcb.db";
-    private static String preferences = "com.prismaqf.callblocker_preferences";
-    private static String TAG = BackupAgent.class.getCanonicalName();
+    private static final String TAG = BackupAgent.class.getCanonicalName();
 
     class DbBackupHelper extends FileBackupHelper{
 
@@ -67,10 +65,12 @@ public void restoreEntity(BackupDataInputStream data) {
 
     @Override
     public void onCreate(){
+        String dbname = "../databases/pcb.db";
         DbBackupHelper dbs = new DbBackupHelper(this, dbname);
         String DBKEY = "dbs";
         addHelper(DBKEY, dbs);
-        PrefBackupHelper prefs = new PrefBackupHelper(this,preferences);
+        String preferences = "com.prismaqf.callblocker_preferences";
+        PrefBackupHelper prefs = new PrefBackupHelper(this, preferences);
         String PREFKEY = "prefs";
         addHelper(PREFKEY,prefs);
     }
diff --git a/app/src/main/java/com/prismaqf/callblocker/utils/CallAcceptDrop.java b/app/src/main/java/com/prismaqf/callblocker/utils/CallAcceptDrop.java
@@ -34,7 +34,6 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         keyguardManager = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
-        AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
     }
 
     @Override
diff --git a/app/src/main/java/com/prismaqf/callblocker/utils/DebugKey.java b/app/src/main/java/com/prismaqf/callblocker/utils/DebugKey.java
@@ -9,7 +9,7 @@ public class DebugKey {
      * This is the key that can only be constructed here and
      * hence accessible only to derived classes
      */
-    private DbKey myKey = new DbKey();
+    private final DbKey myKey = new DbKey();
 
     DbKey getKey() {return myKey;}
 
diff --git a/app/src/main/java/com/prismaqf/callblocker/utils/DexClassScanner.java b/app/src/main/java/com/prismaqf/callblocker/utils/DexClassScanner.java
@@ -19,7 +19,7 @@
  * @see 'http://stackoverflow.com/questions/11421085/implementing-spring-like-package-scanning-in-android'
  */
 public class DexClassScanner {
-    private static String TAG = DexClassScanner.class.getCanonicalName();
+    private static final String TAG = DexClassScanner.class.getCanonicalName();
 
     /**
      * Scanning for classes which are subtype of a given type and having a specified annotaion
diff --git a/app/src/main/res/xml/backupscheme.xml b/app/src/main/res/xml/backupscheme.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+
+</full-backup-content>

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import android.app.AlertDialog;`
`6`	`6`	`import android.app.Dialog;`
`7`	`7`	`import android.app.TimePickerDialog;`
	`8`	`+import android.app.backup.BackupManager;`
`8`	`9`	`import android.content.DialogInterface;`
`9`	`10`	`import android.content.Intent;`
`10`	`11`	`import android.database.sqlite.SQLiteDatabase;`
`@@ -141,7 +142,8 @@ protected CalendarRule doInBackground(CalendarRule... rules) {`
`141`	`142`	`}`
`142`	`143`	`}`
`143`	`144`	`finally {`
`144`		`- db.close();`
	`145`	`+ db.close();`
	`146`	`+ BackupManager.dataChanged(NewEditCalendarRule.this.getPackageName());`
`145`	`147`	`}`
`146`	`148`	`return rule;`
`147`	`149`	`}`
`@@ -359,7 +361,7 @@ public void onCheckDay(View view) {`
`359`	`361`
`360`	`362`
`361`	`363`	`@Override`
`362`		`- protected void refreshWidgets(boolean validate) {`
	`364`	`+ void refreshWidgets(boolean validate) {`
`363`	`365`	`ed_name.setText(ptRule.getName());`
`364`	`366`	`cb_Monday.setChecked(ptRule.getDayMask().contains(CalendarRule.DayOfWeek.MONDAY));`
`365`	`367`	`cb_Tuesday.setChecked(ptRule.getDayMask().contains(CalendarRule.DayOfWeek.TUESDAY));`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import android.app.Activity;`
`4`	`4`	`import android.app.AlertDialog;`
	`5`	`+import android.app.backup.BackupManager;`
`5`	`6`	`import android.content.DialogInterface;`
`6`	`7`	`import android.content.Intent;`
`7`	`8`	`import android.database.sqlite.SQLiteDatabase;`
`@@ -62,6 +63,7 @@ protected Void doInBackground(FilterHandle... filters) {`
`62`	`63`	`}`
`63`	`64`	`finally {`
`64`	`65`	`db.close();`
	`66`	`+ BackupManager.dataChanged(NewEditFilter.this.getPackageName());`
`65`	`67`	`}`
`66`	`68`	`return null;`
`67`	`69`	`}`
`@@ -428,7 +430,7 @@ protected void enableWidgets(boolean nameFlag, boolean widgetFlag) {`
`428`	`430`	`}`
`429`	`431`
`430`	`432`	`@Override`
`431`		`- protected void refreshWidgets(boolean validate) {`
	`433`	`+ void refreshWidgets(boolean validate) {`
`432`	`434`	`ed_name.setText(ptFilter.getName());`
`433`	`435`	`tv_calendar_name.setText(String.format("%s %s", getString(R.string.tx_calendar_rule_name), ptFilter.getCalendarRuleName()));`
`434`	`436`	`tv_paterns_name.setText(String.format("%s %s", getString(R.string.tx_filter_rule_name), ptFilter.getFilterRuleName()));`