Fixed crash report

- Fixed SafeSlingerProject#8 NullPointerException in ExchangeActivity. - Restored verbose progress messages during exchange.
open-keychain · Jan 9, 2015 · 96f7c89 · 96f7c89
1 parent 6597355
commit 96f7c89
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 31 deletions.
diff --git a/project.properties b/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-21
 android.library=true
diff --git a/src/edu/cmu/cylab/starslinger/exchange/ExchangeActivity.java b/src/edu/cmu/cylab/starslinger/exchange/ExchangeActivity.java
@@ -87,39 +87,41 @@ public class ExchangeActivity extends BaseActivity {
 
         @Override
         public void run() {
+            if (mProt != null) {
+                int num = 0;
+                int numUsers = mProt.getNumUsers();
+                int numUsersMatchNonces = mProt.getNumUsersMatchNonces();
+                int numUsersKeyNodes = mProt.getNumUsersKeyNodes();
+                int numUsersSigs = mProt.getNumUsersSigs();
+                int numUsersData = mProt.getNumUsersData();
+                int numUsersCommit = mProt.getNumUsersCommit();
+                int total = numUsersCommit + numUsersData + numUsersSigs + numUsersKeyNodes
+                        + numUsersMatchNonces;
+
+                if (numUsersMatchNonces > 0 && total > (4 * numUsers)) {
+                    num = numUsersMatchNonces;
+                } else if (numUsersKeyNodes > 2 && total > (3 * numUsers)) {
+                    num = numUsersKeyNodes;
+                } else if (numUsersSigs > 0 && total > (2 * numUsers)) {
+                    num = numUsersSigs;
+                } else if (numUsersData > 0 && total > (1 * numUsers)) {
+                    num = numUsersData;
+                } else if (numUsersCommit > 0 && total > (0 * numUsers)) {
+                    num = numUsersCommit;
+                }
 
-            int num = 0;
-            int numUsers = mProt.getNumUsers();
-            int numUsersMatchNonces = mProt.getNumUsersMatchNonces();
-            int numUsersKeyNodes = mProt.getNumUsersKeyNodes();
-            int numUsersSigs = mProt.getNumUsersSigs();
-            int numUsersData = mProt.getNumUsersData();
-            int numUsersCommit = mProt.getNumUsersCommit();
-            int total = numUsersCommit + numUsersData + numUsersSigs + numUsersKeyNodes
-                    + numUsersMatchNonces;
-
-            if (numUsersMatchNonces > 0 && total > (4 * numUsers)) {
-                num = numUsersMatchNonces;
-            } else if (numUsersKeyNodes > 2 && total > (3 * numUsers)) {
-                num = numUsersKeyNodes;
-            } else if (numUsersSigs > 0 && total > (2 * numUsers)) {
-                num = numUsersSigs;
-            } else if (numUsersData > 0 && total > (1 * numUsers)) {
-                num = numUsersData;
-            } else if (numUsersCommit > 0 && total > (0 * numUsers)) {
-                num = numUsersCommit;
-            }
+                String msg;
+                if (num > 0) {
+                    String msgNRecvItems = String.format(getString(R.string.label_ReceivedNItems),
+                            num);
+                    msg = String.format("%s\n\n%s", mProgressMsg, msgNRecvItems);
+                } else {
+                    msg = mProgressMsg;
+                }
 
-            String msg;
-            if (num > 0) {
-                String msgNRecvItems = String.format(getString(R.string.label_ReceivedNItems), num);
-                msg = String.format("%s\n\n%s", mProgressMsg, msgNRecvItems);
-            } else {
-                msg = mProgressMsg;
+                showProgressUpdate(msg);
+                mHandler.postDelayed(this, MS_POLL_INTERVAL);
             }
-
-            showProgressUpdate(msg);
-            mHandler.postDelayed(this, MS_POLL_INTERVAL);
         }
     };
 
@@ -722,6 +724,7 @@ private Dialog xshowProgress(Activity act, Bundle args) {
         }
         mDlgProg = new ProgressDialog(act);
         mDlgProg.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+        mDlgProg.setTitle(mProt.getStatusBanner(ExchangeActivity.this));
         mDlgProg.setMessage(msg);
         mProgressMsg = msg;
         mDlgProg.setCancelable(true);
@@ -773,4 +776,14 @@ protected void onSaveInstanceState(Bundle outState) {
         }
         super.onSaveInstanceState(outState);
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        if (mHandler != null) {
+            mHandler.removeCallbacks(mUpdateReceivedProg);
+        }
+        mProt.endProtocol();
+    }
 }