Remove unnecessary changes
This commit is contained in:
parent
2910df88e1
commit
67039222c5
3 changed files with 5 additions and 34 deletions
|
@ -1,27 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<application
|
||||
android:icon="@mipmap/icon_free"
|
||||
android:label="@string/app_name"
|
||||
tools:replace="android:icon, android:label">
|
||||
|
||||
<activity
|
||||
android:name="net.osmand.plus.activities.MapActivity"
|
||||
android:theme="@style/FirstSplashScreenFree"
|
||||
tools:replace="android:theme" />
|
||||
|
||||
<service
|
||||
android:name="net.osmand.plus.NavigationService"
|
||||
android:process="net.osmand"
|
||||
tools:replace="android:process" />
|
||||
|
||||
<provider
|
||||
android:name="androidx.core.content.FileProvider"
|
||||
android:authorities="net.osmand.fileprovider"
|
||||
tools:replace="android:authorities" />
|
||||
|
||||
</application>
|
||||
|
||||
</manifest>
|
|
@ -85,7 +85,7 @@ android {
|
|||
}
|
||||
amazonFree {
|
||||
java.srcDirs = ["src-nogms", "src-amazon"]
|
||||
manifest.srcFile "AndroidManifest-amazon.xml"
|
||||
manifest.srcFile "AndroidManifest-gplayFree.xml"
|
||||
}
|
||||
amazonFull {
|
||||
java.srcDirs = ["src-nogms", "src-amazon"]
|
||||
|
|
|
@ -4,12 +4,10 @@ import net.osmand.plus.OsmandApplication;
|
|||
|
||||
public class InAppPurchasesImpl extends InAppPurchases {
|
||||
|
||||
private static final InAppSubscription[] LIVE_UPDATES_FREE = new InAppSubscription[] {};
|
||||
|
||||
public InAppPurchasesImpl(OsmandApplication ctx) {
|
||||
super(ctx);
|
||||
inAppPurchases = new InAppPurchase[] {};
|
||||
liveUpdates = new LiveUpdatesInAppPurchasesFree();
|
||||
liveUpdates = new EmptyLiveUpdatesList();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -32,10 +30,10 @@ public class InAppPurchasesImpl extends InAppPurchases {
|
|||
return false;
|
||||
}
|
||||
|
||||
private static class LiveUpdatesInAppPurchasesFree extends InAppSubscriptionList {
|
||||
private static class EmptyLiveUpdatesList extends InAppSubscriptionList {
|
||||
|
||||
public LiveUpdatesInAppPurchasesFree() {
|
||||
super(LIVE_UPDATES_FREE);
|
||||
public EmptyLiveUpdatesList() {
|
||||
super(new InAppSubscription[] {});
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue