openbmap · thuryn · Aug 22, 2017 · Oct 1, 2017 · Oct 1, 2017 · Oct 8, 2017
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@
 /res/raw/build.txt
 /.settings
 /local.properties
-/.nb-gradle/
+/.nb-gradle/
+/private/
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -5,11 +5,12 @@
     android:versionName="0.2.8">
 
     <uses-sdk
-        android:minSdkVersion="16"
+        android:minSdkVersion="17"
         android:targetSdkVersion="26" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -22,18 +23,20 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
+
         <activity
             android:name="org.openbmap.unifiedNlp.SettingsActivity"
             android:exported="true"
             android:label="@string/preferences"/>
-
+        
         <service
             android:name="org.openbmap.unifiedNlp.services.RadiocellsOrgNlpService"
             android:exported="true"
             android:label="Radiocells.org Unified Network Location Provider Backend"
             android:permission="android.permission.ACCESS_COARSE_LOCATION">
             <intent-filter>
                 <action android:name="org.microg.nlp.LOCATION_BACKEND" />
+                <action android:name="org.openbmap.unifiedNlp.LOCATION_UPDATE_CELLS_ONLY" />
             </intent-filter>
 
             <meta-data
@@ -42,4 +45,4 @@
         </service>
     </application>
 
-</manifest>
+</manifest>
diff --git a/build.gradle b/build.gradle
@@ -28,17 +28,19 @@ apply plugin: 'com.android.application'
 
 repositories {
     mavenCentral()
+    jcenter()
 }
 
 dependencies {
     compile group: 'org.microg', name: 'unifiednlp-api', version: '1.5.4'
     compile 'ch.acra:acra:4.5.0'
     compile 'com.android.support:support-v4:25.3.1'
+    compile 'com.obsez.android.lib.filechooser:filechooser:1.1.5'
 }
 
 android {
     compileSdkVersion 21
-    buildToolsVersion '25.0.3'
+    buildToolsVersion "25.0.3"
     lintOptions.abortOnError false
 
     sourceSets {
@@ -64,4 +66,4 @@ task writeVersionInfo {
 
 if (file('user.gradle').exists()) {
     apply from: 'user.gradle'
-}
+}
diff --git a/res/layout/dialogpreference_catalogs_group.xml b/res/layout/dialogpreference_catalogs_group.xml
@@ -4,7 +4,7 @@
     android:layout_width="wrap_content"
     android:layout_height="?android:attr/listPreferredItemHeight"
     android:layout_marginLeft="8dp"
-    android:gravity="start"
+    android:gravity="end"
     android:paddingLeft="32dp"
     android:paddingTop="8dp"
     android:textSize="14sp"

diff --git a/res/values-ja/log_file_lasting.xml b/res/values-ja/log_file_lasting.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="log_file_lasting_entries">
+        <item>@string/log_file_12_label</item>
+        <item>@string/log_file_24_label</item>
+        <item>@string/log_file_48_label</item>
+        <item>@string/log_file_72_label</item>
+        <item>@string/log_file_168_label</item>
+        <item>@string/log_file_720_label</item>
+    </string-array>
+    <string-array name="log_file_lasting_values">
+        <item>12</item>
+        <item>24</item>
+        <item>48</item>
+        <item>72</item>
+        <item>168</item>
+        <item>720</item>
+    </string-array>
+</resources>
diff --git a/res/values-ja/operation_modes.xml b/res/values-ja/operation_modes.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="operation_mode_entries">
+        <item>Online mode</item>
+        <item>Offline mode</item>
+    </string-array>
+    <string-array name="operation_mode_values">
+        <item>online</item>
+        <item>offline</item>
+    </string-array>
+</resources>
diff --git a/res/values-ja/sources.xml b/res/values-ja/sources.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="source_entries">
+        <item>Combined (Wifis and Cells)</item>
+        <item>Wifis only</item>
+        <item>Cells only</item>
+    </string-array>
+    <string-array name="source_values">
+        <item>combined</item>
+        <item>wifis</item>
+        <item>cells</item>
+    </string-array>
+</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
@@ -38,4 +38,17 @@
     <string name="prefs_download_wifi_catalog">WiFi カタログをダウンロード</string>
     <string name="prefs_download_wifi_catalog_summary">現在のサイズ (国に応じて 10–400MB)</string>
     <string name="server_parsing_error">サーバーの応答を解析中にエラー</string>
+    <string name="wake_up_strategy_summary">When location stucks when phone sleeps you can try to wake up phone when cell is looked for</string>
+    <string name="wake_up_strategy_title">Wake up strategy</string>
+    <string name="nowakeup_label">No wake up</string>
+    <string name="wakeuppartial_label">Wake up CPU only</string>
+    <string name="wakeupfull_label">Wake up with display</string>
+    <string name="log_file_lasting_summary">After specified number of time log file will recreated</string>
+    <string name="log_file_lasting_title">Rotation of the log file</string>
+    <string name="log_file_12_label">12 hours</string>
+    <string name="log_file_24_label">a day</string>
+    <string name="log_file_48_label">two days</string>
+    <string name="log_file_72_label">three days</string>
+    <string name="log_file_168_label">a week</string>
+    <string name="log_file_720_label">a month</string>
 </resources>
diff --git a/res/values-ja/wake_up_strategy.xml b/res/values-ja/wake_up_strategy.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="wake_up_strategy_entries">
+        <item>@string/nowakeup_label</item>
+        <item>@string/wakeuppartial_label</item>
+        <item>@string/wakeupfull_label</item>
+    </string-array>
+    <string-array name="wake_up_strategy_values">
+        <item>nowakeup</item>
+        <item>wakeuppartial</item>
+        <item>wakeupfull</item>
+    </string-array>
+</resources>
diff --git a/res/values/log_file_lasting.xml b/res/values/log_file_lasting.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="log_file_lasting_entries">
+        <item>@string/log_file_12_label</item>
+        <item>@string/log_file_24_label</item>
+        <item>@string/log_file_48_label</item>
+        <item>@string/log_file_72_label</item>
+        <item>@string/log_file_168_label</item>
+        <item>@string/log_file_720_label</item>
+    </string-array>
+    <string-array name="log_file_lasting_values">
+        <item>12</item>
+        <item>24</item>
+        <item>48</item>
+        <item>72</item>
+        <item>168</item>
+        <item>720</item>
+    </string-array>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -39,4 +39,18 @@
     <string name="prefs_download_wifi_catalog">Download Wifi Catalog</string>
     <string name="prefs_download_wifi_catalog_summary">Current size (10–400MB depending on country)</string>
     <string name="server_parsing_error">Error parsing server reply</string>
+    <string name="wake_up_strategy_summary">When location stucks when phone sleeps you can try to wake up phone when cell is looked for</string>
+    <string name="wake_up_strategy_title">Wake up strategy</string>
+    <string name="nowakeup_label">No wake up</string>
+    <string name="wakeuppartial_label">Wake up CPU only</string>
+    <string name="wakeupfull_label">Wake up with display</string>
+    <string name="debug_choose_file">Select directory for logging</string>
+    <string name="log_file_lasting_summary">After specified number of time log file will recreated</string>
+    <string name="log_file_lasting_title">Rotation of the log file</string>
+    <string name="log_file_12_label">12 hours</string>
+    <string name="log_file_24_label">a day</string>
+    <string name="log_file_48_label">two days</string>
+    <string name="log_file_72_label">three days</string>
+    <string name="log_file_168_label">a week</string>
+    <string name="log_file_720_label">a month</string>
 </resources>
diff --git a/res/values/wake_up_strategy.xml b/res/values/wake_up_strategy.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="wake_up_strategy_entries">
+        <item>@string/nowakeup_label</item>
+        <item>@string/wakeuppartial_label</item>
+        <item>@string/wakeupfull_label</item>
+    </string-array>
+    <string-array name="wake_up_strategy_values">
+        <item>nowakeup</item>
+        <item>wakeuppartial</item>
+        <item>wakeupfull</item>
+    </string-array>
+</resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
@@ -8,6 +8,13 @@
             android:key="mode"
             android:summary="@string/operation_mode_summary"
             android:title="@string/operation_mode_title"/>
+        <ListPreference
+            android:defaultValue="nowakeup"
+            android:entries="@array/wake_up_strategy_entries"
+            android:entryValues="@array/wake_up_strategy_values"
+            android:key="wake.up.strategy"
+            android:summary="@string/wake_up_strategy_summary"
+            android:title="@string/wake_up_strategy_title"/>
     </PreferenceCategory>
         <ListPreference
             android:defaultValue="combined"
@@ -49,6 +56,21 @@
             android:summaryOff="@string/off"
             android:summaryOn="@string/on"
             android:title="@string/debug_title" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="debug.to.file"
+            android:summaryOff="Don't log to file"
+            android:summaryOn="Log to file"
+            android:title="Log to file" />
+        <ListPreference
+            android:defaultValue="24"
+            android:entries="@array/log_file_lasting_entries"
+            android:entryValues="@array/log_file_lasting_values"
+            android:key="debug.file.lasting.hours"
+            android:summary="@string/log_file_lasting_summary"
+            android:title="@string/log_file_lasting_title"/>
+        <Preference android:title="@string/debug_choose_file"
+            android:key="debug.log.file" />
     </PreferenceCategory>
     <Preference
         android:key="version"

diff --git a/src/org/openbmap/unifiedNlp/Preferences.java b/src/org/openbmap/unifiedNlp/Preferences.java
@@ -30,6 +30,8 @@ public final class Preferences {
      */
     public static final String KEY_OPERATION_MODE = "mode";
 
+    public static final String KEY_WAKE_UP_STRATEGY = "wake.up.strategy";
+
     public static final String KEY_SOURCE = "source";
 
     /**
@@ -41,6 +43,9 @@ public final class Preferences {
      * Broadcast debug messages?
      */
     public static final String KEY_DEBUG_MESSAGES = "debug.messages";
+    public static final String KEY_DEBUG_FILE = "debug.log.file";
+    public static final String KEY_DEBUG_TO_FILE = "debug.to.file";
+    public static final String KEY_DEBUG_FILE_LASTING_HOURS = "debug.file.lasting.hours";
 
 	/*
      * Default values following ..