Fix crash on empty data && Assign classloader

renyuneyun · Sep 23, 2018 · a81351d · a81351d
1 parent 7f7d161
commit a81351d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "ryey.easeroperationpluginexample"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 2
-        versionName "1.1"
+        versionCode 3
+        versionName "1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/ryey/easeroperationpluginexample/EditDataActivity.java b/app/src/main/java/ryey/easeroperationpluginexample/EditDataActivity.java
@@ -33,21 +33,26 @@
 
 public class EditDataActivity extends AppCompatActivity {
 
-    ExampleData data;
-    private PluginDataFormat format;
+    private PluginDataFormat format = PluginDataFormat.JSON;
     private EditText editText;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_edit_data);
-        Intent intent = getIntent();
-        RemoteOperationData remoteOperationData = intent.getParcelableExtra(RemotePlugin.EXTRA_DATA);
-        data = new ExampleData(remoteOperationData);
-        format = remoteOperationData.format;
         editText = findViewById(R.id.editText);
 
-        editText.setText(data.packageName);
+        Intent intent = getIntent();
+        if (intent != null) {
+            intent.setExtrasClassLoader(RemoteOperationData.class.getClassLoader());
+            RemoteOperationData remoteOperationData = intent.getParcelableExtra(RemotePlugin.EXTRA_DATA);
+            if (remoteOperationData != null) {
+                ExampleData data = new ExampleData(remoteOperationData);
+                format = remoteOperationData.format;
+                editText.setText(data.packageName);
+            }
+        }
+
     }
 
     @Override
@@ -59,7 +64,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.ok) {
-            data = new ExampleData(editText.getText().toString());
+            ExampleData data = new ExampleData(editText.getText().toString());
             Intent intent = new Intent();
             if (format == null) {
                 format = PluginDataFormat.JSON;

diff --git a/app/src/main/java/ryey/easeroperationpluginexample/TriggerOperationReceiver.java b/app/src/main/java/ryey/easeroperationpluginexample/TriggerOperationReceiver.java
@@ -33,6 +33,7 @@ public class TriggerOperationReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         Log.d("TriggerReceiver", "onReceive");
         if (RemotePlugin.OperationPlugin.ACTION_TRIGGER.equals(intent.getAction())) {
+            intent.setExtrasClassLoader(RemoteOperationData.class.getClassLoader());
             RemoteOperationData remoteOperationData = intent.getParcelableExtra(RemotePlugin.EXTRA_DATA);
             ExampleData data = new ExampleData(remoteOperationData);
             Intent startActivityIntent = context.getPackageManager().getLaunchIntentForPackage(data.packageName);