rhodes 3.2.1 → 3.2.2.beta

data/CHANGELOG

@@ -1,3 +1,10 @@
+## 3.2.2
+* Fix iPhone build for AppStore
+* Fix Android infinite loop while using GPS
+* Update IronRuby for Windows Phone 7 to log application stack while exception
+* Add generator for native extensions
+* Add real-time Barcode scanning for iPhone
+
 ## 3.2.1
 * Add migrate-rhodes-app command that updates build.yml to use latest Rhodes gem
 * Change set-rhodes-sdk command to set sdk path at build.yml only

data/Manifest.txt

@@ -430,6 +430,15 @@ lib/extensions/barcode/ext/barcode/platform/bb/ZXing/README
 lib/extensions/barcode/ext/barcode/platform/iphone/Barcode.xcodeproj/project.pbxproj
 lib/extensions/barcode/ext/barcode/platform/iphone/Barcode_Prefix.pch
 lib/extensions/barcode/ext/barcode/platform/iphone/Classes/barcode.m
+lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeCallbackHelper.h
+lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeCallbackHelper.mm
+lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewController.h
+lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewController.m
+lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewFactory.h
+lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewFactory.mm
+lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewFactoryRegister.mm
+lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewManager.h
+lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewManager.mm
 lib/extensions/barcode/ext/barcode/platform/iphone/Classes/ImageProvider.cpp
 lib/extensions/barcode/ext/barcode/platform/iphone/Classes/ImageProvider.h
 lib/extensions/barcode/ext/barcode/platform/iphone/Classes/ImageProvider.mm
@@ -445,6 +454,7 @@ lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/zbar/
 lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/zbar/Video.h
 lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/zbar/Window.h
 lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/zbar.h
+lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/ZBarCameraSimulator.h
 lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/ZBarCaptureReader.h
 lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/ZBarHelpController.h
 lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/ZBarImage.h
@@ -4710,6 +4720,32 @@ res/generators/templates/application/public/js/wp7.js
 res/generators/templates/application/Rakefile
 res/generators/templates/application/rhoconfig.txt
 res/generators/templates/bundle/db/syncdb.sqlite
+res/generators/templates/extension/app/MontanaTest/controller.rb
+res/generators/templates/extension/app/MontanaTest/index.erb
+res/generators/templates/extension/extensions/montana/ext/build
+res/generators/templates/extension/extensions/montana/ext/build.bat
+res/generators/templates/extension/extensions/montana/ext/montana/platform/android/ext_build.files
+res/generators/templates/extension/extensions/montana/ext/montana/platform/android/jni/src/montana.cpp
+res/generators/templates/extension/extensions/montana/ext/montana/platform/android/Rakefile
+res/generators/templates/extension/extensions/montana/ext/montana/platform/android/src/com/montana/Montana.java
+res/generators/templates/extension/extensions/montana/ext/montana/platform/bb/Montana.files
+res/generators/templates/extension/extensions/montana/ext/montana/platform/bb/montana.jdp
+res/generators/templates/extension/extensions/montana/ext/montana/platform/bb/Rakefile
+res/generators/templates/extension/extensions/montana/ext/montana/platform/bb/src/com/montana/Montana.java
+res/generators/templates/extension/extensions/montana/ext/montana/platform/iphone/Classes/Montana.h
+res/generators/templates/extension/extensions/montana/ext/montana/platform/iphone/Classes/Montana.m
+res/generators/templates/extension/extensions/montana/ext/montana/platform/iphone/Montana.xcodeproj/project.pbxproj
+res/generators/templates/extension/extensions/montana/ext/montana/platform/iphone/Montana_Prefix.pch
+res/generators/templates/extension/extensions/montana/ext/montana/platform/iphone/Rakefile
+res/generators/templates/extension/extensions/montana/ext/montana/platform/wm/Montana.vcproj
+res/generators/templates/extension/extensions/montana/ext/montana/platform/wm/Rakefile
+res/generators/templates/extension/extensions/montana/ext/montana/platform/wm/src/montana_wm.cpp
+res/generators/templates/extension/extensions/montana/ext/montana/platform/wm/src/montana_wm.h
+res/generators/templates/extension/extensions/montana/ext/montana/shared/ruby/montana.i
+res/generators/templates/extension/extensions/montana/ext/montana/shared/ruby/montana_wrap.c
+res/generators/templates/extension/extensions/montana/ext/montana/shared/src/montana.c
+res/generators/templates/extension/extensions/montana/ext.yml
+res/generators/templates/extension/extensions/montana/montana.rb
 res/generators/templates/model/controller.rb
 res/generators/templates/model/edit.bb.erb
 res/generators/templates/model/edit.erb

data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/barcode.cpp

@@ -5,6 +5,8 @@
 #include <logging/RhoLog.h>
 #include <stdlib.h>
 
+#include "ruby/ext/rho/rhoruby.h"
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "BarcodeJNI"
 
@@ -40,17 +42,36 @@ extern "C" const char* rho_barcode_barcode_recognize(const char* filename) {
     return barcode_result;
 }
 
-extern "C" void rho_barcode_take_barcode(const char* callback) {
+extern "C" void rho_barcode_take_barcode(const char* callback, VALUE options) {
     JNIEnv *env = jnienv();
     jclass cls = rho_find_class(env, "com/rhomobile/barcode/Barcode");
     if (!cls) return;
-    jmethodID mid = env->GetStaticMethodID( cls, "take", "(Ljava/lang/String;)V");
+    jmethodID mid = env->GetStaticMethodID( cls, "take", "(Ljava/lang/String;I)V");
     if (!mid) return;
+    
+    int camera_index = 0;
+    if (!rho_ruby_is_NIL(options)) {
+        // parse options for camera index ( 0 - main, 1 - front)
+        rho_param *param = rho_param_fromvalue(options);
+        if (param->type == RHO_PARAM_HASH) {
+            int i;
+            for (i = 0; i < param->v.hash->size; i++) {
+                if (strcasecmp(param->v.hash->name[i], "camera") == 0) {
+                    if (param->v.hash->value[i]->type == RHO_PARAM_STRING) {
+                        if (strcasecmp(param->v.hash->value[i]->v.string, "front") == 0) {
+                            camera_index = 1;
+                        }
+                    }
+                }
+            }
+        }
+        rho_param_free(param);
+    }
 
     jstring objCallback = env->NewStringUTF(callback);
     if(objCallback != NULL)
     {
-        env->CallStaticObjectMethod(cls, mid, objCallback);
+        env->CallStaticObjectMethod(cls, mid, objCallback, camera_index);
         env->DeleteLocalRef(objCallback);
     } else
     {

data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/CaptureActivity.java

@@ -82,6 +82,9 @@ import java.util.Vector;
  * @author Sean Owen
  */
 public final class CaptureActivity extends BaseActivity implements SurfaceHolder.Callback {
+	
+  public static final String CAMERA_INDEX_EXTRA = "camera_index";	
+	
 
   private static final String TAG = CaptureActivity.class.getSimpleName();
 
@@ -153,16 +156,6 @@ public final class CaptureActivity extends BaseActivity implements SurfaceHolder
     }
   };
 
-/*
-  private final DialogInterface.OnClickListener aboutListener =
-      new DialogInterface.OnClickListener() {
-    public void onClick(DialogInterface dialogInterface, int i) {
-      Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.zxing_url)));
-      intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-      startActivity(intent);
-    }
-  };
-*/
 
   ViewfinderView getViewfinderView() {
     return viewfinderView;
@@ -180,7 +173,13 @@ public final class CaptureActivity extends BaseActivity implements SurfaceHolder
     window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
     setContentView(R.layout.capture);
 
-    CameraManager.init(getApplication());
+    int camera_index = 0;
+    Intent intent = getIntent();
+    if (intent != null) {
+    	camera_index = intent.getIntExtra(CAMERA_INDEX_EXTRA, 0);
+    }
+    
+    CameraManager.init(getApplication(), camera_index);
     viewfinderView = (ViewfinderView) findViewById(R.id.viewfinder_view);
     resultView = findViewById(R.id.result_view);
     //statusView = (TextView) findViewById(R.id.status_view);
@@ -258,39 +257,6 @@ public final class CaptureActivity extends BaseActivity implements SurfaceHolder
       surfaceHolder.addCallback(this);
       surfaceHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
     }
-
-    /*
-    Intent intent = getIntent();
-    String action = intent == null ? null : intent.getAction();
-    String dataString = intent == null ? null : intent.getDataString();
-    if (intent != null && action != null) {
-      if (action.equals(Intents.Scan.ACTION)) {
-        // Scan the formats the intent requested, and return the result to the calling activity.
-        source = Source.NATIVE_APP_INTENT;
-        decodeFormats = DecodeFormatManager.parseDecodeFormats(intent);
-      } else if (dataString != null && dataString.contains(PRODUCT_SEARCH_URL_PREFIX) &&
-          dataString.contains(PRODUCT_SEARCH_URL_SUFFIX)) {
-        // Scan only products and send the result to mobile Product Search.
-        source = Source.PRODUCT_SEARCH_LINK;
-        sourceUrl = dataString;
-        decodeFormats = DecodeFormatManager.PRODUCT_FORMATS;
-      } else if (dataString != null && dataString.startsWith(ZXING_URL)) {
-        // Scan formats requested in query string (all formats if none specified).
-        // If a return URL is specified, send the results there. Otherwise, handle it ourselves.
-        source = Source.ZXING_LINK;
-        sourceUrl = dataString;
-        Uri inputUri = Uri.parse(sourceUrl);
-        returnUrlTemplate = inputUri.getQueryParameter(RETURN_URL_PARAM);
-        decodeFormats = DecodeFormatManager.parseDecodeFormats(inputUri);
-      } else {
-        // Scan all formats and handle the results ourselves (launched from Home).
-        source = Source.NONE;
-        decodeFormats = null;
-      }
-      characterSet = intent.getStringExtra(Intents.Scan.CHARACTER_SET);
-    } 
-    else
-    */ 
     {
       source = Source.NONE;
       decodeFormats = null;
@@ -346,77 +312,6 @@ public final class CaptureActivity extends BaseActivity implements SurfaceHolder
     return super.onKeyDown(keyCode, event);
   }
 
-  /*
-  @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-    super.onCreateOptionsMenu(menu);
-    menu.add(0, SHARE_ID, 0, R.string.menu_share)
-        .setIcon(android.R.drawable.ic_menu_share);
-    menu.add(0, HISTORY_ID, 0, R.string.menu_history)
-        .setIcon(android.R.drawable.ic_menu_recent_history);
-    menu.add(0, SETTINGS_ID, 0, R.string.menu_settings)
-        .setIcon(android.R.drawable.ic_menu_preferences);
-    menu.add(0, HELP_ID, 0, R.string.menu_help)
-        .setIcon(android.R.drawable.ic_menu_help);
-    menu.add(0, ABOUT_ID, 0, R.string.menu_about)
-        .setIcon(android.R.drawable.ic_menu_info_details);
-    return true;
-  }
-  */
-
-  // Don't display the share menu item if the result overlay is showing.
-  /*
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    super.onPrepareOptionsMenu(menu);
-    menu.findItem(SHARE_ID).setVisible(lastResult == null);
-    return true;
-  }
-  */
-
-  /*
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case SHARE_ID: {
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-        intent.setClassName(this, ShareActivity.class.getName());
-        startActivity(intent);
-        break;
-      }
-      case HISTORY_ID: {
-        AlertDialog historyAlert = historyManager.buildAlert();
-        historyAlert.show();
-        break;
-      }
-      case SETTINGS_ID: {
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-        intent.setClassName(this, PreferencesActivity.class.getName());
-        startActivity(intent);
-        break;
-      }
-      case HELP_ID: {
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-        intent.setClassName(this, HelpActivity.class.getName());
-        startActivity(intent);
-        break;
-      }
-      case ABOUT_ID:
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(getString(R.string.title_about) + versionName);
-        builder.setMessage(getString(R.string.msg_about) + "\n\n" + getString(R.string.zxing_url));
-        builder.setIcon(R.drawable.launcher_icon);
-        builder.setPositiveButton(R.string.button_open_browser, aboutListener);
-        builder.setNegativeButton(R.string.button_cancel, null);
-        builder.show();
-        break;
-    }
-    return super.onOptionsItemSelected(item);
-  }
-  */
 
   @Override
   public void onConfigurationChanged(Configuration config) {
@@ -457,34 +352,6 @@ public final class CaptureActivity extends BaseActivity implements SurfaceHolder
       drawResultPoints(barcode, rawResult);
       handleDecodeInternally(rawResult, barcode);
 
-      /*
-      switch (source) {
-        case NATIVE_APP_INTENT:
-        case PRODUCT_SEARCH_LINK:
-          handleDecodeExternally(rawResult, barcode);
-          break;
-        case ZXING_LINK:
-          if (returnUrlTemplate == null){
-            handleDecodeInternally(rawResult, barcode);
-          } else {
-            handleDecodeExternally(rawResult, barcode);
-          }
-          break;
-        case NONE:
-          SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-          if (prefs.getBoolean(PreferencesActivity.KEY_BULK_MODE, false)) {
-            Toast.makeText(this, R.string.msg_bulk_mode_scanned, Toast.LENGTH_SHORT).show();
-            // Wait a moment or else it will scan the same barcode continuously about 3 times
-            if (handler != null) {
-              handler.sendEmptyMessageDelayed(R.id.restart_preview, BULK_MODE_SCAN_DELAY_MS);
-            }
-            resetStatusView();
-          } else {
-            handleDecodeInternally(rawResult, barcode);
-          }
-          break;
-      }
-      */
     }
   }
 
@@ -535,53 +402,10 @@ public final class CaptureActivity extends BaseActivity implements SurfaceHolder
     resultView.setVisibility(View.VISIBLE);
 
     ImageView barcodeImageView = (ImageView) findViewById(R.id.barcode_image_view);
-    if (barcode == null) {
-      //barcodeImageView.setImageBitmap(BitmapFactory.decodeResource(getResources(),
-      //    R.drawable.launcher_icon));
-    } else {
+    if (barcode != null) {
       barcodeImageView.setImageBitmap(barcode);
     }
 
-    //ResultHandler resultHandler = ResultHandlerFactory.makeResultHandler(this, rawResult);
-
-    /*
-    TextView formatTextView = (TextView) findViewById(R.id.format_text_view);
-    formatTextView.setText(rawResult.getBarcodeFormat().toString());
-
-    TextView typeTextView = (TextView) findViewById(R.id.type_text_view);
-    typeTextView.setText(resultHandler.getType().toString());
-
-    DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-    String formattedTime = formatter.format(new Date(rawResult.getTimestamp()));
-    TextView timeTextView = (TextView) findViewById(R.id.time_text_view);
-    timeTextView.setText(formattedTime);
-
-
-    TextView metaTextView = (TextView) findViewById(R.id.meta_text_view);
-    View metaTextViewLabel = findViewById(R.id.meta_text_view_label);
-    metaTextView.setVisibility(View.GONE);
-    metaTextViewLabel.setVisibility(View.GONE);
-    */
-    
-    /*
-    Map<ResultMetadataType,Object> metadata =
-        (Map<ResultMetadataType,Object>) rawResult.getResultMetadata();
-    if (metadata != null) {
-      StringBuilder metadataText = new StringBuilder(20);
-      for (Map.Entry<ResultMetadataType,Object> entry : metadata.entrySet()) {
-        if (DISPLAYABLE_METADATA_TYPES.contains(entry.getKey())) {
-          metadataText.append(entry.getValue()).append('\n');
-        }
-      }
-      if (metadataText.length() > 0) {
-        metadataText.setLength(metadataText.length() - 1);
-        metaTextView.setText(metadataText);
-        metaTextView.setVisibility(View.VISIBLE);
-        metaTextViewLabel.setVisibility(View.VISIBLE);
-      }
-    }
-    */
-
     TextView contentsTextView = (TextView) findViewById(R.id.contents_text_view);
     CharSequence displayContents = rawResult.getText();// resultHandler.getDisplayContents();
     contentsTextView.setText(displayContents);
@@ -594,72 +418,10 @@ public final class CaptureActivity extends BaseActivity implements SurfaceHolder
     mRetakeButton.setVisibility(View.VISIBLE);
     mOKButton.setVisibility(View.VISIBLE);
     
-
-    /*
-    int buttonCount = resultHandler.getButtonCount();
-    ViewGroup buttonView = (ViewGroup) findViewById(R.id.result_button_view);
-    buttonView.requestFocus();
-    for (int x = 0; x < ResultHandler.MAX_BUTTON_COUNT; x++) {
-      TextView button = (TextView) buttonView.getChildAt(x);
-      if (x < buttonCount) {
-        button.setVisibility(View.VISIBLE);
-        button.setText(resultHandler.getButtonText(x));
-        button.setOnClickListener(new ResultButtonListener(resultHandler, x));
-      } else {
-        button.setVisibility(View.GONE);
-      }
-    }
-
-    if (copyToClipboard) {
-      ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-      clipboard.setText(displayContents);
-    }
-    */
   }
 
   // Briefly show the contents of the barcode, then handle the result outside Barcode Scanner.
   private void handleDecodeExternally(Result rawResult, Bitmap barcode) {
-	/*  
-    viewfinderView.drawResultBitmap(barcode);
-
-    // Since this message will only be shown for a second, just tell the user what kind of
-    // barcode was found (e.g. contact info) rather than the full contents, which they won't
-    // have time to read.
-    ResultHandler resultHandler = ResultHandlerFactory.makeResultHandler(this, rawResult);
-    //statusView.setText(getString(resultHandler.getDisplayTitle()));
-
-    if (copyToClipboard) {
-      ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-      clipboard.setText(resultHandler.getDisplayContents());
-    }
-
-    if (source == Source.NATIVE_APP_INTENT) {
-      // Hand back whatever action they requested - this can be changed to Intents.Scan.ACTION when
-      // the deprecated intent is retired.
-      Intent intent = new Intent(getIntent().getAction());
-      intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-      intent.putExtra(Intents.Scan.RESULT, rawResult.toString());
-      intent.putExtra(Intents.Scan.RESULT_FORMAT, rawResult.getBarcodeFormat().toString());
-      Message message = Message.obtain(handler, R.id.return_scan_result);
-      message.obj = intent;
-      handler.sendMessageDelayed(message, INTENT_RESULT_DURATION);
-    } else if (source == Source.PRODUCT_SEARCH_LINK) {
-      // Reformulate the URL which triggered us into a query, so that the request goes to the same
-      // TLD as the scan URL.
-      Message message = Message.obtain(handler, R.id.launch_product_query);
-      int end = sourceUrl.lastIndexOf("/scan");
-      message.obj = sourceUrl.substring(0, end) + "?q=" +
-          resultHandler.getDisplayContents().toString() + "&source=zxing";
-      handler.sendMessageDelayed(message, INTENT_RESULT_DURATION);
-    } else if (source == Source.ZXING_LINK) {
-      // Replace each occurrence of RETURN_CODE_PLACEHOLDER in the returnUrlTemplate
-      // with the scanned code. This allows both queries and REST-style URLs to work.
-      Message message = Message.obtain(handler, R.id.launch_product_query);
-      message.obj = returnUrlTemplate.replace(RETURN_CODE_PLACEHOLDER,
-          resultHandler.getDisplayContents().toString());
-      handler.sendMessageDelayed(message, INTENT_RESULT_DURATION);
-    }
-    */
   }
 
   /**
@@ -668,29 +430,6 @@ public final class CaptureActivity extends BaseActivity implements SurfaceHolder
    * it to a value stored as a preference.
    */
   private boolean showHelpOnFirstLaunch() {
-	  /*
-    try {
-      PackageInfo info = getPackageManager().getPackageInfo(PACKAGE_NAME, 0);
-      int currentVersion = info.versionCode;
-      // Since we're paying to talk to the PackageManager anyway, it makes sense to cache the app
-      // version name here for display in the about box later.
-      this.versionName = info.versionName;
-      SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-      int lastVersion = prefs.getInt(PreferencesActivity.KEY_HELP_VERSION_SHOWN, 0);
-      if (currentVersion > lastVersion) {
-        prefs.edit().putInt(PreferencesActivity.KEY_HELP_VERSION_SHOWN, currentVersion).commit();
-        Intent intent = new Intent(this, HelpActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-        // Show the default page on a clean install, and the what's new page on an upgrade.
-        String page = (lastVersion == 0) ? HelpActivity.DEFAULT_PAGE : HelpActivity.WHATS_NEW_PAGE;
-        intent.putExtra(HelpActivity.REQUESTED_PAGE_KEY, page);
-        startActivity(intent);
-        return true;
-      }
-    } catch (PackageManager.NameNotFoundException e) {
-      Log.w(TAG, e);
-    }
-    */
     return false;
   }
 
@@ -750,14 +489,6 @@ public final class CaptureActivity extends BaseActivity implements SurfaceHolder
   }
 
   private void displayFrameworkBugMessageAndExit() {
-    /*
-	  AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setTitle(getString(R.string.app_name));
-    builder.setMessage(getString(R.string.msg_camera_framework_bug));
-    builder.setPositiveButton(R.string.button_ok, new FinishListener(this));
-    builder.setOnCancelListener(new FinishListener(this));
-    builder.show();
-    */
   }
 
   private void resetStatusView() {