mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a few small app bugs from stack traces, and update plugins

Browse source
This commit is contained in:
Sean Owen 2015-08-17 09:52:57 +01:00
parent 4dd053a919
commit 7ee719b613
4 changed files with 33 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/src/com/google/zxing/client/android/CaptureActivity.java
View file

@ -377,13 +377,11 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent intent) { public void onActivityResult(int requestCode, int resultCode, Intent intent) {
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK && requestCode == HISTORY_REQUEST_CODE && historyManager != null) {
if (requestCode == HISTORY_REQUEST_CODE) { int itemNumber = intent.getIntExtra(Intents.History.ITEM_NUMBER, -1);
int itemNumber = intent.getIntExtra(Intents.History.ITEM_NUMBER, -1); if (itemNumber >= 0) {
if (itemNumber >= 0) { HistoryItem historyItem = historyManager.buildHistoryItem(itemNumber);
HistoryItem historyItem = historyManager.buildHistoryItem(itemNumber); decodeOrStoreSavedBitmap(null, historyItem.getResult());
decodeOrStoreSavedBitmap(null, historyItem.getResult());
}
} }
} }
} }

47
android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java
View file

@ -30,6 +30,7 @@ import java.io.IOException;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.concurrent.RejectedExecutionException;
import com.google.zxing.client.android.history.HistoryManager; import com.google.zxing.client.android.history.HistoryManager;
import com.google.zxing.client.result.ISBNParsedResult; import com.google.zxing.client.result.ISBNParsedResult;
@ -45,27 +46,31 @@ public abstract class SupplementalInfoRetriever extends AsyncTask<Object,Object,
ParsedResult result, ParsedResult result,
HistoryManager historyManager, HistoryManager historyManager,
Context context) { Context context) {
if (result instanceof URIParsedResult) { try {
SupplementalInfoRetriever uriRetriever = if (result instanceof URIParsedResult) {
new URIResultInfoRetriever(textView, (URIParsedResult) result, historyManager, context); SupplementalInfoRetriever uriRetriever =
uriRetriever.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); new URIResultInfoRetriever(textView, (URIParsedResult) result, historyManager, context);
SupplementalInfoRetriever titleRetriever = uriRetriever.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
new TitleRetriever(textView, (URIParsedResult) result, historyManager); SupplementalInfoRetriever titleRetriever =
titleRetriever.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); new TitleRetriever(textView, (URIParsedResult) result, historyManager);
} else if (result instanceof ProductParsedResult) { titleRetriever.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
ProductParsedResult productParsedResult = (ProductParsedResult) result; } else if (result instanceof ProductParsedResult) {
String productID = productParsedResult.getProductID(); ProductParsedResult productParsedResult = (ProductParsedResult) result;
SupplementalInfoRetriever productRetriever = String productID = productParsedResult.getProductID();
new ProductResultInfoRetriever(textView, productID, historyManager, context); SupplementalInfoRetriever productRetriever =
productRetriever.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); new ProductResultInfoRetriever(textView, productID, historyManager, context);
} else if (result instanceof ISBNParsedResult) { productRetriever.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
String isbn = ((ISBNParsedResult) result).getISBN(); } else if (result instanceof ISBNParsedResult) {
SupplementalInfoRetriever productInfoRetriever = String isbn = ((ISBNParsedResult) result).getISBN();
new ProductResultInfoRetriever(textView, isbn, historyManager, context); SupplementalInfoRetriever productInfoRetriever =
productInfoRetriever.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); new ProductResultInfoRetriever(textView, isbn, historyManager, context);
SupplementalInfoRetriever bookInfoRetriever = productInfoRetriever.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
new BookResultInfoRetriever(textView, isbn, historyManager, context); SupplementalInfoRetriever bookInfoRetriever =
bookInfoRetriever.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); new BookResultInfoRetriever(textView, isbn, historyManager, context);
bookInfoRetriever.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
} catch (RejectedExecutionException ree) {
// do nothing
} }
} }

2
pom.xml
View file

@ -407,7 +407,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId> <artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.1</version> <version>3.0.2</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

2
zxingorg/pom.xml
View file

@ -61,7 +61,7 @@
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>9.3.0.v20150612</version> <version>9.3.2.v20150730</version>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>