remove unneeded permissions, get progaurd working, remove parceler warnings with bean
This commit is contained in:
parent
a22e3ad069
commit
c8e91cc9ef
|
@ -8,14 +8,13 @@ android {
|
||||||
applicationId "com.eleith.calchoochoo"
|
applicationId "com.eleith.calchoochoo"
|
||||||
minSdkVersion 22
|
minSdkVersion 22
|
||||||
targetSdkVersion 25
|
targetSdkVersion 25
|
||||||
versionCode 3
|
versionCode 4
|
||||||
versionName "1.2"
|
versionName "1.3"
|
||||||
|
|
||||||
resValue "string", "GOOGLE_MAPS_API_KEY", GOOGLE_MAPS_API_KEY
|
resValue "string", "GOOGLE_MAPS_API_KEY", GOOGLE_MAPS_API_KEY
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
minifyEnabled false
|
minifyEnabled true
|
||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,3 +15,30 @@
|
||||||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||||
# public *;
|
# public *;
|
||||||
#}
|
#}
|
||||||
|
|
||||||
|
-dontwarn org.joda.convert.**
|
||||||
|
-dontwarn org.joda.time.**
|
||||||
|
-keep class org.joda.time.** { *; }
|
||||||
|
-keep interface org.joda.time.** { *; }
|
||||||
|
|
||||||
|
-dontwarn sun.misc.**
|
||||||
|
|
||||||
|
-keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
|
||||||
|
long producerIndex;
|
||||||
|
long consumerIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef {
|
||||||
|
rx.internal.util.atomic.LinkedQueueNode producerNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueConsumerNodeRef {
|
||||||
|
rx.internal.util.atomic.LinkedQueueNode consumerNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
-dontnote rx.internal.util.PlatformDependent
|
||||||
|
|
||||||
|
# Parceler library
|
||||||
|
-keep interface org.parceler.Parcel
|
||||||
|
-keep @org.parceler.Parcel class * { *; }
|
||||||
|
-keep class **$$Parcelable { *; }
|
||||||
|
|
|
@ -1,9 +1,26 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest
|
||||||
package="com.eleith.calchoochoo">
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
package="com.eleith.calchoochoo">
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
|
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
|
||||||
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
|
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
|
||||||
|
<uses-permission
|
||||||
|
android:name="android.permission.CHANGE_NETWORK_STATE"
|
||||||
|
tools:node="remove"/>
|
||||||
|
<uses-permission
|
||||||
|
android:name="android.permission.WAKE_LOCK"
|
||||||
|
tools:node="remove"/>
|
||||||
|
<uses-permission
|
||||||
|
android:name="android.permission.READ_PHONE_STATE"
|
||||||
|
tools:node="remove"/>
|
||||||
|
<uses-permission
|
||||||
|
android:name="android.permission.READ_EXTERNAL_STORAGE"
|
||||||
|
tools:node="remove"/>
|
||||||
|
<uses-permission
|
||||||
|
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
|
||||||
|
tools:node="remove"/>
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:name=".ChooChooApplication"
|
android:name=".ChooChooApplication"
|
||||||
|
@ -46,8 +63,8 @@
|
||||||
|
|
||||||
<receiver android:name=".ChooChooAlarmReceiver">
|
<receiver android:name=".ChooChooAlarmReceiver">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.media.action.DISPLAY_NOTIFICATION" />
|
<action android:name="android.media.action.DISPLAY_NOTIFICATION"/>
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT"/>
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ package com.eleith.calchoochoo.data;
|
||||||
import org.joda.time.LocalTime;
|
import org.joda.time.LocalTime;
|
||||||
import org.parceler.Parcel;
|
import org.parceler.Parcel;
|
||||||
|
|
||||||
@Parcel
|
@Parcel(Parcel.Serialization.BEAN)
|
||||||
public class PossibleTrain {
|
public class PossibleTrain {
|
||||||
private String stopParentId;
|
private String stopParentId;
|
||||||
private String stopId;
|
private String stopId;
|
||||||
|
|
|
@ -3,7 +3,7 @@ package com.eleith.calchoochoo.data;
|
||||||
import org.joda.time.LocalTime;
|
import org.joda.time.LocalTime;
|
||||||
import org.parceler.Parcel;
|
import org.parceler.Parcel;
|
||||||
|
|
||||||
@Parcel
|
@Parcel(Parcel.Serialization.BEAN)
|
||||||
public class PossibleTrip {
|
public class PossibleTrip {
|
||||||
private String firstStopId = "";
|
private String firstStopId = "";
|
||||||
private String firstStopName = "";
|
private String firstStopName = "";
|
||||||
|
|
|
@ -6,7 +6,7 @@ import org.parceler.Parcel;
|
||||||
|
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
|
|
||||||
@Parcel(analyze = Stop.class)
|
@Parcel(Parcel.Serialization.BEAN)
|
||||||
public class Stop {
|
public class Stop {
|
||||||
public String stop_id;
|
public String stop_id;
|
||||||
public String stop_name;
|
public String stop_name;
|
||||||
|
@ -21,9 +21,6 @@ public class Stop {
|
||||||
|
|
||||||
private Location location;
|
private Location location;
|
||||||
|
|
||||||
public Stop() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public Location getLocation() {
|
public Location getLocation() {
|
||||||
if (location == null) {
|
if (location == null) {
|
||||||
location = new Location("");
|
location = new Location("");
|
||||||
|
|
Reference in New Issue