From 5b71fe514e7650b392a01cc2c4398a68062b32cb Mon Sep 17 00:00:00 2001 From: Fil Date: Sat, 11 Mar 2017 20:52:13 +0100 Subject: Fix broken compilation from last commit --- app/AndroidManifest.xml | 28 ++-- app/gen/fil/libre/repwifiapp/R.java | 172 +++++++++++++-------- app/ic_launcher-web.png | Bin 0 -> 41793 bytes app/res/menu/activity_main.xml | 6 + app/res/values/array.xml | 16 ++ app/res/values/strings.xml | 10 +- app/res/values/strings_activity_settings.xml | 57 +++++++ app/res/xml/settings.xml | 12 ++ app/res/xml/settings_headers.xml | 11 ++ app/src/fil/libre/repwifiapp/Commons.java | 15 +- .../activities/InputPasswordActivity.java | 11 +- .../repwifiapp/activities/LongTaskActivity.java | 5 +- .../libre/repwifiapp/activities/MainActivity.java | 7 - .../activities/NetworkDetailsActivity.java | 6 +- .../activities/SelectNetworkActivity.java | 7 +- app/src/fil/libre/repwifiapp/helpers/Utils.java | 22 +-- 16 files changed, 269 insertions(+), 116 deletions(-) create mode 100644 app/ic_launcher-web.png create mode 100644 app/res/values/array.xml create mode 100644 app/res/values/strings_activity_settings.xml create mode 100644 app/res/xml/settings.xml create mode 100644 app/res/xml/settings_headers.xml diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml index ba324d2..908cdc5 100644 --- a/app/AndroidManifest.xml +++ b/app/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="1" + android:versionName="0.0.9(1)" > + android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:screenOrientation="portrait" > @@ -32,7 +32,8 @@ android:label="@string/title_activity_select_network" > - + - + + + + android:name="fil.libre.repwifiapp.activities.SettingsActivity" + android:label="@string/title_activity_settings" > diff --git a/app/gen/fil/libre/repwifiapp/R.java b/app/gen/fil/libre/repwifiapp/R.java index e145272..be4d006 100644 --- a/app/gen/fil/libre/repwifiapp/R.java +++ b/app/gen/fil/libre/repwifiapp/R.java @@ -8,13 +8,21 @@ package fil.libre.repwifiapp; public final class R { + public static final class array { + public static final int debug_priority=0x7f050001; + public static final int debug_priority_names=0x7f050000; + public static final int pref_example_list_titles=0x7f050002; + public static final int pref_example_list_values=0x7f050003; + public static final int pref_sync_frequency_titles=0x7f050004; + public static final int pref_sync_frequency_values=0x7f050005; + } public static final class attr { } public static final class color { - public static final int ThemeDark=0x7f040001; - public static final int ThemeLight=0x7f040000; - public static final int White=0x7f040003; - public static final int black=0x7f040002; + public static final int ThemeDark=0x7f060001; + public static final int ThemeLight=0x7f060000; + public static final int White=0x7f060003; + public static final int black=0x7f060002; } public static final class drawable { public static final int ic_launcher=0x7f020000; @@ -23,31 +31,33 @@ public final class R { public static final int ic_launcher_tris=0x7f020003; } public static final class id { - public static final int btn_back=0x7f080017; - public static final int btn_delete=0x7f08000f; - public static final int btn_disconnect=0x7f080016; - public static final int btn_manage_nets=0x7f08000b; - public static final int btn_rescan=0x7f080012; - public static final int btn_scan=0x7f08000a; - public static final int chk_show_pass=0x7f080004; - public static final int chk_show_pass_details=0x7f08000e; - public static final int img_logo=0x7f08000c; - public static final int layout=0x7f080006; - public static final int layout_selnets=0x7f080010; - public static final int login_form=0x7f080001; - public static final int menu_credits=0x7f080018; - public static final int progbar=0x7f080007; - public static final int scrollview=0x7f080013; - public static final int sign_in_button=0x7f080005; - public static final int table_networks=0x7f080014; - public static final int txt_credits=0x7f080000; - public static final int txt_insert_pass=0x7f080002; - public static final int txt_main=0x7f080009; - public static final int txt_msg=0x7f080008; - public static final int txt_net_details=0x7f08000d; - public static final int txt_password=0x7f080003; - public static final int txt_selnets=0x7f080011; - public static final int txt_status=0x7f080015; + public static final int btn_back=0x7f0a0017; + public static final int btn_delete=0x7f0a000f; + public static final int btn_disconnect=0x7f0a0016; + public static final int btn_manage_nets=0x7f0a000b; + public static final int btn_rescan=0x7f0a0012; + public static final int btn_scan=0x7f0a000a; + public static final int chk_show_pass=0x7f0a0004; + public static final int chk_show_pass_details=0x7f0a000e; + public static final int img_logo=0x7f0a000c; + public static final int layout=0x7f0a0006; + public static final int layout_selnets=0x7f0a0010; + public static final int login_form=0x7f0a0001; + public static final int menu_config=0x7f0a001a; + public static final int menu_credits=0x7f0a0019; + public static final int pref_debug_prio=0x7f0a0018; + public static final int progbar=0x7f0a0007; + public static final int scrollview=0x7f0a0013; + public static final int sign_in_button=0x7f0a0005; + public static final int table_networks=0x7f0a0014; + public static final int txt_credits=0x7f0a0000; + public static final int txt_insert_pass=0x7f0a0002; + public static final int txt_main=0x7f0a0009; + public static final int txt_msg=0x7f0a0008; + public static final int txt_net_details=0x7f0a000d; + public static final int txt_password=0x7f0a0003; + public static final int txt_selnets=0x7f0a0011; + public static final int txt_status=0x7f0a0015; } public static final class layout { public static final int activity_credits=0x7f030000; @@ -59,42 +69,72 @@ public final class R { public static final int activity_show_status=0x7f030006; } public static final class menu { - public static final int activity_main=0x7f070000; + public static final int activity_main=0x7f090000; } public static final class string { - public static final int action_sign_in_register=0x7f050017; - public static final int action_sign_in_short=0x7f050018; - public static final int app_name=0x7f050000; - public static final int back_main=0x7f05000b; - public static final int button_text_next=0x7f050005; - public static final int credit_text=0x7f050013; - public static final int delete=0x7f050010; - public static final int disconnect=0x7f05000c; - public static final int error_field_required=0x7f05001e; - public static final int error_incorrect_password=0x7f05001d; - public static final int error_invalid_email=0x7f05001b; - public static final int error_invalid_password=0x7f05001c; - public static final int force_disconnect=0x7f05000d; - public static final int hello_world=0x7f050009; - public static final int insert_nets_password=0x7f050006; - public static final int login_progress_signing_in=0x7f05001a; - public static final int manage_networks=0x7f050011; - public static final int menu_credits=0x7f050001; - public static final int menu_forgot_password=0x7f050019; + public static final int action_sign_in_register=0x7f07001f; + public static final int action_sign_in_short=0x7f070020; + public static final int app_name=0x7f070000; + public static final int back_main=0x7f07000b; + public static final int button_text_next=0x7f070005; + public static final int credit_text=0x7f070013; + public static final int delete=0x7f070010; + public static final int disconnect=0x7f07000c; + public static final int error_field_required=0x7f070026; + public static final int error_incorrect_password=0x7f070025; + public static final int error_invalid_email=0x7f070023; + public static final int error_invalid_password=0x7f070024; + public static final int force_disconnect=0x7f07000d; + public static final int hello_world=0x7f070009; + public static final int insert_nets_password=0x7f070006; + public static final int login_progress_signing_in=0x7f070022; + public static final int manage_networks=0x7f070011; + public static final int menu_config=0x7f070014; + public static final int menu_credits=0x7f070001; + public static final int menu_forgot_password=0x7f070021; + public static final int msg_confirm_delete_network=0x7f070016; + public static final int msg_interface_not_found=0x7f070015; + public static final int msg_root_denied=0x7f07001b; + public static final int msg_root_disabled=0x7f07001a; + public static final int no=0x7f070018; + public static final int pref_default_display_name=0x7f07002c; + public static final int pref_description_social_recommendations=0x7f07002a; + /** Example settings for Data & Sync + */ + public static final int pref_header_data_sync=0x7f07002e; + /** Strings related to Settings + Example General settings + */ + public static final int pref_header_general=0x7f070028; + /** Example settings for Notifications + */ + public static final int pref_header_notifications=0x7f070031; + public static final int pref_ringtone_silent=0x7f070034; + public static final int pref_title_add_friends_to_messages=0x7f07002d; + public static final int pref_title_display_name=0x7f07002b; + public static final int pref_title_new_message_notifications=0x7f070032; + public static final int pref_title_ringtone=0x7f070033; + public static final int pref_title_social_recommendations=0x7f070029; + public static final int pref_title_sync_frequency=0x7f07002f; + public static final int pref_title_system_sync_settings=0x7f070030; + public static final int pref_title_vibrate=0x7f070035; /** Strings related to login */ - public static final int prompt_email=0x7f050015; - public static final int prompt_password=0x7f050016; - public static final int rescan=0x7f050004; - public static final int scan_networks=0x7f050002; - public static final int show_password=0x7f050007; - public static final int title_activity_connect=0x7f050008; - public static final int title_activity_credits=0x7f050012; - public static final int title_activity_input_password=0x7f050014; - public static final int title_activity_long_task=0x7f05000e; - public static final int title_activity_manage_networks=0x7f05000f; - public static final int title_activity_select_network=0x7f050003; - public static final int title_activity_show_status=0x7f05000a; + public static final int prompt_email=0x7f07001d; + public static final int prompt_password=0x7f07001e; + public static final int rescan=0x7f070004; + public static final int retry=0x7f070019; + public static final int scan_networks=0x7f070002; + public static final int show_password=0x7f070007; + public static final int title_activity_connect=0x7f070008; + public static final int title_activity_credits=0x7f070012; + public static final int title_activity_input_password=0x7f07001c; + public static final int title_activity_long_task=0x7f07000e; + public static final int title_activity_manage_networks=0x7f07000f; + public static final int title_activity_select_network=0x7f070003; + public static final int title_activity_settings=0x7f070027; + public static final int title_activity_show_status=0x7f07000a; + public static final int yes=0x7f070017; } public static final class style { /** @@ -118,11 +158,15 @@ public final class R { API 14 theme customizations can go here. */ - public static final int AppBaseTheme=0x7f060000; + public static final int AppBaseTheme=0x7f080000; /** Application theme. All customizations that are NOT specific to a particular API-level can go here. */ - public static final int AppTheme=0x7f060001; - public static final int LoginFormContainer=0x7f060002; + public static final int AppTheme=0x7f080001; + public static final int LoginFormContainer=0x7f080002; + } + public static final class xml { + public static final int settings=0x7f040000; + public static final int settings_headers=0x7f040001; } } diff --git a/app/ic_launcher-web.png b/app/ic_launcher-web.png new file mode 100644 index 0000000..df56b4e Binary files /dev/null and b/app/ic_launcher-web.png differ diff --git a/app/res/menu/activity_main.xml b/app/res/menu/activity_main.xml index cd7c0cb..7855b0d 100644 --- a/app/res/menu/activity_main.xml +++ b/app/res/menu/activity_main.xml @@ -5,5 +5,11 @@ android:orderInCategory="100" android:showAsAction="never" android:title="@string/menu_credits" /> + + \ No newline at end of file diff --git a/app/res/values/array.xml b/app/res/values/array.xml new file mode 100644 index 0000000..ac6da05 --- /dev/null +++ b/app/res/values/array.xml @@ -0,0 +1,16 @@ + + + + Log everything + Log medium priority events + Log high priority events only + Logging disabled + + + 0 + 1 + 2 + 3 + + + \ No newline at end of file diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml index 00168b5..0771c3e 100644 --- a/app/res/values/strings.xml +++ b/app/res/values/strings.xml @@ -1,7 +1,7 @@ - RepWifi App + RepWifi Info and Credits Scan for Networks Select Network @@ -21,5 +21,13 @@ Manage Networks Credits Copyright 2017 Filippo \"Fil\" Bergamo<br/><br/>This app is Free Software.<br/>It\'s licensed under the terms of <a href="https://www.gnu.org/licenses/gpl.txt">GPL v3</a><br/><br/>This app is developed as a contribution to <br/><a href="http://www.replicant.us">The Replicant Project</a><br/><br/><b><u><big>Thank GNUs:</big></u></b><br/><br/><b>Tibi \"tct\" Turbureanu</b><br/>for having done the initial job of porting libre WiFi to Replicant 4.2.<br/><br/><b>Wolfgang Wiedmeyer</b><br/>for porting libre WiFi to Replicant 6.0 and for helping with the scripts.<br/><br/>To report on bugs, request features, or any help request, please refer to:<br/><a href="http://redmine.replicant.us/projects/replicant/boards">Replicant\'s Forum</a><br/> + Settings + External WiFi adapter not found!\nPlease plug in a supported WiFi adapter and retry. + Are you sure you want to delete this network? + Yes + No + Retry + Root access is disabled.\n\nSeems like root access is disabled on this device.\nRepWifi needs root access in order to work.\nPlease, enable root access for applications in:\nSettings > Developer options > Root access > "Apps only"\nWhen done so, restart RepWifi and grant the permission to use root, if asked. + Root access denied.\nSeems like you denied root access to RepWifi.\nRepWifi needs root access in order to work.\nPlease, restart the application, and grant RepWifi the permission to use root, when asked. \ No newline at end of file diff --git a/app/res/values/strings_activity_settings.xml b/app/res/values/strings_activity_settings.xml new file mode 100644 index 0000000..d7bab93 --- /dev/null +++ b/app/res/values/strings_activity_settings.xml @@ -0,0 +1,57 @@ + + + Settings + + + + + + General + Enable social recommendations + Recommendations for people to contact based on your message history + Display name + John Smith + Add friends to messages + + + Always + When possible + Never + + + 1 + 0 + -1 + + + + Data & sync + Sync frequency + + + 15 minutes + 30 minutes + 1 hour + 3 hours + 6 hours + Never + + + 15 + 30 + 60 + 180 + 360 + -1 + + + System sync settings + + + Notifications + New message notifications + Ringtone + Silent + Vibrate + + \ No newline at end of file diff --git a/app/res/xml/settings.xml b/app/res/xml/settings.xml new file mode 100644 index 0000000..f53f00f --- /dev/null +++ b/app/res/xml/settings.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/res/xml/settings_headers.xml b/app/res/xml/settings_headers.xml new file mode 100644 index 0000000..d2212da --- /dev/null +++ b/app/res/xml/settings_headers.xml @@ -0,0 +1,11 @@ + + + + +
+ + \ No newline at end of file diff --git a/app/src/fil/libre/repwifiapp/Commons.java b/app/src/fil/libre/repwifiapp/Commons.java index 202e67f..f938310 100644 --- a/app/src/fil/libre/repwifiapp/Commons.java +++ b/app/src/fil/libre/repwifiapp/Commons.java @@ -75,7 +75,9 @@ public abstract class Commons { } public static SharedPreferences getSettings(){ + return PreferenceManager.getDefaultSharedPreferences(currentContext); + } //---------------------------------------------------- @@ -90,6 +92,7 @@ public abstract class Commons { public static final String EXTRA_DELETE = "ExDelete"; public class RequestCode{ + public static final int NONE = 0; public static final int SELECT_CONN = 1; public static final int PASS_INPUT = 2; @@ -100,6 +103,7 @@ public abstract class Commons { public static final int SELECT_DETAILS = 7; public static final int DETAILS_SHOW = 8; public static final int NETWORK_DELETE = 9; + } //---------------------------------------------------- @@ -114,24 +118,31 @@ public abstract class Commons { return APP_DATA_FOLDER + "/repwifi_storage.conf"; } } + public static String getScriptScan(){ return APP_DATA_FOLDER + "/scan.sh"; - } + } + public static String getScriptScanRes(){ return APP_DATA_FOLDER + "/get_scan_results.sh"; } + public static String getScriptDhcpcd(){ return APP_DATA_FOLDER + "/run_dhcpcd.sh"; } + public static String getScanFile(){ return APP_DATA_FOLDER + "/scanres.txt"; } + public static String getStatusFile(){ return APP_DATA_FOLDER + "/tmpStatus"; } + public static String getGwFile(){ return APP_DATA_FOLDER + "/gw.txt"; } + public static String getTempOutFile(){ return APP_DATA_FOLDER + "/tmpout.txt"; } @@ -144,7 +155,6 @@ public abstract class Commons { currentContext = context; try { - colorThemeDark = currentContext.getResources().getColor(R.color.ThemeDark); colorThemeLight = currentContext.getResources().getColor(R.color.ThemeLight); @@ -153,7 +163,6 @@ public abstract class Commons { initEngine(); initNetworkStorage(); - return true; diff --git a/app/src/fil/libre/repwifiapp/activities/InputPasswordActivity.java b/app/src/fil/libre/repwifiapp/activities/InputPasswordActivity.java index e46d7d9..239c082 100644 --- a/app/src/fil/libre/repwifiapp/activities/InputPasswordActivity.java +++ b/app/src/fil/libre/repwifiapp/activities/InputPasswordActivity.java @@ -63,8 +63,7 @@ public class InputPasswordActivity extends Activity implements OnCheckedChangeLi @Override public boolean onCreateOptionsMenu(Menu menu) { - //super.onCreateOptionsMenu(menu); - //getMenuInflater().inflate(R.menu.activity_input_password, menu); + //disable menu return true; } @@ -74,12 +73,14 @@ public class InputPasswordActivity extends Activity implements OnCheckedChangeLi if(buttonView == findViewById(R.id.chk_show_pass)){ chkShowPassChanged(); } + } public void onBtnNextClick(View v){ EditText txpass = (EditText)findViewById(R.id.txt_password); String pass = txpass.getText().toString(); + if (pass.length()>0){ this.apinfo.setPassword(pass); @@ -87,11 +88,11 @@ public class InputPasswordActivity extends Activity implements OnCheckedChangeLi Intent intent = new Intent(); intent.putExtra(Commons.EXTRA_APINFO, this.apinfo); setResult(RESULT_OK, intent); + finish(); } - - + } public void chkShowPassChanged(){ @@ -102,9 +103,11 @@ public class InputPasswordActivity extends Activity implements OnCheckedChangeLi if (c.isChecked()){ txtPass.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD); txtPass.setSelection(txtPass.getText().length()); + }else{ txtPass.setInputType(129); txtPass.setSelection(txtPass.getText().length()); + } } diff --git a/app/src/fil/libre/repwifiapp/activities/LongTaskActivity.java b/app/src/fil/libre/repwifiapp/activities/LongTaskActivity.java index f9e7685..63063d8 100644 --- a/app/src/fil/libre/repwifiapp/activities/LongTaskActivity.java +++ b/app/src/fil/libre/repwifiapp/activities/LongTaskActivity.java @@ -96,7 +96,8 @@ public class LongTaskActivity extends Activity { case Commons.RequestCode.CONNECT: setTitle("Connecting..."); - setMessage("Connecting..."); + setMessage("Connecting..."); + //Extract AccessPointInfo input = intent.getExtras().getSerializable(Commons.EXTRA_APINFO); currentNetwork = (AccessPointInfo)input; @@ -167,7 +168,7 @@ public class LongTaskActivity extends Activity { @Override public void onBackPressed() { - //suppress + //suppress back button } diff --git a/app/src/fil/libre/repwifiapp/activities/MainActivity.java b/app/src/fil/libre/repwifiapp/activities/MainActivity.java index abe7dc2..aa179fb 100644 --- a/app/src/fil/libre/repwifiapp/activities/MainActivity.java +++ b/app/src/fil/libre/repwifiapp/activities/MainActivity.java @@ -20,12 +20,7 @@ package fil.libre.repwifiapp.activities; - - - - import java.io.IOException; - import fil.libre.repwifiapp.Commons; import fil.libre.repwifiapp.R; import fil.libre.repwifiapp.Commons.RequestCode; @@ -34,9 +29,7 @@ import fil.libre.repwifiapp.helpers.ConnectionStatus; import fil.libre.repwifiapp.helpers.NetworkManager; import fil.libre.repwifiapp.helpers.RootCommand; import fil.libre.repwifiapp.helpers.Utils; - import android.os.Bundle; -import android.R.integer; import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; diff --git a/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java b/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java index f0aa26d..6d7ed56 100644 --- a/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java +++ b/app/src/fil/libre/repwifiapp/activities/NetworkDetailsActivity.java @@ -86,6 +86,7 @@ public class NetworkDetailsActivity extends Activity implements OnCheckedChangeL v.append("\nBSSID: " + this.currentNetwor.getBSSID()); long lastused = this.currentNetwor.getLastTimeUsed(); + if (lastused > 0){ Date ts = new Date(lastused); String formstring = "dd-MMM-yyyy kk:mm:ss"; @@ -94,7 +95,8 @@ public class NetworkDetailsActivity extends Activity implements OnCheckedChangeL if (showPassword){ v.append("\n\nPassword:\n" + this.currentNetwor.getPassword()); - }else{ + } + else{ v.append("\n\n\n"); } @@ -117,7 +119,7 @@ public class NetworkDetailsActivity extends Activity implements OnCheckedChangeL dlgAlert.setNegativeButton(no,new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int whichButton) { - //nothing + return; } }); diff --git a/app/src/fil/libre/repwifiapp/activities/SelectNetworkActivity.java b/app/src/fil/libre/repwifiapp/activities/SelectNetworkActivity.java index 6731846..9b07246 100644 --- a/app/src/fil/libre/repwifiapp/activities/SelectNetworkActivity.java +++ b/app/src/fil/libre/repwifiapp/activities/SelectNetworkActivity.java @@ -20,15 +20,11 @@ package fil.libre.repwifiapp.activities; - - - import fil.libre.repwifiapp.Commons; import fil.libre.repwifiapp.R; import fil.libre.repwifiapp.helpers.AccessPointInfo; import fil.libre.repwifiapp.helpers.NetworkButton; import fil.libre.repwifiapp.helpers.Utils; - import android.os.Bundle; import android.app.Activity; import android.content.Intent; @@ -60,8 +56,7 @@ public class SelectNetworkActivity extends Activity implements OnClickListener { @Override public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - //getMenuInflater().inflate(R.menu.activity_select_network, menu); + //Suppress menu button return true; } diff --git a/app/src/fil/libre/repwifiapp/helpers/Utils.java b/app/src/fil/libre/repwifiapp/helpers/Utils.java index bb3c682..d30eb2e 100644 --- a/app/src/fil/libre/repwifiapp/helpers/Utils.java +++ b/app/src/fil/libre/repwifiapp/helpers/Utils.java @@ -27,21 +27,13 @@ import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.Map; - import fil.libre.repwifiapp.Commons; - -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.SharedPreferences; import android.util.Log; public class Utils { private static final long MILLIS_IN_DAY = 86400000; - public static final String APP_NAME = "RepWifi"; private static Exception _lastException = null; @@ -73,10 +65,10 @@ public class Utils { public static boolean writeFile(String filePath, String text, boolean overwrite){ - - + FileWriter writer = null; boolean retval = false; + try { writer = new FileWriter(filePath, (! overwrite)); @@ -94,7 +86,7 @@ public class Utils { try { writer.close(); } catch (IOException e) { - //suppress + logError("error while closing filewriter",e); } } @@ -112,6 +104,7 @@ public class Utils { FileWriter writer = null; boolean retval = false; + try { writer = new FileWriter(filePath, (! overwrite)); @@ -136,7 +129,7 @@ public class Utils { try { writer.close(); } catch (IOException e) { - //suppress + logError("error while closing filewriter",e); } } @@ -169,6 +162,7 @@ public class Utils { fr = new FileReader(filePath); bufr = new BufferedReader(fr); String line =""; + while((line = bufr.readLine()) != null){ lines.add(line); } @@ -186,14 +180,14 @@ public class Utils { bufr.close(); } } catch (IOException ex) { - //suppress + logError("error while closing filereader",ex); } try { if (fr != null){ fr.close(); } }catch(IOException exc){ - //suppress + logError("error while closing filereader",exc); } } -- cgit v1.2.3