fix early crashes on Replicant 6

Wrapper class was not public, and Proguard was removing an enclosing
class that the dbus lib requires.

3 files changed, 6 insertions, 1 deletions

diff --git a/README.md b/README.md
index 7be4693..34a435f 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,7 @@ Nothing is thoroughly tested nor tried on a broad selection of hardware/networks
 * make dbus exceptions be checked exceptions, so the compiler will find them and I have to handle them
 * crashes in airplane mode trying to query properties on probably not-up interfaces
 * remove anonymous auth from dbus.conf (currently there to ease debugging; not needed for the RIL code to connect properly)
+* better fix for org.ofono.Message proguard kept class? (check the commit that added this to see what I'm talking about)
 
 # Code review
 
diff --git a/build/java/net/scintill/ril_ofono/BuildRilWrapper.java b/build/java/net/scintill/ril_ofono/BuildRilWrapper.java
index cbe45cd..0a6e9c0 100644
--- a/build/java/net/scintill/ril_ofono/BuildRilWrapper.java
+++ b/build/java/net/scintill/ril_ofono/BuildRilWrapper.java
@@ -52,7 +52,7 @@ import java.util.List;
         os.println("import static net.scintill.ril_ofono.RilOfono.runOnDbusThread;");
         os.println("import static com.android.internal.telephony.CommandException.Error.GENERIC_FAILURE;");
 
-        os.println("/*package*/ class RilWrapper extends RilWrapperBase {");
+        os.println("public class RilWrapper extends RilWrapperBase {");
 
         os.println("public RilWrapper(android.content.Context ctx, int networkMode, int cdmaSubscription, Integer instanceId) {");
         os.println("super(ctx);");
diff --git a/proguard.flags b/proguard.flags
index 0c9dac4..9763262 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -23,5 +23,9 @@
 	<init>(...);
 }
 
+# dbus lib requires signals to have enclosing class; this one would be dropped otherwise
+-keep class org.ofono.Message {
+}
+
 -verbose
 #-printseeds