summaryrefslogtreecommitdiff
path: root/android/src/com/artifex
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2013-05-27 14:51:33 +0200
committerTor Andersson <tor.andersson@artifex.com>2013-05-27 14:51:33 +0200
commit868a21fe07d4ac760a3bc429edefe860b8255b6d (patch)
treead6dc7f02cd757c3de22417dcf41233c93e188bf /android/src/com/artifex
parentaf13164924fb4c627f201c943c7a18e5dbe39507 (diff)
downloadmupdf-868a21fe07d4ac760a3bc429edefe860b8255b6d.tar.xz
Fix indentation to be consistent with regard to tabs/spaces.
Diffstat (limited to 'android/src/com/artifex')
-rw-r--r--android/src/com/artifex/mupdfdemo/MuPDFActivity.java2
-rw-r--r--android/src/com/artifex/mupdfdemo/OutlineActivity.java15
-rw-r--r--android/src/com/artifex/mupdfdemo/PrintDialogActivity.java256
-rw-r--r--android/src/com/artifex/mupdfdemo/ReaderView.java7
-rw-r--r--android/src/com/artifex/mupdfdemo/SearchTaskResult.java1
5 files changed, 139 insertions, 142 deletions
diff --git a/android/src/com/artifex/mupdfdemo/MuPDFActivity.java b/android/src/com/artifex/mupdfdemo/MuPDFActivity.java
index 3133fc17..31ccc916 100644
--- a/android/src/com/artifex/mupdfdemo/MuPDFActivity.java
+++ b/android/src/com/artifex/mupdfdemo/MuPDFActivity.java
@@ -241,7 +241,6 @@ public class MuPDFActivity extends Activity
{
super.onCreate(savedInstanceState);
-
mAlertBuilder = new AlertDialog.Builder(this);
if (core == null) {
@@ -359,7 +358,6 @@ public class MuPDFActivity extends Activity
alert.show();
}
-
public void createUI(Bundle savedInstanceState) {
if (core == null)
return;
diff --git a/android/src/com/artifex/mupdfdemo/OutlineActivity.java b/android/src/com/artifex/mupdfdemo/OutlineActivity.java
index bd1b19ba..52b0d410 100644
--- a/android/src/com/artifex/mupdfdemo/OutlineActivity.java
+++ b/android/src/com/artifex/mupdfdemo/OutlineActivity.java
@@ -7,17 +7,18 @@ import android.widget.ListView;
public class OutlineActivity extends ListActivity {
OutlineItem mItems[];
+
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ super.onCreate(savedInstanceState);
- mItems = OutlineActivityData.get().items;
- setListAdapter(new OutlineAdapter(getLayoutInflater(),mItems));
- // Restore the position within the list from last viewing
- getListView().setSelection(OutlineActivityData.get().position);
- getListView().setDividerHeight(0);
- setResult(-1);
+ mItems = OutlineActivityData.get().items;
+ setListAdapter(new OutlineAdapter(getLayoutInflater(),mItems));
+ // Restore the position within the list from last viewing
+ getListView().setSelection(OutlineActivityData.get().position);
+ getListView().setDividerHeight(0);
+ setResult(-1);
}
@Override
diff --git a/android/src/com/artifex/mupdfdemo/PrintDialogActivity.java b/android/src/com/artifex/mupdfdemo/PrintDialogActivity.java
index bcef1cbd..d96322d5 100644
--- a/android/src/com/artifex/mupdfdemo/PrintDialogActivity.java
+++ b/android/src/com/artifex/mupdfdemo/PrintDialogActivity.java
@@ -14,132 +14,132 @@ import android.webkit.WebView;
import android.webkit.WebViewClient;
public class PrintDialogActivity extends Activity {
- private static final String PRINT_DIALOG_URL = "https://www.google.com/cloudprint/dialog.html";
- private static final String JS_INTERFACE = "AndroidPrintDialog";
- private static final String CONTENT_TRANSFER_ENCODING = "base64";
-
- private static final String ZXING_URL = "http://zxing.appspot.com";
- private static final int ZXING_SCAN_REQUEST = 65743;
-
- /**
- * Post message that is sent by Print Dialog web page when the printing dialog
- * needs to be closed.
- */
- private static final String CLOSE_POST_MESSAGE_NAME = "cp-dialog-on-close";
-
- /**
- * Web view element to show the printing dialog in.
- */
- private WebView dialogWebView;
-
- /**
- * Intent that started the action.
- */
- Intent cloudPrintIntent;
-
- private int resultCode;
-
- @Override
- public void onCreate(Bundle icicle) {
- super.onCreate(icicle);
-
- resultCode = RESULT_OK;
- setContentView(R.layout.print_dialog);
- dialogWebView = (WebView) findViewById(R.id.webview);
- cloudPrintIntent = this.getIntent();
-
- WebSettings settings = dialogWebView.getSettings();
- settings.setJavaScriptEnabled(true);
-
- dialogWebView.setWebViewClient(new PrintDialogWebClient());
- dialogWebView.addJavascriptInterface(
- new PrintDialogJavaScriptInterface(), JS_INTERFACE);
-
- dialogWebView.loadUrl(PRINT_DIALOG_URL);
- }
-
- @Override
- public void onActivityResult(int requestCode, int resultCode, Intent intent) {
- if (requestCode == ZXING_SCAN_REQUEST && resultCode == RESULT_OK) {
- dialogWebView.loadUrl(intent.getStringExtra("SCAN_RESULT"));
- }
- }
-
- final class PrintDialogJavaScriptInterface {
- public String getType() {
- return cloudPrintIntent.getType();
- }
-
- public String getTitle() {
- return cloudPrintIntent.getExtras().getString("title");
- }
-
- public String getContent() {
- try {
- ContentResolver contentResolver = getContentResolver();
- InputStream is = contentResolver.openInputStream(cloudPrintIntent.getData());
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
- byte[] buffer = new byte[4096];
- int n = is.read(buffer);
- while (n >= 0) {
- baos.write(buffer, 0, n);
- n = is.read(buffer);
- }
- is.close();
- baos.flush();
-
- return Base64.encodeToString(baos.toByteArray(), Base64.DEFAULT);
- } catch (Throwable e) {
- resultCode = RESULT_CANCELED;
- setResult(resultCode);
- finish();
- e.printStackTrace();
- }
- return "";
- }
-
- public String getEncoding() {
- return CONTENT_TRANSFER_ENCODING;
- }
-
- public void onPostMessage(String message) {
- if (message.startsWith(CLOSE_POST_MESSAGE_NAME)) {
- setResult(resultCode);
- finish();
- }
- }
- }
-
- private final class PrintDialogWebClient extends WebViewClient {
- @Override
- public boolean shouldOverrideUrlLoading(WebView view, String url) {
- if (url.startsWith(ZXING_URL)) {
- Intent intentScan = new Intent("com.google.zxing.client.android.SCAN");
- intentScan.putExtra("SCAN_MODE", "QR_CODE_MODE");
- try {
- startActivityForResult(intentScan, ZXING_SCAN_REQUEST);
- } catch (ActivityNotFoundException error) {
- view.loadUrl(url);
- }
- } else {
- view.loadUrl(url);
- }
- return false;
- }
-
- @Override
- public void onPageFinished(WebView view, String url) {
- if (PRINT_DIALOG_URL.equals(url)) {
- // Submit print document.
- view.loadUrl("javascript:printDialog.setPrintDocument(printDialog.createPrintDocument("
- + "window." + JS_INTERFACE + ".getType(),window." + JS_INTERFACE + ".getTitle(),"
- + "window." + JS_INTERFACE + ".getContent(),window." + JS_INTERFACE + ".getEncoding()))");
-
- // Add post messages listener.
- view.loadUrl("javascript:window.addEventListener('message',"
- + "function(evt){window." + JS_INTERFACE + ".onPostMessage(evt.data)}, false)");
- }
- }
- }
+ private static final String PRINT_DIALOG_URL = "https://www.google.com/cloudprint/dialog.html";
+ private static final String JS_INTERFACE = "AndroidPrintDialog";
+ private static final String CONTENT_TRANSFER_ENCODING = "base64";
+
+ private static final String ZXING_URL = "http://zxing.appspot.com";
+ private static final int ZXING_SCAN_REQUEST = 65743;
+
+ /**
+ * Post message that is sent by Print Dialog web page when the printing dialog
+ * needs to be closed.
+ */
+ private static final String CLOSE_POST_MESSAGE_NAME = "cp-dialog-on-close";
+
+ /**
+ * Web view element to show the printing dialog in.
+ */
+ private WebView dialogWebView;
+
+ /**
+ * Intent that started the action.
+ */
+ Intent cloudPrintIntent;
+
+ private int resultCode;
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+
+ resultCode = RESULT_OK;
+ setContentView(R.layout.print_dialog);
+ dialogWebView = (WebView) findViewById(R.id.webview);
+ cloudPrintIntent = this.getIntent();
+
+ WebSettings settings = dialogWebView.getSettings();
+ settings.setJavaScriptEnabled(true);
+
+ dialogWebView.setWebViewClient(new PrintDialogWebClient());
+ dialogWebView.addJavascriptInterface(
+ new PrintDialogJavaScriptInterface(), JS_INTERFACE);
+
+ dialogWebView.loadUrl(PRINT_DIALOG_URL);
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+ if (requestCode == ZXING_SCAN_REQUEST && resultCode == RESULT_OK) {
+ dialogWebView.loadUrl(intent.getStringExtra("SCAN_RESULT"));
+ }
+ }
+
+ final class PrintDialogJavaScriptInterface {
+ public String getType() {
+ return cloudPrintIntent.getType();
+ }
+
+ public String getTitle() {
+ return cloudPrintIntent.getExtras().getString("title");
+ }
+
+ public String getContent() {
+ try {
+ ContentResolver contentResolver = getContentResolver();
+ InputStream is = contentResolver.openInputStream(cloudPrintIntent.getData());
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ byte[] buffer = new byte[4096];
+ int n = is.read(buffer);
+ while (n >= 0) {
+ baos.write(buffer, 0, n);
+ n = is.read(buffer);
+ }
+ is.close();
+ baos.flush();
+
+ return Base64.encodeToString(baos.toByteArray(), Base64.DEFAULT);
+ } catch (Throwable e) {
+ resultCode = RESULT_CANCELED;
+ setResult(resultCode);
+ finish();
+ e.printStackTrace();
+ }
+ return "";
+ }
+
+ public String getEncoding() {
+ return CONTENT_TRANSFER_ENCODING;
+ }
+
+ public void onPostMessage(String message) {
+ if (message.startsWith(CLOSE_POST_MESSAGE_NAME)) {
+ setResult(resultCode);
+ finish();
+ }
+ }
+ }
+
+ private final class PrintDialogWebClient extends WebViewClient {
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, String url) {
+ if (url.startsWith(ZXING_URL)) {
+ Intent intentScan = new Intent("com.google.zxing.client.android.SCAN");
+ intentScan.putExtra("SCAN_MODE", "QR_CODE_MODE");
+ try {
+ startActivityForResult(intentScan, ZXING_SCAN_REQUEST);
+ } catch (ActivityNotFoundException error) {
+ view.loadUrl(url);
+ }
+ } else {
+ view.loadUrl(url);
+ }
+ return false;
+ }
+
+ @Override
+ public void onPageFinished(WebView view, String url) {
+ if (PRINT_DIALOG_URL.equals(url)) {
+ // Submit print document.
+ view.loadUrl("javascript:printDialog.setPrintDocument(printDialog.createPrintDocument("
+ + "window." + JS_INTERFACE + ".getType(),window." + JS_INTERFACE + ".getTitle(),"
+ + "window." + JS_INTERFACE + ".getContent(),window." + JS_INTERFACE + ".getEncoding()))");
+
+ // Add post messages listener.
+ view.loadUrl("javascript:window.addEventListener('message',"
+ + "function(evt){window." + JS_INTERFACE + ".onPostMessage(evt.data)}, false)");
+ }
+ }
+ }
}
diff --git a/android/src/com/artifex/mupdfdemo/ReaderView.java b/android/src/com/artifex/mupdfdemo/ReaderView.java
index 2c7287f4..87f250ba 100644
--- a/android/src/com/artifex/mupdfdemo/ReaderView.java
+++ b/android/src/com/artifex/mupdfdemo/ReaderView.java
@@ -16,10 +16,9 @@ import android.widget.Adapter;
import android.widget.AdapterView;
import android.widget.Scroller;
-public class ReaderView extends AdapterView<Adapter>
- implements GestureDetector.OnGestureListener,
- ScaleGestureDetector.OnScaleGestureListener,
- Runnable {
+public class ReaderView
+ extends AdapterView<Adapter>
+ implements GestureDetector.OnGestureListener, ScaleGestureDetector.OnScaleGestureListener, Runnable {
private static final int MOVING_DIAGONALLY = 0;
private static final int MOVING_LEFT = 1;
private static final int MOVING_RIGHT = 2;
diff --git a/android/src/com/artifex/mupdfdemo/SearchTaskResult.java b/android/src/com/artifex/mupdfdemo/SearchTaskResult.java
index b2d361c1..8fa3c3a2 100644
--- a/android/src/com/artifex/mupdfdemo/SearchTaskResult.java
+++ b/android/src/com/artifex/mupdfdemo/SearchTaskResult.java
@@ -22,4 +22,3 @@ public class SearchTaskResult {
singleton = r;
}
}
-