PeterCxy/UnifiedNlp
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: PeterCxy:c56c69a5a76b29064634387b78b16c1c19549dd1
Branches Tags
PeterCxy:master
..
compare: PeterCxy:1c678b49085a541dc012fc9b86b064f7d78e0759
Branches Tags
PeterCxy:master

No commits in common. "c56c69a5a76b29064634387b78b16c1c19549dd1" and "1c678b49085a541dc012fc9b86b064f7d78e0759" have entirely different histories.
c56c69a5a7 ... 1c678b4908

5 changed files with 22 additions and 26 deletions
Show stats Expand all files Collapse all files

1
.gitignore vendored
View file

@ -10,4 +10,3 @@ user.gradle
local.properties
.idea/
BuildConfig.java
app/UnifiedNlp

13
app/build.gradle
View file

@ -45,7 +45,6 @@ android {
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
main.java.srcDirs += 'src/main/java'
}
flavorDimensions 'default'
@ -65,10 +64,6 @@ android {
}
}
android.applicationVariants.all { variant ->
variant.resValue 'string', 'application_id', variant.applicationId
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
@ -83,6 +78,8 @@ android {
}
}
apply from: "../gradle/androidJars.gradle"
dependencies {
implementation project(':api')
implementation project(':geocode-v1')
@ -106,3 +103,9 @@ dependencies {
implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion"
implementation "androidx.navigation:navigation-ui-ktx:$navigationVersion"
}
afterEvaluate {
android.applicationVariants.all { variant ->
variant.resValue 'string', 'application_id', variant.applicationId
}
}

1
app/src/main/AndroidManifest.xml
View file

@ -18,7 +18,6 @@
xmlns:tools="http://schemas.android.com/tools"
package="org.microg.nlp.app">
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<application

28
app/src/main/java/org/microg/nlp/app/tools/selfcheck/NlpStatusChecks.java
View file

@ -23,19 +23,19 @@ import android.location.LocationManager;
import android.os.Bundle;
import android.text.TextUtils;
import androidx.lifecycle.LifecycleOwner;
import org.microg.nlp.app.R;
import org.microg.nlp.client.LocationClient;
import org.microg.nlp.client.UnifiedLocationClient;
import java.util.concurrent.atomic.AtomicBoolean;
import static android.content.Context.LOCATION_SERVICE;
import static android.location.LocationManager.NETWORK_PROVIDER;
import static org.microg.nlp.api.Constants.LOCATION_EXTRA_BACKEND_COMPONENT;
import org.microg.nlp.app.tools.selfcheck.SelfCheckGroup.Result;
import static org.microg.nlp.app.tools.selfcheck.SelfCheckGroup.Result.Negative;
import static org.microg.nlp.app.tools.selfcheck.SelfCheckGroup.Result.Positive;
import static org.microg.nlp.app.tools.selfcheck.SelfCheckGroup.Result.Unknown;
public class NlpStatusChecks implements org.microg.nlp.app.tools.selfcheck.SelfCheckGroup {
public class NlpStatusChecks implements SelfCheckGroup {
@Override
public String getGroupName(Context context) {
return context.getString(R.string.self_check_cat_nlp_status);
@ -50,21 +50,17 @@ public class NlpStatusChecks implements org.microg.nlp.app.tools.selfcheck.SelfC
}
}
private LocationClient getLocationClient(Context context) {
return new LocationClient(context, ((LifecycleOwner) context).getLifecycle());
}
private boolean providerWasBound(Context context, ResultCollector collector) {
collector.addResult(context.getString(R.string.self_check_name_nlp_bound),
getLocationClient(context).isAvailable() ? Result.Positive : Result.Negative, context.getString(R.string.self_check_resolution_nlp_bound));
return getLocationClient(context).isAvailable();
UnifiedLocationClient.get(context).isAvailable() ? Positive : Negative, context.getString(R.string.self_check_resolution_nlp_bound));
return UnifiedLocationClient.get(context).isAvailable();
}
private boolean isNetworkLocationEnabled(Context context, ResultCollector collector) {
LocationManager locationManager = (LocationManager) context.getSystemService(LOCATION_SERVICE);
boolean networkEnabled = locationManager.getProviders(true).contains(NETWORK_PROVIDER);
collector.addResult(context.getString(R.string.self_check_name_network_enabled),
networkEnabled ? Result.Positive : Result.Negative, context.getString(R.string.self_check_resolution_network_enabled));
networkEnabled ? Positive : Negative, context.getString(R.string.self_check_resolution_network_enabled));
return networkEnabled;
}
@ -75,10 +71,10 @@ public class NlpStatusChecks implements org.microg.nlp.app.tools.selfcheck.SelfC
boolean hasKnown = location != null && location.getExtras() != null &&
location.getExtras().containsKey(LOCATION_EXTRA_BACKEND_COMPONENT);
collector.addResult(context.getString(R.string.self_check_name_last_location),
hasKnown ? Result.Positive : Result.Unknown, context.getString(R.string.self_check_resolution_last_location));
hasKnown ? Positive : Unknown, context.getString(R.string.self_check_resolution_last_location));
return hasKnown;
} catch (SecurityException e) {
collector.addResult(context.getString(R.string.self_check_name_last_location), Result.Unknown, context.getString(R.string.self_check_loc_perm_missing));
collector.addResult(context.getString(R.string.self_check_name_last_location), Unknown, context.getString(R.string.self_check_loc_perm_missing));
return false;
}
}
@ -95,7 +91,7 @@ public class NlpStatusChecks implements org.microg.nlp.app.tools.selfcheck.SelfC
} catch (InterruptedException e) {
}
collector.addResult(context.getString(R.string.self_check_name_nlp_is_providing),
result.get() ? Result.Positive : Result.Unknown, context.getString(R.string.self_check_resolution_nlp_is_providing));
result.get() ? Positive : Unknown, context.getString(R.string.self_check_resolution_nlp_is_providing));
}
}
}).start();
@ -123,7 +119,7 @@ public class NlpStatusChecks implements org.microg.nlp.app.tools.selfcheck.SelfC
}
}, null);
} catch (SecurityException e) {
collector.addResult(context.getString(R.string.self_check_name_last_location), Result.Unknown, context.getString(R.string.self_check_loc_perm_missing));
collector.addResult(context.getString(R.string.self_check_name_last_location), Unknown, context.getString(R.string.self_check_loc_perm_missing));
}
}
}

5
app/src/main/kotlin/org/microg/nlp/app/SettingsFragment.kt
View file

@ -9,8 +9,7 @@ import android.os.Bundle
import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.findNavController
import androidx.preference.Preference
import org.microg.nlp.client.LocationClient
import org.microg.nlp.client.GeocodeClient
import org.microg.nlp.client.UnifiedLocationClient
import org.microg.nlp.app.tools.ui.ResourceSettingsFragment
import org.microg.nlp.ui.navigate
@ -36,7 +35,7 @@ class SettingsFragment : ResourceSettingsFragment() {
}
private suspend fun updateDetails() {
val backendCount = LocationClient(requireContext(), lifecycle).getLocationBackends().size + GeocodeClient(requireContext(), lifecycle).getGeocodeBackends().size
val backendCount = UnifiedLocationClient[requireContext()].getLocationBackends().size + UnifiedLocationClient[requireContext()].getGeocoderBackends().size
findPreference<Preference>(PREF_UNIFIEDNLP)!!.summary = resources.getQuantityString(R.plurals.pref_unifiednlp_summary, backendCount, backendCount);
}