From 31336ae301806c1f1cb09eddcfbefb5e8d886653 Mon Sep 17 00:00:00 2001
From: "FAREAST\\boywu" <boywu@microsoft.com>
Date: Thu, 3 May 2018 16:11:21 +0800
Subject: [PATCH 1/3] Update OneOCR v2,0 sample

---
 Sample/app/build.gradle                       |   3 +-
 Sample/app/libs/vision.jar                    | Bin 0 -> 26117 bytes
 Sample/app/src/main/AndroidManifest.xml       |   4 +-
 .../visionsample/MainActivity.java            |   2 +-
 ...vity.java => OneOCRRecognizeActivity.java} |  78 +++++++++----
 .../app/src/main/res/layout/activity_main.xml |   2 +-
 .../layout/activity_recognize_handwriting.xml |  62 ----------
 .../res/layout/activity_recognize_oneocr.xml  | 106 ++++++++++++++++++
 ...ecognize.xml => menu_recognize_oneocr.xml} |   0
 Sample/app/src/main/res/values/strings.xml    |   4 +-
 10 files changed, 172 insertions(+), 89 deletions(-)
 create mode 100644 Sample/app/libs/vision.jar
 rename Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/{HandwritingRecognizeActivity.java => OneOCRRecognizeActivity.java} (76%)
 delete mode 100644 Sample/app/src/main/res/layout/activity_recognize_handwriting.xml
 create mode 100644 Sample/app/src/main/res/layout/activity_recognize_oneocr.xml
 rename Sample/app/src/main/res/menu/{menu_handwritingrecognize.xml => menu_recognize_oneocr.xml} (100%)

diff --git a/Sample/app/build.gradle b/Sample/app/build.gradle
index 0fffe98..14defb5 100644
--- a/Sample/app/build.gradle
+++ b/Sample/app/build.gradle
@@ -24,7 +24,8 @@ dependencies {
     //
     // Use the following line to include client library for Vision API from Maven Central Repository
     //
-    compile 'com.microsoft.projectoxford:vision:1.0.394'
+    //compile 'com.microsoft.projectoxford:vision:1.0.394'
     compile 'com.android.support:appcompat-v7:25.0.0'
     compile files('libs/gson-2.3.1.jar')
+    compile files('libs/vision.jar')
 }
diff --git a/Sample/app/libs/vision.jar b/Sample/app/libs/vision.jar
new file mode 100644
index 0000000000000000000000000000000000000000..7ff1661918e53cf7101dde53771ddcad12470728
GIT binary patch
literal 26117
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
Q&)&yw?|C)C`1{pA0EjziZ2$lO

literal 0
HcmV?d00001

diff --git a/Sample/app/src/main/AndroidManifest.xml b/Sample/app/src/main/AndroidManifest.xml
index 6560439..49a7efd 100644
--- a/Sample/app/src/main/AndroidManifest.xml
+++ b/Sample/app/src/main/AndroidManifest.xml
@@ -64,8 +64,8 @@
                 android:value="com.microsoft.projectoxford.visionsample.MainActivity" />
         </activity>
         <activity
-            android:name=".HandwritingRecognizeActivity"
-            android:label="@string/title_activity_handwriting_recognize"
+            android:name=".OneOCRRecognizeActivity"
+            android:label="@string/title_activity_oneocr_recognize"
             android:parentActivityName=".MainActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/MainActivity.java b/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/MainActivity.java
index f56c3a4..c9a024d 100644
--- a/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/MainActivity.java
+++ b/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/MainActivity.java
@@ -80,7 +80,7 @@ public void activityDescribe(View v) {
 
     public void activityHandwriting(View v)
     {
-        Intent intent =new Intent(this, HandwritingRecognizeActivity.class);
+        Intent intent =new Intent(this, OneOCRRecognizeActivity.class);
         startActivity(intent);
     }
 
diff --git a/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/HandwritingRecognizeActivity.java b/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/OneOCRRecognizeActivity.java
similarity index 76%
rename from Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/HandwritingRecognizeActivity.java
rename to Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/OneOCRRecognizeActivity.java
index 7aca518..7af590e 100644
--- a/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/HandwritingRecognizeActivity.java
+++ b/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/OneOCRRecognizeActivity.java
@@ -45,14 +45,16 @@
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 
 import com.google.gson.Gson;
 import com.microsoft.projectoxford.vision.VisionServiceClient;
 import com.microsoft.projectoxford.vision.VisionServiceRestClient;
-import com.microsoft.projectoxford.vision.contract.HandwritingRecognitionOperation;
-import com.microsoft.projectoxford.vision.contract.HandwritingRecognitionOperationResult;
-import com.microsoft.projectoxford.vision.contract.HandwritingTextLine;
-import com.microsoft.projectoxford.vision.contract.HandwritingTextWord;
+import com.microsoft.projectoxford.vision.contract.TextRecognitionOperation;
+import com.microsoft.projectoxford.vision.contract.TextRecognitionOperationResult;
+import com.microsoft.projectoxford.vision.contract.TextLine;
+import com.microsoft.projectoxford.vision.contract.TextWord;
 import com.microsoft.projectoxford.vision.rest.VisionServiceException;
 import com.microsoft.projectoxford.visionsample.helper.ImageHelper;
 
@@ -61,7 +63,7 @@
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 
-public class HandwritingRecognizeActivity extends ActionBarActivity {
+public class OneOCRRecognizeActivity extends ActionBarActivity {
 
     // Flag to indicate which task is to be performed.
     private static final int REQUEST_SELECT_IMAGE = 0;
@@ -69,9 +71,24 @@ public class HandwritingRecognizeActivity extends ActionBarActivity {
     // The button to select an image
     private Button buttonSelectImage;
 
+    // The radio button to select mode
+    private RadioGroup groupSelectMode;
+
+    // Handwritten mode
+    private RadioButton buttonHandwritten;
+
+    // Printed mode
+    private RadioButton buttonPrinted;
+
+    // The button to send an image.
+    private Button buttonSend;
+
     // The URI of the image selected to detect.
     private Uri imagUrl;
 
+    // The mode selected for recognition, default printed.
+    private String mode = "Printed";
+
     // The image selected to detect.
     private Bitmap bitmap;
 
@@ -86,20 +103,37 @@ public class HandwritingRecognizeActivity extends ActionBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_recognize_handwriting);
+        setContentView(R.layout.activity_recognize_oneocr);
 
         if (client == null) {
             client = new VisionServiceRestClient(getString(R.string.subscription_key), getString(R.string.subscription_apiroot));
         }
 
         buttonSelectImage = (Button) findViewById(R.id.buttonSelectImage);
+        groupSelectMode = (RadioGroup) findViewById(R.id.groupSelectMode);
+        buttonHandwritten = (RadioButton) findViewById(R.id.buttonHandwritten);
+        buttonPrinted = (RadioButton) findViewById(R.id.buttonPrinted);
+        buttonSend = (Button) findViewById(R.id.buttonSend);
         editText = (EditText) findViewById(R.id.editTextResult);
+
+        groupSelectMode.setOnCheckedChangeListener(changeRadio);
     }
 
+    private RadioGroup.OnCheckedChangeListener changeRadio = new RadioGroup.OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(RadioGroup group, int checkedId) {
+            if (checkedId == buttonHandwritten.getId()) {
+                mode = "Handwritten";
+            } else if (checkedId == buttonPrinted.getId()) {
+                mode = "Printed";
+            }
+        }
+    };
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_recognize, menu);
+        getMenuInflater().inflate(R.menu.menu_recognize_oneocr, menu);
         return true;
     }
 
@@ -123,10 +157,15 @@ public void selectImage(View view) {
         editText.setText("");
 
         Intent intent;
-        intent = new Intent(HandwritingRecognizeActivity.this, com.microsoft.projectoxford.visionsample.helper.SelectImageActivity.class);
+        intent = new Intent(OneOCRRecognizeActivity.this, com.microsoft.projectoxford.visionsample.helper.SelectImageActivity.class);
         startActivityForResult(intent, REQUEST_SELECT_IMAGE);
     }
 
+    public void sendImage(View view)
+    {
+        doRecognize();
+    }
+
     // Called when image selection is done.
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -147,8 +186,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                         // Add detection log.
                         Log.d("AnalyzeActivity", "Image: " + imagUrl + " resized to " + bitmap.getWidth()
                                 + "x" + bitmap.getHeight());
-
-                        doRecognize();
                     }
                 }
                 break;
@@ -177,9 +214,10 @@ private String process() throws VisionServiceException, IOException, Interrupted
             bitmap.compress(Bitmap.CompressFormat.JPEG, 100, output);
             try (ByteArrayInputStream inputStream = new ByteArrayInputStream(output.toByteArray())) {
                 //post image and got operation from API
-                HandwritingRecognitionOperation operation = this.client.createHandwritingRecognitionOperationAsync(inputStream);
+                Log.d("Mode", mode);
+                TextRecognitionOperation operation = this.client.createTextRecognitionOperationAsync(inputStream, mode);
 
-                HandwritingRecognitionOperationResult operationResult;
+                TextRecognitionOperationResult operationResult;
                 //try to get recognition result until it finished.
 
                 int retryCount = 0;
@@ -188,14 +226,14 @@ private String process() throws VisionServiceException, IOException, Interrupted
                         throw new InterruptedException("Can't get result after retry in time.");
                     }
                     Thread.sleep(1000);
-                    operationResult = this.client.getHandwritingRecognitionOperationResultAsync(operation.Url());
+                    operationResult = this.client.getTextRecognitionOperationResultAsync(operation.Url());
                 }
                 while (operationResult.getStatus().equals("NotStarted") || operationResult.getStatus().equals("Running"));
 
                 String result = gson.toJson(operationResult);
                 Log.d("result", result);
                 return result;
-                
+
             } catch (Exception ex) {
                 throw ex;
             }
@@ -210,10 +248,10 @@ private static class doRequest extends AsyncTask<String, String, String> {
         // Store error message
         private Exception e = null;
 
-        private WeakReference<HandwritingRecognizeActivity> recognitionActivity;
+        private WeakReference<OneOCRRecognizeActivity> recognitionActivity;
 
-        public doRequest(HandwritingRecognizeActivity activity) {
-            recognitionActivity = new WeakReference<HandwritingRecognizeActivity>(activity);
+        public doRequest(OneOCRRecognizeActivity activity) {
+            recognitionActivity = new WeakReference<OneOCRRecognizeActivity>(activity);
         }
 
         @Override
@@ -242,15 +280,15 @@ protected void onPostExecute(String data) {
                 this.e = null;
             } else {
                 Gson gson = new Gson();
-                HandwritingRecognitionOperationResult r = gson.fromJson(data, HandwritingRecognitionOperationResult.class);
+                TextRecognitionOperationResult r = gson.fromJson(data, TextRecognitionOperationResult.class);
 
                 StringBuilder resultBuilder = new StringBuilder();
                 //if recognition result status is failed. display failed
                 if (r.getStatus().equals("Failed")) {
                     resultBuilder.append("Error: Recognition Failed");
                 } else {
-                    for (HandwritingTextLine line : r.getRecognitionResult().getLines()) {
-                        for (HandwritingTextWord word : line.getWords()) {
+                    for (TextLine line : r.getRecognitionResult().getLines()) {
+                        for (TextWord word : line.getWords()) {
                             resultBuilder.append(word.getText() + " ");
                         }
                         resultBuilder.append("\n");
diff --git a/Sample/app/src/main/res/layout/activity_main.xml b/Sample/app/src/main/res/layout/activity_main.xml
index 0576632..099f23e 100644
--- a/Sample/app/src/main/res/layout/activity_main.xml
+++ b/Sample/app/src/main/res/layout/activity_main.xml
@@ -47,7 +47,7 @@
         <Button
             android:layout_width="267dp"
             android:layout_height="wrap_content"
-            android:text="Recognize Handwriting Text"
+            android:text="OneOCR Recognize Text V2.0"
             android:id="@+id/button"
             android:layout_gravity="center_horizontal"
             android:onClick="activityHandwriting"
diff --git a/Sample/app/src/main/res/layout/activity_recognize_handwriting.xml b/Sample/app/src/main/res/layout/activity_recognize_handwriting.xml
deleted file mode 100644
index 142c305..0000000
--- a/Sample/app/src/main/res/layout/activity_recognize_handwriting.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="com.microsoft.projectoxford.visionsample.HandwritingRecognizeActivity">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:weightSum="1"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="4dp"
-            android:text="Select an image to recognize handwriting text"/>
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-
-            <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Select Image"
-                android:id="@+id/buttonSelectImage"
-                android:onClick="selectImage"
-                android:elevation="0dp" />
-
-            <ImageView
-                android:id="@+id/selectedImage"
-                android:layout_width="200dp"
-                android:layout_height="200dp"
-                android:layout_toRightOf="@+id/image_control"
-                android:layout_toEndOf="@+id/image_control"
-                android:background="#E0E0E0"
-                android:layout_margin="6dp"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right"
-            android:layout_weight="1.03" >
-
-            <EditText
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:inputType="textMultiLine"
-                android:ems="10"
-                android:id="@+id/editTextResult"
-                android:layout_weight="1" />
-        </LinearLayout>
-    </LinearLayout>
-</RelativeLayout>
diff --git a/Sample/app/src/main/res/layout/activity_recognize_oneocr.xml b/Sample/app/src/main/res/layout/activity_recognize_oneocr.xml
new file mode 100644
index 0000000..421a6fe
--- /dev/null
+++ b/Sample/app/src/main/res/layout/activity_recognize_oneocr.xml
@@ -0,0 +1,106 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="com.microsoft.projectoxford.visionsample.OneOCRRecognizeActivity">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:weightSum="1"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dp"
+            android:text="Select an image to recognize handwriting text"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <Button
+                    android:id="@+id/buttonSelectImage"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:elevation="0dp"
+                    android:onClick="selectImage"
+                    android:text="Select Image" />
+
+                <TextView
+                    android:id="@+id/textView2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="Mode:" />
+
+                <RadioGroup
+                    android:id="@+id/groupSelectMode"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <RadioButton
+                        android:id="@+id/buttonHandwritten"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="Handwritten" />
+
+                    <RadioButton
+                        android:id="@+id/buttonPrinted"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="Printed (default)" />
+
+                </RadioGroup>
+
+                <Button
+                    android:id="@+id/buttonSend"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:onClick="sendImage"
+                    android:text="Send" />
+
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/selectedImage"
+                android:layout_width="200dp"
+                android:layout_height="200dp"
+                android:layout_margin="6dp"
+                android:layout_toEndOf="@+id/image_control"
+                android:layout_toRightOf="@+id/image_control"
+                android:layout_weight="1"
+                android:background="#E0E0E0" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:layout_weight="1.03" >
+
+            <EditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:inputType="textMultiLine"
+                android:ems="10"
+                android:id="@+id/editTextResult"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
diff --git a/Sample/app/src/main/res/menu/menu_handwritingrecognize.xml b/Sample/app/src/main/res/menu/menu_recognize_oneocr.xml
similarity index 100%
rename from Sample/app/src/main/res/menu/menu_handwritingrecognize.xml
rename to Sample/app/src/main/res/menu/menu_recognize_oneocr.xml
diff --git a/Sample/app/src/main/res/values/strings.xml b/Sample/app/src/main/res/values/strings.xml
index 2d81665..e2cc072 100644
--- a/Sample/app/src/main/res/values/strings.xml
+++ b/Sample/app/src/main/res/values/strings.xml
@@ -4,7 +4,7 @@
     <!-- Please refer to https://www.projectoxford.ai/ to get your subscription key -->
     <!-- If you have one subscription key, you can add it here to use the service -->
     <string name="subscription_key">Please_add_the_subscription_key_here</string>
-    <string name="subscription_apiroot">API root is Needed. E.g. https://westus.api.cognitive.microsoft.com/vision/v1.0"</string>
+    <string name="subscription_apiroot">API root is Needed. E.g. https://westus.api.cognitive.microsoft.com/vision/v2.0"</string>
     <string name="add_subscription_key_tip_title">Subscription Key is Needed</string>
     <string name="add_subscription_key_tip">Please put your subscription key to source file \"app/res/values/strings.xml\" to enable Vision API calls.</string>
 
@@ -13,7 +13,7 @@
     <string name="title_activity_analyze_domain">Analyze Image In Domain</string>
     <string name="title_activity_describe">Describe Image</string>
     <string name="title_activity_recognize">Recognize Text</string>
-    <string name="title_activity_handwriting_recognize">Recognize Handwriting Text</string>
+    <string name="title_activity_oneocr_recognize">OneOCR Recognize Text V2.0</string>
     <string name="title_activity_thumbnail">Thumbnail Image</string>
 
     <!-- Select image activity -->

From 93e6567f87aeb5ade841590da445cb4e45e9c746 Mon Sep 17 00:00:00 2001
From: "FAREAST\\boywu" <boywu@microsoft.com>
Date: Thu, 10 May 2018 14:15:10 +0800
Subject: [PATCH 2/3] OneOCR v2.0: rename classes and check default mode

---
 Sample/app/libs/vision.jar                    | Bin 26117 -> 27065 bytes
 .../visionsample/OneOCRRecognizeActivity.java |  19 ++++++++++--------
 .../res/layout/activity_recognize_oneocr.xml  |   5 +++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Sample/app/libs/vision.jar b/Sample/app/libs/vision.jar
index 7ff1661918e53cf7101dde53771ddcad12470728..f411ecc46b860b73c7cd82c89447793e9d105a4e 100644
GIT binary patch
delta 7513
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
E0BFS(xc~qF

delta 6798
zcmZ8_Wl$X2vNaam-QC?SxC}DE-6h!I?l2h$Zh^ryxNES%0>LdqfCMLyArRbx1^do9
z->rAvef!6*-d*cQSFf(swHIswIc5gA#h4um!V-jfbD^QV0(m+@OR*@xl?H2`s|tig
zKj{To*&tOnZsy9wmSRTq*h<{#b=JBTSebG(h`E$On#P>W2P2lsy2ZFi1^K#zBWjY@
zGs+7Xr=LH6E|hYXxxa_QZID_p;BD`s4zOA6Ecjpgu4pOq;h{rzOvdi{AsyGPA+FS~
z72^N}J!RUqmC6{YTx08C_A_?>4HpY{hvb^kyy?`pKA%=vJ+Q>3lq3<EJ(*ImqqIX>
zKuW7HW;ujve?kiugabvDz{f=zwVXvV06jS8u(fqTt#_0iO%qbqEGYr68mZHJ0wA3>
zvK&EXjbMh+(uSf~BUe*Q#`3liiyv02QXlPP4p#cyu46lQhIzq$!7jesa06$h@Y3bN
zN3b!^c5AScEzfqm-Xc#DUu4(TL)w_rx>;+0tR>J@01lLSdG0ts5NDGY!wUs`vARl=
z2oJdgOCA3~W{WttRw5-VBcqKu^h?3UAJ+ao+vdaB&9tK>OKjS<oYI#F$Ua}er}3MP
z)N<6he4<=*=mw*^d22<BI*3j{subz5(X1^U8_pW7iEo#oRA)#f{@4s*wDxW2TZmBu
z+_qagDaY5Nd0?{g_=>k~M6&27Xg3a581MYZ+EU##rMhfUO=fZ45NG;~%cB%fij{;T
zw|bTCn5(pnZ=?V5{M5)b!Lj~YxW4C+&VElbNoA7z)DJwfVW93P;F`$Fr*nF2Mz%ls
zIdfC-kbm7`E(G~p@av;`(M>DN+E+wfC~}1@?FVqCR-iQ3pazZpQ+a$b+b5NLVAwTf
zgvA+aopXXW+&nj|<?TBOoT1{MKI{+0vZ_E6<DUY$Kn%?0S9({rC`d@E=txMqKvXnR
zBuq?9BqZo2D#3>v9vKv{B4NYi!pIffcdy@sWVA!kWj|EU7!`-&Zzi3RSte6wv`66j
zx@ZKEZy4CF-J>85SA-6wVO3rAJw3Vb<{JW}UeigIlsj5|Q*S$=q)OgwD&bPHPAcK#
zoRg90tpK9M;1z1JMSQBU<lg~&y2krk`mwV;j>`gfJwr5864HxciR|w*5gZZq3|{TE
z7Z_yv0yhD+DQA2iGtxR^SbJvDnVVk6I`|;+nF7k{GwdoVP(n7{4J%;8Sv~&d?E(i&
zpE!fOC=9NR(?9DoAi#m$-8lgNY$gp@e*4eP7coBog;=nb1!1$JWAA#>_}#XpdQ|(P
zwMHe%=@8SSoOvwpY)-(!?S-KfaOtVjd9Cq)DNT`p%0U*FaoqbF{3MbbxZYPIN#8Jk
z_-X;FHK(RrPBL3ri0)_38S0P7%&YetfXJ$OD3gll`OpoM_8X%D1U2)lMaIGg1=M8%
zAYJxDB%JL-<LTlDo9m&fWg^lHMpAZx%(1n`CIv%9>vBS#XRMEhWEn@~Z8SU%)FM7g
z85>I1m>-^#2%T$aWN7Sm2ax~fkuquNQzbGI5<4373o0!%gy?TQL5Gs?(|{}WwRBK~
z2#fe_aLO1tBN<-FAOS)Jh1d!C*~fkXQV36`+iWM>*m|v^o;68Q5-`AT<fkP0;*tB}
zbMmeOcKbtS!@~#qQ3r*N*cfpwd@zRsaRcpJfQ&x`m#(oYQktX$L5#V|c)Ll$kl>U6
zO9QlGtu6aqn7wJATG-4*HyFMabuGKu!8a7=ankYY&0TWu;*X}YSHQU*SyJ?a%zAa2
zM!}o}Ziw!{93!C|f{#>v^5*dUQhR^Tia+5b<+^ZD?7mP4L$sX_+<SFFe){`L<d(Wg
z=(zC*Mj*RQZcv02#?x^9iOxvdof+T0oP@_k>9fag*Us>5u8LP>V_;Nx8$7Q<`|&|d
z!<Cf@KY>++QFF_o6+HT=w;)}$Rw|*jf_mTWWM}yjC4Xm(cDMjt`iF|9y`|Dyd-hzG
zQ4>a;I@ScCx<ORav0PfRLF@`rJ8I)r*Pc77_VK*kPXe>$RKoF&b{?;Mlgyx2qr(()
zJD5zP8M?oSuCqxEJXs9IoHDA@o39cQRemQd&=!j?f-Z6X=8PwVJtpHX&Z1HO;p{&<
z06HW}11{3HawAbBm4!BoO^P>mXdHGK;eZ;N?1?JbY+op1a<eY(O*-{xYXnXmxobRU
zMKRxQ5uB+d1O-CH+1DtrX4cokKEs^x|G)YdzpjsBKFQJ>tdc!>8N9W{q&yVgYG-;(
zduecj7eX0qRqjZ6BxHEcjgMi-P$Q%)8v`Bz;P)??Uw%kU#x0$)qI$bNVlLR;CU`Hh
zdaA^NQhKwh!h1Zen=h_B0E<x9-mF2^;0<!%+#D|-n3LUPz&_Nv3lE;?Xn*FIjk@Dy
ziKU>kN$E@f-I2JMey-gvO+KK9V5!8|tWB=KmbHli_<awS4L#(bp7Z4(tjdvzXavKG
zu7Wx8Q4VHDVPcjn3DGNWzg27EP#rty@B^#JXSuvYMPeG0#y;*B7QG?~Eu5UR2E}k&
zk-6FQWo7q?rW_>1^m@1Ml%b7}l4Vi_K63=bW+iPf{K<xB{UJ~K4cYyrcA=q4qY#+U
zqiNvOwP04BswPq1yZi_FS`5OwU<TIAw=gYT&_eD`H0q&hvh#pE;K2m^c8Xs4(xqU*
zih^1F55ENM@Ee<CoEZF&0g_U4xt7`T-1GMa)6s|)NMw{qv=!K~;vuB3JhygLb`TAv
zePWp<LccS*oB4$@(ZdhJla3AHEFZPL7FG1zQ~W&*E1n$4M}JL&9NJ&<yMRg!jiVC$
zFeGYB3bxYudlaIVmH13w5TVI4RSk3#un&j|DK0vYym}2xE)~$OR?c$@s>&-8=K~Lo
zFziIj4>C9wS{*R=S}dS^joAO37j`OjGqZl2R`PuSH5gJPL;v$U_q{sXRV>H)6{vvZ
z_w+s8YIUlb<612ZpF{6_E@o&aJoEH63Pe@|W<mIO9C$k|ZmI8QFHk^q=j}A9weoxd
zmA@&ViP8U-F<|2CqZ8Z|6X%>jU=4Y*s&I~HZ4|fi7XEow0@AOc)q_`mOi4^tD-nlJ
zwm5S)-PDct;~d=cv0OJmD|ZuT)YBto<=#Cn^~(e18gNZr&fkE(v>RM74F}(3pnAUp
zZ+v!~CYK?~ow#}PUcb1>Jd+~Fe7>-@la%A(4FT>@bwbnkZU4-#{rQ!yuR=R1>IP=r
z#Yh75UV3mnoEY|6E}S_^P-+6UW^H@M^vv~K#h2~`l6BVBlh@>Af2Wg_h!l2HlbvsH
z$C{^xMH=XD6S-$v-3UgvpXb{ix(jR@f!nQW>WiHoiq4MSH-VGiF2YW5#%^SWDnsb2
zi2Di^zyNW@{a3~vRJ(+I`R}uLAyPJiPvb1632U`uE~#&9@wW}~Il5y*dIvmBw!Qe3
zE?8Kd5x%A^%gopbHLC0COryztm86}?1qm~bnfiKN-Y<zdqP~*)a%6SI_9oPbu{Ttg
ziF*qWbtE(zF0!ALj2|69tY){j|JmP6zLxmpf9>xJ%zre*7H9@0St@!e<^utgb_vzE
zz43_|$2xTfk)yN<SMjyAkT}M+kUS<$=^Y>ydKKx>ByAg7Y3*7Rs~)DIC2Rg+8SM!^
zO3*5k)v9Cq{?75hw9d7_f(?%k{c9epr~OnZY%I|p>Ngn4n|&dt&ri>%_ckIjS4ZV(
zs4hfIcnovrLxf;7IaUD%{8ADQF&RQ7B#!995Zz%lCCne?7rRV!1c#J3+rotzHwbEa
zEIT>vgJqsB`8q@lwRT(!CCAU7uchgsAJc$X3?<PVXIOM$JEt50;hNf!=EKgSGF)l*
z?wBRRdjYib=Z1tfgA|n`0{gcw@xTIc&+if5n9uP7hqvIw)aHZR{MhEhTMoLQxHG(P
zgYhoWaEozyw_9yYnsYt8=Q6~V^vQyc<@iU}+b+V@^HZj9ith{O5qQr`cz2Lk2JD&s
zNMO)-lgH!zedqezLa#Do+wprL`;i5JIMsL1p23Pkfr3>|7T+@9+onfFQq|zYd{b&c
z==IIj^)(pB1;GE+*{t(Tu>?+FPP#Tuy9dxTFPJ@R!s5l@8#?&U#%QNco%jqb7s}`9
zhD?r*2;Y$KLE3fDu9`m92Y6rO1Xb|?ki4N`keH1XWH#AOm1A&D6TE#nxN9ix*oDLE
zDQU3(wU_JtG<8|$WoKpEZmPZ0+{_J4G{}G&#0F0O?a5M-adT1ur`IM!6W3AO+c+3s
z$i1#Ia5Cnm<0r+yNeJh5{_c{BZE2?3aWEB|(vVKyKYTPvso^T3?}!)xX*Cw7B4hEm
z?WMe>JAGG8uK$8s?-dZ$H7P_`BIhs>(6c6b#EeC3YWkD4P0nEzz&*PMDNL6Tev!~=
zZUSyM*uM>A;Ru<bx^5vZ{4uMj>S`7904kH~m<MuW(amP5TiMjk?tW<d@{$wo?p8fG
zmpzOn;(WOn70ZB?+~Z%-5Ue9^(hge@6$VoSP+kO3KK9k&kN8it;6d^uim0CqZ1rFq
zR}Rfx!hpng-z{dzoXeI20S2MjW0{L*$>0m;3Q<V5Sq-DNcc@)}onimer+6vzjhLrr
z&WTs0bAB=9at>27k`pa`Fl?~w9u<246~a3wolaAT+F^`X7Ul7)mdy8ZrG3L8W6QI`
z&e%K+gM0R<mx#m_e|n{Z3#U(-P6k1_kGpo+TNYJh^kL3bL0%>$4PN?6=?SB?jbI#8
zr0z-yf$0*aOE$>&X$LR13lukJpTU9s(4P&9ADI<Fol&*$p;rg%1tOQ4cd4IT#F^ej
z;?GYTs!cr<>6ykh&ad;EMWObaK{avwZEE})_Sm=JzCY?JKsr~;=hhVG7WEz86e>6Z
z>YY}mK6ap0!QLre8b*kVvJQNc8!Ucw=+M|JE5`cr{a{O;CccQ=AvP6@SJ2N!%hV)O
zm?L6eN2<tXLwik~*8W48Ipsi2jY$l{hm@tk=mQS?{E>2Lp7r$Uyp_^|bx-%#!xe$<
zp?Em=dXI0G?(f<F0PzWc++^?8XG7t`P7eXsTqCfU2OBx@PO4?%`CL(#FgU_VpDowO
zsHjpijC!K?rP9krdpWznY6l%tdDWW%fF_|!QN%Nx#A{Ehm2m7a*o*RIi-mQulaBE*
z9ec9J^5+@(!yHzwK8fVU?sPd)8>TmcPdLwX0D_*p0*;yxh#n=otX&`7DPgyZuwl`t
zVd%t6+`0TMR$f{!o&%-)C|JbqK_C+FjDy$<mQJ?W%K81aAT;PY?wsc#|1=63qeU>p
zmFPzKamY*Tfj{|q`1D1w^N#Pnp^~cgy5@2fonO8k9z6D(-#;#0)w=E|^GmnF-rWti
zzKh;4!>0zvD13$z7t8kGTI;3FmYC*#8fUZiTHo4tu4MpvL!c?54(vMSZ2Ik&)%m~$
z`j&JpqQl)%K;;w3a_II2yG=hrLxg8<rfmn-qA87o!%+O~tvoM^5{apV`x;EiO=h62
zWo)AITQ^5?uA9v4H+5O72*9^SSluUyqIDAT9!zZaTu^+@r{0L3QuEfeupHj5_Ad9%
zCgz0sE^3DhoS(Cnt6=q9x(kCTu?2UHI!8t2EHub+`$bg&uEVgWMddr|MO`b=%MY%`
z-*jq=O+xCh&p76*6ib@fPNB*E^`m(r_3%P_+ufo}&Xyo^^`Z~FCyk-Wk#7QA>i@iL
zJwMv>uS`)Y?P;R0xN}&aph~ba7z-VnBB#w+cC7c}@^i2ETLg>0ya;)17)Wkla^E4M
zEnnI8Ui4sc)oGsfVKx4tWhqR-Rzq0__W2~SGtr|cTlL#cH7pi8b3G)^xPH(-M3oFU
zedc?7Mc2NAkr*2r;av9BXyeqyc8qbQ;PZK2L*jIIeG4rw`9qNGgJ~k)uiaa8B(aAN
zqyn71rwS^@hN)ndwr_P(#-307Kd7^9t-XF&QMlfr<t{9f)>5e*bKTM#CVB0ORnT`_
z-bnxUX&*65Ec%79=#nF?kG+13O$$k5hQy8;oJkY|Y~frk1j>7Y-PQY~N(7e;yXunq
z60tCX*PA0CpbKeDH-Sg4nn;cwj0aRFb0@4;733Qo)&{245OI^FALM(e#J6Wd!Mrd#
z7u~(QebG2DRwF<Rl8cG)ZQ&dn0`cyav!xK&ZBp_l%B1B8saQPfffprGD;ps-r$oHv
zJon63T4`H9%yGSs3tbp}H5NHs$G!JSx*LoTh4f#Ur^mhTNK7~D)UGgsy&HvV(gz_8
zXtiYyc3>(h7bc8?gh&dq4aEg?kbd!)I*ZLO&SNUG5&ESG=4<;Bl#dfe_nh+aqSkLI
zNE*nMI!X>7GJCPQd`aIg#t2HzbM|HjVf~_va_@NCyRh>aweZ}By>^f$aL5f2S$kte
zfz(&!WBH}dXDP8poN9Ptia5RpMejxd7Z6Rt*aR-kf$U;{0^g1alwa_PhKpz&m!->!
zdQqgjREM6t=OUg!O+}`E7sNEWr<9_pu=x`i6sF*L_2$SMay0Z+Qe{x|B#7~ANFpkz
z1y{cpcOK~{NBVX+c{VC{(R<?%@0!-yJEjKe;VgpSNCw^f%IOE09T5G6CF5IKPeiKk
z{4!Xrr{a!Fbq`trTus%$6+4@^)Xow(NYbc!5K=X4n4f%12ig~>VUWr~CR|nFt{1gh
zbAB-CYjNvK(-f3%^U4y!SpHjrT9j-mLEOWCXs=|3Gm7mrsM%3XIc_uJ&8I*nDz}^-
z(afLVR`?Idnwe)5>Ka&)&efB5n%+mXgJ7>h+@}&9<j6^nsUd;tu3w)%&S*(~<J~s#
zA&wV%g#tCrjnB}p<NBhT?rL0%u+iqUR=ho7@@{6vYaZ+9&e?rti+JReJ?d}-ja|&N
z%ZTu$C03}ZcB!fM0!KSctL>Q;G%7`*ff`??)ituyg^^b=J%beM{UWY)vD!^5YQd4T
zv-l`b!sOXaFCeJ$lNa4!ssZHVn0=uFuGe5_Uqa>HY(u@5BUcEG$d8v(;WzIvmYLu|
z1Yf4r$ZWAFT5|V#4`sjik6v!rNd#oxdzK}hrV36<GFoki8gI)e<R=6bRle(wo7&WA
z*#xpYXYclx*haj8JSk>(5G*W0e}juLrezwokd4p&z5^#v8`e-8cI@bi<2DXLOiz-P
zb|)kkhEGO_B+fogtRR8AdbT_Y-Y!vNG#}5Zxa{L6Xz~(!UC>Tc3!bYs>E~LqO|PM`
z1G9F7Tz#-}>}h$<Iay9b*P6#k(T_h*@}o;9wYQsidqCT|VqY3_hq=MP@Yeb9jgE#_
zU;r+A!;ztJA~r?{mO(axakeR%_IyfA%=+*TM%*Dky&BNS3-;&1y!Z+`>*}k_Pw3(=
z19wsR*^4u(_8%I?2XLY!_y>J?RhwIsh%KOFvG2%bCX2NT-H;7u=FTtAK0~8}D2rN)
z{_N^$w-Ei}>SW*JX+wT+VGTTnn-31m<)OosDE@LWLqD9?A;U(<V@{7TB4BXbOgPd^
zJktDSr+H!7tA*)~UGaf@cz<n%=)072uK~(AKY_{`YU?y=>lN*B>f6ip<Il3el{CTd
z?%D|3#L(`c#<;A>19#YisQ5_&y7qSdlxQTD(TjoU;ej}^Te*DjIcn7g!~8o2qGX1g
z%2Q;5Vr2L@x+z;x=+dE6IoT0Pk^AC|WI&r9!ERfIX7C@_59_`v=7<|(jqf)tKctH*
zVP9Zic7<0wHarTVSn8@s(vQnJ!H--iA+b&m$&<hLcvnAeUD^n5MOu*u-^=P=hsk~T
zj_NpwS~-haIr_p8Oh?iME%OT8{=&Hcsg_YCFx2{@<}-7Zxh8ptIQ0d+Helt~%=F43
znx|c<Kyg?|T~?VEH|YR<97mB!0=~$UN=YSz7yi`L8WOwAqFE9={iX|B(zZVcxaG;I
zW%0z9G@e4n-B&*pZeF}-Y8-g*yv)?tHqV(;5GA|<0y=8I-!&SZ)ca>z>8q(fMA_VC
zjvi;IPlgND$#X%6DVzM-qIB~5kpt?!5F{e;m%VNzl{Qx)lt?7}qe^+dtjjhkv(B}P
z@N7l8iN~~NA<uD)e@!nleimA#Q3|-Jjp9`sH;R2%E}MAFNK)||N#1kE?KV;ZZI!g0
zdisd@S{q{$e7>=GgceaMqui%-e&TGxHc1G6Z}C>NPY=`ei5<_&*yJf9Y0L=+x{e5N
zAD}f(^)nuLE(+#1JJ(nY@U$lS$^j)YGqaE5GH=3Bjm{`~@4z8Cq|LKIY|ph~1_(Tu
z{5<NgN8IN3*GoH)f1I%w)?k{DlV}v&(M>$Af_efb(Ml{Wd|fp@hm}@JLa)pr6RTb0
zl7&lmMY*~wwD?n4bRt`Gtmd;7zKJ5BZrG?MxxU=dvhkheMw}E|)29B|SBv_2BbMjr
zv6NlJqITp+ZJKOCW$XC&*wNOzSwwJTeRC~r=awKeSJh!IQBtTE8)wAa_e)tzcfK&W
z?r@Mjw?Ks`K~`v2LPmKIEUS_J)L7txEv(R}%`P;0Dv@=^%kU(aKy?#-^7T$T0FNL&
zX%8SBo>uCo<AM0><F6GeL`svXl)4N%3jK*82Dzy<I(=sO+aRe8NI>buM?xy#`taWT
zH5T6gwyve2gbs?(Ia?O!y#qB085gwFlK(FQlmIHuO9Yj1p`iWOAN|YcM#4h+_v~^1
z4;Yi50xDonLHn;UhlC{aUtk)(|A5h<EcPt4|J$>X{x2Y>z<+>fXeM614$yNO2I!*`
zHA;%mKY2B0SrinJzd|-BpEx=6&V~ZI>`aZaBKl8?%Eb_+SNxxFSBf6$>O?{N??3<l
zmNcmP4=@6R2fbCthZcgcGA!|F|7{i$lEQygrl<ZNJU>1o5+jnsUmZ;{`MVwe50KK(
AXaE2J

diff --git a/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/OneOCRRecognizeActivity.java b/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/OneOCRRecognizeActivity.java
index 7af590e..4b23500 100644
--- a/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/OneOCRRecognizeActivity.java
+++ b/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/OneOCRRecognizeActivity.java
@@ -51,13 +51,16 @@
 import com.google.gson.Gson;
 import com.microsoft.projectoxford.vision.VisionServiceClient;
 import com.microsoft.projectoxford.vision.VisionServiceRestClient;
+import com.microsoft.projectoxford.vision.contract.TextRecognitionMode;
 import com.microsoft.projectoxford.vision.contract.TextRecognitionOperation;
 import com.microsoft.projectoxford.vision.contract.TextRecognitionOperationResult;
-import com.microsoft.projectoxford.vision.contract.TextLine;
-import com.microsoft.projectoxford.vision.contract.TextWord;
+import com.microsoft.projectoxford.vision.contract.TextRecognitionLine;
+import com.microsoft.projectoxford.vision.contract.TextRecognitionWord;
 import com.microsoft.projectoxford.vision.rest.VisionServiceException;
 import com.microsoft.projectoxford.visionsample.helper.ImageHelper;
 
+import org.w3c.dom.Text;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -87,7 +90,7 @@ public class OneOCRRecognizeActivity extends ActionBarActivity {
     private Uri imagUrl;
 
     // The mode selected for recognition, default printed.
-    private String mode = "Printed";
+    private TextRecognitionMode mode = TextRecognitionMode.Printed;
 
     // The image selected to detect.
     private Bitmap bitmap;
@@ -123,9 +126,9 @@ protected void onCreate(Bundle savedInstanceState) {
         @Override
         public void onCheckedChanged(RadioGroup group, int checkedId) {
             if (checkedId == buttonHandwritten.getId()) {
-                mode = "Handwritten";
+                mode = TextRecognitionMode.Handwritten;
             } else if (checkedId == buttonPrinted.getId()) {
-                mode = "Printed";
+                mode = TextRecognitionMode.Printed;
             }
         }
     };
@@ -214,7 +217,7 @@ private String process() throws VisionServiceException, IOException, Interrupted
             bitmap.compress(Bitmap.CompressFormat.JPEG, 100, output);
             try (ByteArrayInputStream inputStream = new ByteArrayInputStream(output.toByteArray())) {
                 //post image and got operation from API
-                Log.d("Mode", mode);
+                Log.d("Mode", mode.toString());
                 TextRecognitionOperation operation = this.client.createTextRecognitionOperationAsync(inputStream, mode);
 
                 TextRecognitionOperationResult operationResult;
@@ -287,8 +290,8 @@ protected void onPostExecute(String data) {
                 if (r.getStatus().equals("Failed")) {
                     resultBuilder.append("Error: Recognition Failed");
                 } else {
-                    for (TextLine line : r.getRecognitionResult().getLines()) {
-                        for (TextWord word : line.getWords()) {
+                    for (TextRecognitionLine line : r.getRecognitionResult().getLines()) {
+                        for (TextRecognitionWord word : line.getWords()) {
                             resultBuilder.append(word.getText() + " ");
                         }
                         resultBuilder.append("\n");
diff --git a/Sample/app/src/main/res/layout/activity_recognize_oneocr.xml b/Sample/app/src/main/res/layout/activity_recognize_oneocr.xml
index 421a6fe..bb99638 100644
--- a/Sample/app/src/main/res/layout/activity_recognize_oneocr.xml
+++ b/Sample/app/src/main/res/layout/activity_recognize_oneocr.xml
@@ -48,7 +48,8 @@
                 <RadioGroup
                     android:id="@+id/groupSelectMode"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:checkedButton="@+id/buttonPrinted">
 
                     <RadioButton
                         android:id="@+id/buttonHandwritten"
@@ -62,7 +63,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="Printed (default)" />
+                        android:text="Printed" />
 
                 </RadioGroup>
 

From 047fd7108ce879d7ec15b03c46d4d24a8a005dfc Mon Sep 17 00:00:00 2001
From: "FAREAST\\boywu" <boywu@microsoft.com>
Date: Thu, 10 May 2018 14:33:56 +0800
Subject: [PATCH 3/3] remove useless import

---
 .../projectoxford/visionsample/OneOCRRecognizeActivity.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/OneOCRRecognizeActivity.java b/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/OneOCRRecognizeActivity.java
index 4b23500..9892d19 100644
--- a/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/OneOCRRecognizeActivity.java
+++ b/Sample/app/src/main/java/com/microsoft/projectoxford/visionsample/OneOCRRecognizeActivity.java
@@ -59,8 +59,6 @@
 import com.microsoft.projectoxford.vision.rest.VisionServiceException;
 import com.microsoft.projectoxford.visionsample.helper.ImageHelper;
 
-import org.w3c.dom.Text;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -236,7 +234,7 @@ private String process() throws VisionServiceException, IOException, Interrupted
                 String result = gson.toJson(operationResult);
                 Log.d("result", result);
                 return result;
-
+                
             } catch (Exception ex) {
                 throw ex;
             }