Small changes to the help pages

codimoc · codimoc · commit a3aaaf83771e · 2017-01-17T08:29:53.000Z
diff --git a/app/src/main/assets/html/calendar_rule_edit.html b/app/src/main/assets/html/calendar_rule_edit.html
@@ -11,7 +11,7 @@
 interval (from - to). It can be always active if all days of the week are
 selected and the interval 0.00 to 23.59 is chosen.
 A calendar rule must have a name, and the name must be unique: saving is disabled otherwise.</p>
-<p>Editing a rule allows certain action to be performed, but depending on the context some action will
+<p>Editing a rule allows certain actions to be performed, but depending on the context some actions will
 be disallowed (disappear from the action bar) while other will be possible and hence visible. At any
 moment in time, some hints are given in the bottom purple text view, so keep an eye on it</p>
 <p>These are the icons for the editing actions and their meanings:</p>
diff --git a/app/src/main/assets/html/filter_edit.html b/app/src/main/assets/html/filter_edit.html
@@ -13,7 +13,7 @@
         the <b>action</b> to be performed.</p>
         <p>Filters can be combined and they are acted sequentially. Typically one or two filters
         are necessary and all the filters currently defined by the user will be used. So make sure to remove
-        undesired filters if they have been created only for testing purposes and are not needed.</p>
+        undesired filters, if they have been created only for testing purposes and are not needed.</p>
         <p>Filters can be created, updated, edited and deleted and these are the icons for the editing actions and their meanings:</p>
         <ul>
             <li><img src="ic_save_circle.png" width="32" height="32" alt="saving"> for saving or updating a filter</li>
diff --git a/app/src/main/assets/html/filter_rule_edit.html b/app/src/main/assets/html/filter_rule_edit.html
@@ -7,7 +7,7 @@
 </head>
 <body>
 <p>Filter rules are used to define the filters that apply to the incoming phone
-    numbers to trigger an action.
+    numbers in order to trigger an action.
     The rule is specified by the name, a short description and the filter patterns that
     apply to this rule. Editing of the filter patterns is done by a
     separate activity which can be accessed by clicking the main button on
diff --git a/app/src/main/assets/html/main.html b/app/src/main/assets/html/main.html
@@ -7,7 +7,7 @@
 </head>
 <body>
 <p>This app blocks or reacts to unwanted calls on a rule-based logic. The main-home
-activity controls the turning on and off of a background service that listens to incoming calls.
+activity controls the turning on and off of a service that listens to incoming calls.
 This service is <em>sticky</em> and survives crashes and reboots of the system.</p>
 <p>When an incoming call is detected, the service loops through the list of active <b>filters</b>,
 and for each filter, if there is a match, an action is performed, like dropping the call,
@@ -25,13 +25,13 @@
 incoming call is detected.</p>
 <p>Here is a list of all menu items available from the drop-down menu:</p>
 <ul>
-    <li><b>Show active filters</b>, to create and edit active filters; This is a main entry point in the use of this app.</li>
-    <li><b>Show latest service runs</b>, this is a brief summary of recent service runs, where a run is defined as the period
-    between two consecutive service-start and service-stop events,</li>
-    <li><b>Show latest calls received</b>, a log of the incoming calls most recently received.</li>
-    <li><b>Show calendar rules</b>, the activity to create and edit calendar rules.</li>
-    <li><b>Show filter rules</b>, the activity to create and edit filter rules.</li>
-    <li><b>Settings</b>, a setting page for further customization.</li>
+    <li><b>Show active filters</b> to create and edit active filters; This is a main entry point in the use of this app</li>
+    <li><b>Show latest service runs</b>, a brief summary of recent service runs, where a run is defined as the period
+    between two consecutive service-start and service-stop events</li>
+    <li><b>Show latest calls received</b>, a log of the incoming calls most recently received</li>
+    <li><b>Show calendar rules</b>, the activity to create and edit calendar rules</li>
+    <li><b>Show filter rules</b>, the activity to create and edit filter rules</li>
+    <li><b>Settings</b>, a setting page for further customization</li>
 </ul>
 <p>Once the service is running, the main activity's page also shows a brief statistics of the total
 number of calls received and triggered events, <em>i.e.</em> when the filter reacted by performing an action, since service start.
diff --git a/app/src/main/assets/html/patterns_edit.html b/app/src/main/assets/html/patterns_edit.html
@@ -7,7 +7,7 @@
 </head>
 <body>
 <p>Patterns are used to match an incoming telephone number to an action to be performed. Patterns can
-be either a complete number, or only part of it. A pattern like <strong>12345</strong> would match
+be either a complete number, or only a part of it. A pattern like <strong>12345</strong> would match
 an incoming number like <strong>12345</strong> or one containing that pattern like 0<strong>12345</strong>67.
 Patterns can also contain wild cards (unspecified parts) identified by a <strong>*</strong> character, 
 which can be placed in-between tokens like <strong>123*456</strong>; this will match any number
diff --git a/app/src/main/assets/html/pick_action.html b/app/src/main/assets/html/pick_action.html
@@ -6,8 +6,8 @@
     <link rel="stylesheet" type="text/css" href="help.css" media="screen" />
 </head>
 <body>
-<p>The interaction with Android's telephony service has been severly restricted with the last
-Android major releases. This has been motivited mostly by security reasons. In order for this
+<p>The interaction with Android's telephony service has been severly restricted with the latest
+Android major releases. This has been motivited mostly by security reasons. In order for the
 app to run on different versions and devices we offer different actions to choose when
 an incoming event occurs. Some are guaranteed to work on all devices, like logging or
 sending a warning. Other are device/version dependent.</p>
@@ -17,7 +17,7 @@
 privilege to be granted.</p>
 <p>Our suggestion is to try first with <b>DropCallByEndCall</b>.
 If it does not work try <b>DropCallByDownButton</b> followed by <b>DropCallByUpButton</b>.</p>
-<p>In future version of this app, more actions will be added to try to keep the app functioning
+<p>In future versions of this app, more actions will be added to try to keep the app functioning
 properly for a high percentage of devices and versions.</p>
 </body>
 </html>
diff --git a/app/src/main/java/com/prismaqf/callblocker/SettingFragment.java b/app/src/main/java/com/prismaqf/callblocker/SettingFragment.java
@@ -1,6 +1,5 @@
 package com.prismaqf.callblocker;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -52,7 +51,7 @@ protected Void doInBackground(Context... ctxs) {
                 myPath = file.getAbsolutePath();
                 FileOutputStream fOut = new FileOutputStream(file);
                 ObjectOutputStream oOut = new ObjectOutputStream(fOut);
-                oOut.writeObject(CallHelper.GetHelper(myContext).getFilters(myContext));
+                oOut.writeObject(CallHelper.GetHelper().getFilters(myContext));
                 oOut.flush();
                 oOut.close();
 
@@ -95,7 +94,7 @@ protected Void doInBackground(Context... ctxs) {
                 db = new DbHelper(myContext).getWritableDatabase();
                 for (Filter f : filters)
                     FilterProvider.SaveFilter(db,f);
-                CallHelper.GetHelper(myContext).loadFilters(myContext);
+                CallHelper.GetHelper().loadFilters(myContext);
                 oIn.close();
 
             }
