Fixed sharing apk bug

BuildmLearn · Aug 16, 2015 · 0f868ef · 0f868ef
1 parent 2b0a003
commit 0f868ef
Showing 1 changed file with 60 additions and 21 deletions.
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TemplateEditor.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TemplateEditor.java
@@ -302,27 +302,7 @@ public void onClick(DialogInterface dialog, int id) {
                                 saveProject();
                                 break;
                             case R.id.share_apk:
-                                Uri fileUri = Uri.fromFile(new File(toolkit.getApkDir() + "FlashCardTemplateApp_v2.0.apk"));
-                                try {
-                                    ArrayList<Uri> uris = new ArrayList<Uri>();
-                                    Intent sendIntent = new Intent(Intent.ACTION_SEND_MULTIPLE);
-                                    sendIntent.setType("application/vnd.android.package-archive");
-                                    uris.add(fileUri);
-                                    sendIntent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
-                                    startActivity(Intent.createChooser(sendIntent, null));
-
-
-                                } catch (Exception e) {
-
-                                    ArrayList<Uri> uris = new ArrayList<Uri>();
-                                    Intent sendIntent = new Intent(Intent.ACTION_SEND_MULTIPLE);
-                                    sendIntent.setType("application/zip");
-                                    uris.add(fileUri);
-                                    sendIntent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
-                                    startActivity(Intent.createChooser(sendIntent, null));
-                                }
-                                break;
-                            case R.id.save_apk:
+
                                 String savedFilePath = saveProject();
                                 if (savedFilePath == null || savedFilePath.length() == 0) {
                                     return;
@@ -333,6 +313,65 @@ public void onClick(DialogInterface dialog, int id) {
                                 KeyStoreDetails keyStoreDetails = new KeyStoreDetails("TestKeyStore.jks", keyPassword, aliasName, aliaspassword);
                                 SignerThread signer = new SignerThread(getApplicationContext(), selectedTemplate.getApkFilePath(), saveProject(), keyStoreDetails, selectedTemplate.getAssetsFilePath(), selectedTemplate.getAssetsFileName());
 
+                                mApkGenerationDialog = new MaterialDialog.Builder(TemplateEditor.this)
+                                        .title(R.string.apk_progress_dialog)
+                                        .content(R.string.apk_msg)
+                                        .cancelable(false)
+                                        .progress(true, 0)
+                                        .show();
+
+                                signer.setSignerThreadListener(new SignerThread.OnSignComplete() {
+                                    @Override
+                                    public void onSuccess(final String path) {
+                                        Log.d(TAG, "APK generated");
+                                        mApkGenerationDialog.dismiss();
+
+                                        Uri fileUri = Uri.fromFile(new File(path));
+                                        try {
+                                            ArrayList<Uri> uris = new ArrayList<Uri>();
+                                            Intent sendIntent = new Intent(Intent.ACTION_SEND_MULTIPLE);
+                                            sendIntent.setType("application/vnd.android.package-archive");
+                                            uris.add(fileUri);
+                                            sendIntent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
+                                            startActivity(Intent.createChooser(sendIntent, null));
+
+
+                                        } catch (Exception e) {
+
+                                            ArrayList<Uri> uris = new ArrayList<Uri>();
+                                            Intent sendIntent = new Intent(Intent.ACTION_SEND_MULTIPLE);
+                                            sendIntent.setType("application/zip");
+                                            uris.add(fileUri);
+                                            sendIntent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
+                                            startActivity(Intent.createChooser(sendIntent, null));
+                                        }
+
+                                    }
+
+                                    @Override
+                                    public void onFail(Exception e) {
+                                        if (e != null) {
+                                            e.printStackTrace();
+                                            mApkGenerationDialog.dismiss();
+                                            Toast.makeText(TemplateEditor.this, "Build unsuccessful", Toast.LENGTH_SHORT).show();
+                                        }
+                                    }
+                                });
+
+                                signer.start();
+
+                                break;
+                            case R.id.save_apk:
+                                savedFilePath = saveProject();
+                                if (savedFilePath == null || savedFilePath.length() == 0) {
+                                    return;
+                                }
+                                keyPassword = getString(R.string.key_password);
+                                aliasName = getString(R.string.alias_name);
+                                aliaspassword = getString(R.string.alias_password);
+                                keyStoreDetails = new KeyStoreDetails("TestKeyStore.jks", keyPassword, aliasName, aliaspassword);
+                                signer = new SignerThread(getApplicationContext(), selectedTemplate.getApkFilePath(), saveProject(), keyStoreDetails, selectedTemplate.getAssetsFilePath(), selectedTemplate.getAssetsFileName());
+
                                 mApkGenerationDialog = new MaterialDialog.Builder(TemplateEditor.this)
                                         .title(R.string.apk_progress_dialog)
                                         .content(R.string.apk_msg)