Merge pull request #107 from ostdotcom/develop

Merging develop with release-2.3
OpenST · Aug 28, 2019 · 80075df · 80075df
2 parents e9ca4e0 + 9667f4d
commit 80075df
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/ostsdk/gradle.properties b/ostsdk/gradle.properties
@@ -22,9 +22,9 @@
 # org.gradle.parallel=true
 
 #Increase version when publishing.
-VERSION_NAME=2.3.1-beta.1
+VERSION_NAME=2.3.1
 #Increase version code when publishing.
-VERSION_CODE=35
+VERSION_CODE=36
 
 #Everything else.
 GROUP=com.ost

diff --git a/ostsdk/src/main/java/com/ost/walletsdk/ui/managedevices/DeviceListPresenter.java b/ostsdk/src/main/java/com/ost/walletsdk/ui/managedevices/DeviceListPresenter.java
@@ -64,7 +64,6 @@ void updateDeviceList(Boolean clearList) {
             return;
         }
         if(clearList){
-            ostDeviceList.clear();
             nextPayload = new JSONObject();
         } else if(!hasMoreData){
             return;
@@ -94,6 +93,7 @@ public void onOstJsonApiSuccess(@Nullable JSONObject dataJSONObject) {
                     hasMoreData = (nextPayload != null && !nextPayload.toString().equals("{}"));
                     JSONArray deviceJSONArray = (JSONArray) dataJSONObject.get(dataJSONObject.getString(OstConstants.RESULT_TYPE));
 
+                    if (clearList) ostDeviceList.clear();
                     for (int i = 0; i < deviceJSONArray.length(); i++) {
                         JSONObject deviceJSONObject = deviceJSONArray.getJSONObject(i);
                         Device device = Device.newInstance(deviceJSONObject);

diff --git a/ostsdk/src/main/res/layout/ost_fragment_qr.xml b/ostsdk/src/main/res/layout/ost_fragment_qr.xml
@@ -54,11 +54,12 @@
 
         <com.ost.walletsdk.ui.uicomponents.OstC1Label
             android:id="@+id/lbl_device_address"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
+            android:layout_centerHorizontal="true"
             android:text="This Device Address" />
 
         <com.ost.walletsdk.ui.uicomponents.OstH4Label