[Fix] Fixed crash when long clicking certain VN elements.

[#] Updated version to 2.2.2.
herbeth1u · May 1, 2017 · 83b1d93 · 83b1d93
1 parent 7cfe432
commit 83b1d93
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/app/app-release.apk b/app/app-release.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -22,8 +22,8 @@ android {
         applicationId "com.booboot.vndbandroid"
         minSdkVersion 17
         targetSdkVersion 25
-        versionCode 32
-        versionName "2.2.1"
+        versionCode 33
+        versionName "2.2.2"
 
         renderscriptTargetApi 19
         renderscriptSupportModeEnabled true

diff --git a/app/src/main/java/com/booboot/vndbandroid/activity/VNDetailsActivity.java b/app/src/main/java/com/booboot/vndbandroid/activity/VNDetailsActivity.java
@@ -323,10 +323,16 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, l
                 if (view.getId() == R.id.list_item_text_layout) {
                     TextView itemLeftText = (TextView) view.findViewById(R.id.itemLeftText);
                     TextView itemRightText = (TextView) view.findViewById(R.id.itemRightText);
+                    String copiedText = "";
 
-                    String copiedText = itemLeftText.getText().toString();
-                    if (!itemRightText.getText().toString().isEmpty())
-                        copiedText += " : " + itemRightText.getText().toString();
+                    if (itemLeftText != null && itemLeftText.getText() != null) {
+                        copiedText = itemLeftText.getText().toString();
+                    }
+
+                    if (itemRightText != null && itemRightText.getText() != null && !itemRightText.getText().toString().isEmpty()) {
+                        if (!copiedText.isEmpty()) copiedText += " : ";
+                        copiedText += itemRightText.getText().toString();
+                    }
 
                     ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
                     ClipData clip = ClipData.newPlainText("CLIPBOARD", copiedText);

diff --git a/app/src/main/res/layout/list_item_subtitle.xml b/app/src/main/res/layout/list_item_subtitle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:id="@+id/list_item_text_layout"
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"