eleith
/
calchoochoo
Archived
1
0
Fork 0

remove unneeded permissions, get progaurd working, remove parceler warnings with bean

This commit is contained in:
eleith 2017-04-23 02:53:26 -07:00
parent a22e3ad069
commit c8e91cc9ef
6 changed files with 54 additions and 14 deletions

View File

@ -8,14 +8,13 @@ android {
applicationId "com.eleith.calchoochoo"
minSdkVersion 22
targetSdkVersion 25
versionCode 3
versionName "1.2"
versionCode 4
versionName "1.3"
resValue "string", "GOOGLE_MAPS_API_KEY", GOOGLE_MAPS_API_KEY
}
buildTypes {
release {
minifyEnabled false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

View File

@ -15,3 +15,30 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# 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 { *; }

View File

@ -1,9 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.eleith.calchoochoo">
<manifest
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_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
android:name=".ChooChooApplication"
@ -46,8 +63,8 @@
<receiver android:name=".ChooChooAlarmReceiver">
<intent-filter>
<action android:name="android.media.action.DISPLAY_NOTIFICATION" />
<category android:name="android.intent.category.DEFAULT" />
<action android:name="android.media.action.DISPLAY_NOTIFICATION"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</receiver>

View File

@ -3,7 +3,7 @@ package com.eleith.calchoochoo.data;
import org.joda.time.LocalTime;
import org.parceler.Parcel;
@Parcel
@Parcel(Parcel.Serialization.BEAN)
public class PossibleTrain {
private String stopParentId;
private String stopId;

View File

@ -3,7 +3,7 @@ package com.eleith.calchoochoo.data;
import org.joda.time.LocalTime;
import org.parceler.Parcel;
@Parcel
@Parcel(Parcel.Serialization.BEAN)
public class PossibleTrip {
private String firstStopId = "";
private String firstStopName = "";

View File

@ -6,7 +6,7 @@ import org.parceler.Parcel;
import java.util.Comparator;
@Parcel(analyze = Stop.class)
@Parcel(Parcel.Serialization.BEAN)
public class Stop {
public String stop_id;
public String stop_name;
@ -21,9 +21,6 @@ public class Stop {
private Location location;
public Stop() {
}
public Location getLocation() {
if (location == null) {
location = new Location("");