Fix after merge

joelpyska · joelpyska · commit e5bd594cf226 · 2019-04-12T09:47:09.000+03:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         applicationId "tech.bigfig.roma"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 67
+        versionCode 69
         versionName "6.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -144,10 +144,10 @@ dependencies {
     implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
 
     //Firebase Push Messages
-    implementation 'com.google.firebase:firebase-messaging:17.5.0'
+    implementation 'com.google.firebase:firebase-messaging:17.6.0'
 
     //WorkManager
-    implementation "androidx.work:work-runtime:2.0.0"
-    implementation "androidx.work:work-rxjava2:2.0.0"
+    implementation "androidx.work:work-runtime:2.0.1"
+    implementation "androidx.work:work-rxjava2:2.0.1"
 }
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/schemas/tech.bigfig.roma.db.AppDatabase/14.json b/app/schemas/tech.bigfig.roma.db.AppDatabase/14.json
@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 14,
-    "identityHash": "b9ca62605345d229ced2bb0c1f2db79b",
+    "identityHash": "8904c68e2a9fb5969da94ffd951e9301",
     "entities": [
       {
         "tableName": "TootEntity",
@@ -74,7 +74,7 @@
       },
       {
         "tableName": "AccountEntity",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `domain` TEXT NOT NULL, `accessToken` TEXT NOT NULL, `isActive` INTEGER NOT NULL, `accountId` TEXT NOT NULL, `username` TEXT NOT NULL, `displayName` TEXT NOT NULL, `profilePictureUrl` TEXT NOT NULL, `notificationsEnabled` INTEGER NOT NULL, `notificationsMentioned` INTEGER NOT NULL, `notificationsFollowed` INTEGER NOT NULL, `notificationsReblogged` INTEGER NOT NULL, `notificationsFavorited` INTEGER NOT NULL, `notificationSound` INTEGER NOT NULL, `notificationVibration` INTEGER NOT NULL, `notificationLight` INTEGER NOT NULL, `defaultPostPrivacy` INTEGER NOT NULL, `defaultMediaSensitivity` INTEGER NOT NULL, `alwaysShowSensitiveMedia` INTEGER NOT NULL, `mediaPreviewEnabled` INTEGER NOT NULL, `lastNotificationId` TEXT NOT NULL, `activeNotifications` TEXT NOT NULL, `emojis` TEXT NOT NULL, `tabPreferences` TEXT NOT NULL, `notificationsFilter` TEXT NOT NULL)",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `domain` TEXT NOT NULL, `accessToken` TEXT NOT NULL, `isActive` INTEGER NOT NULL, `accountId` TEXT NOT NULL, `username` TEXT NOT NULL, `displayName` TEXT NOT NULL, `profilePictureUrl` TEXT NOT NULL, `notificationsEnabled` INTEGER NOT NULL, `notificationsMentioned` INTEGER NOT NULL, `notificationsFollowed` INTEGER NOT NULL, `notificationsReblogged` INTEGER NOT NULL, `notificationsFavourited` INTEGER NOT NULL, `notificationSound` INTEGER NOT NULL, `notificationVibration` INTEGER NOT NULL, `notificationLight` INTEGER NOT NULL, `defaultPostPrivacy` INTEGER NOT NULL, `defaultMediaSensitivity` INTEGER NOT NULL, `alwaysShowSensitiveMedia` INTEGER NOT NULL, `mediaPreviewEnabled` INTEGER NOT NULL, `lastNotificationId` TEXT NOT NULL, `activeNotifications` TEXT NOT NULL, `emojis` TEXT NOT NULL, `tabPreferences` TEXT NOT NULL, `notificationsFilter` TEXT NOT NULL)",
         "fields": [
           {
             "fieldPath": "id",
@@ -149,8 +149,8 @@
             "notNull": true
           },
           {
-            "fieldPath": "notificationsFavorited",
-            "columnName": "notificationsFavorited",
+            "fieldPath": "notificationsFavourited",
+            "columnName": "notificationsFavourited",
             "affinity": "INTEGER",
             "notNull": true
           },
@@ -656,7 +656,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"b9ca62605345d229ced2bb0c1f2db79b\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"8904c68e2a9fb5969da94ffd951e9301\")"
     ]
   }
 }
diff --git a/app/src/main/java/tech/bigfig/roma/entity/Filter.kt b/app/src/main/java/tech/bigfig/roma/entity/Filter.kt
@@ -1,16 +1,16 @@
 /* Copyright 2018 Levi Bard
  *
- * This file is a part of Tusky.
+ * This file is a part of Roma.
  *
  * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License as published by the Free Software Foundation; either version 3 of the
  * License, or (at your option) any later version.
  *
- * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * Roma is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
  * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
  * Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * You should have received a copy of the GNU General Public License along with Roma; if not,
  * see <http://www.gnu.org/licenses>. */
 
 package tech.bigfig.roma.entity
diff --git a/app/src/main/java/tech/bigfig/roma/util/AppBarLayoutNoEmptyScrollBehavior.kt b/app/src/main/java/tech/bigfig/roma/util/AppBarLayoutNoEmptyScrollBehavior.kt
@@ -1,19 +1,19 @@
 /* Copyright 2019 Joel Pyska
  *
- * This file is a part of Tusky.
+ * This file is a part of Roma.
  *
  * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License as published by the Free Software Foundation; either version 3 of the
  * License, or (at your option) any later version.
  *
- * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * Roma is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
  * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
  * Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * You should have received a copy of the GNU General Public License along with Roma; if not,
  * see <http://www.gnu.org/licenses>. */
 
-package com.keylesspalace.tusky.util
+package tech.bigfig.roma.util
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/tech/bigfig/roma/util/NotificationTypeConverter.kt b/app/src/main/java/tech/bigfig/roma/util/NotificationTypeConverter.kt
@@ -1,21 +1,21 @@
 /* Copyright 2019 Joel Pyska
  *
- * This file is a part of Tusky.
+ * This file is a part of Roma.
  *
  * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License as published by the Free Software Foundation; either version 3 of the
  * License, or (at your option) any later version.
  *
- * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * Roma is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
  * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
  * Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * You should have received a copy of the GNU General Public License along with Roma; if not,
  * see <http://www.gnu.org/licenses>. */
 
-package com.keylesspalace.tusky.util
+package tech.bigfig.roma.util
 
-import com.keylesspalace.tusky.entity.Notification
+import tech.bigfig.roma.entity.Notification
 import org.json.JSONArray
 
 /**
diff --git a/app/src/main/res/layout-sw640dp/fragment_timeline_notifications.xml b/app/src/main/res/layout-sw640dp/fragment_timeline_notifications.xml
@@ -20,7 +20,7 @@
                 android:id="@+id/appBarOptions"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_behavior="com.keylesspalace.tusky.util.AppBarLayoutNoEmptyScrollBehavior"
+                app:layout_behavior="tech.bigfig.roma.util.AppBarLayoutNoEmptyScrollBehavior"
                 app:elevation="0dp">
 
                 <androidx.appcompat.widget.Toolbar
@@ -41,7 +41,7 @@
 
                         <Button
                             android:id="@+id/buttonClear"
-                            style="@style/TuskyButton.TextButton"
+                            style="@style/RomaButton.TextButton"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -50,7 +50,7 @@
 
                         <Button
                             android:id="@+id/buttonFilter"
-                            style="@style/TuskyButton.TextButton"
+                            style="@style/RomaButton.TextButton"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -91,7 +91,7 @@
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <com.keylesspalace.tusky.view.BackgroundMessageView
+        <tech.bigfig.roma.view.BackgroundMessageView
             android:id="@+id/statusView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_timeline_notifications.xml b/app/src/main/res/layout/fragment_timeline_notifications.xml
@@ -14,7 +14,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:elevation="0dp"
-            app:layout_behavior="com.keylesspalace.tusky.util.AppBarLayoutNoEmptyScrollBehavior">
+            app:layout_behavior="tech.bigfig.roma.util.AppBarLayoutNoEmptyScrollBehavior">
 
             <androidx.appcompat.widget.Toolbar
                 android:layout_width="match_parent"
@@ -34,7 +34,7 @@
 
                     <Button
                         android:id="@+id/buttonClear"
-                        style="@style/TuskyButton.TextButton"
+                        style="@style/RomaButton.TextButton"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -43,7 +43,7 @@
 
                     <Button
                         android:id="@+id/buttonFilter"
-                        style="@style/TuskyButton.TextButton"
+                        style="@style/RomaButton.TextButton"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -86,7 +86,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.keylesspalace.tusky.view.BackgroundMessageView
+    <tech.bigfig.roma.view.BackgroundMessageView
         android:id="@+id/statusView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
@@ -19,7 +19,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
-    <com.keylesspalace.tusky.view.RoundedImageView
+    <tech.bigfig.roma.view.RoundedImageView
         android:id="@+id/account_avatar_inset"
         android:layout_width="24dp"
         android:layout_height="24dp"
diff --git a/app/src/main/res/layout/item_status_detailed.xml b/app/src/main/res/layout/item_status_detailed.xml
@@ -24,7 +24,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/avatar_default" />
 
-    <com.keylesspalace.tusky.view.RoundedImageView
+    <tech.bigfig.roma.view.RoundedImageView
         android:id="@+id/status_avatar_inset"
         android:layout_width="24dp"
         android:layout_height="24dp"
diff --git a/app/src/main/res/layout/notifications_filter.xml b/app/src/main/res/layout/notifications_filter.xml
@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"/>
     <Button
         android:id="@+id/buttonApply"
-        style="@style/TuskyButton.TextButton"
+        style="@style/RomaButton.TextButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/filter_apply"
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
@@ -324,7 +324,6 @@
 
     <string name="pref_media_display">Afichatge dels mèdias</string>
 
-    <string name="about_tusky_version">Tusky %s</string>
     <string name="abbreviated_days_ago">%dd</string>
     <string name="abbreviated_hours_ago">%dh</string>
     <string name="abbreviated_minutes_ago">%dm</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -464,7 +464,7 @@
     <string name="notifications_clear">Clear</string>
     <string name="notifications_apply_filter">Filter</string>
     <string name="filter_favorites">@string/notification_channel_favourite_name</string>
-    <string name="filter_boosts">@string/notification_channel_boost_name</string>
+    <string name="filter_boosts">@string/notification_channel_repost_name</string>
     <string name="filter_follows">@string/notification_channel_follow_name</string>
     <string name="filter_mentions">@string/notification_channel_mention_name</string>
     <string name="filter_apply">Apply</string>
diff --git a/fastlane/metadata/android/en-US/changelogs/58.txt b/fastlane/metadata/android/en-US/changelogs/58.txt
@@ -1,4 +1,4 @@
-Tusky v6.0
+Roma v6.0
 
 - Timeline filters have moved to Account Preferences and will sync with the server
 - You can now have a custom hashtag as tab in the main interface
@@ -7,7 +7,7 @@ Tusky v6.0
 - The compose view will now suggest custom emojis when starting to type
 - New theme setting "follow system theme"
 - Improved timeline accessibility
-- Tusky will now ignore unknown notifications and no longer crash
-- New setting: You can now override the system language and set a different language in Tusky
+- Roma will now ignore unknown notifications and no longer crash
+- New setting: You can now override the system language and set a different language in Roma
 - New translations: Czech and Esperanto
 - A lot of other improvements and fixes

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"formatVersion": 1,`
`3`	`3`	`"database": {`
`4`	`4`	`"version": 14,`
`5`		`- "identityHash": "b9ca62605345d229ced2bb0c1f2db79b",`
	`5`	`+ "identityHash": "8904c68e2a9fb5969da94ffd951e9301",`
`6`	`6`	`"entities": [`
`7`	`7`	`{`
`8`	`8`	`"tableName": "TootEntity",`
`@@ -74,7 +74,7 @@`
`74`	`74`	`},`
`75`	`75`	`{`
`76`	`76`	`"tableName": "AccountEntity",`
`77`		- "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `domain` TEXT NOT NULL, `accessToken` TEXT NOT NULL, `isActive` INTEGER NOT NULL, `accountId` TEXT NOT NULL, `username` TEXT NOT NULL, `displayName` TEXT NOT NULL, `profilePictureUrl` TEXT NOT NULL, `notificationsEnabled` INTEGER NOT NULL, `notificationsMentioned` INTEGER NOT NULL, `notificationsFollowed` INTEGER NOT NULL, `notificationsReblogged` INTEGER NOT NULL, `notificationsFavorited` INTEGER NOT NULL, `notificationSound` INTEGER NOT NULL, `notificationVibration` INTEGER NOT NULL, `notificationLight` INTEGER NOT NULL, `defaultPostPrivacy` INTEGER NOT NULL, `defaultMediaSensitivity` INTEGER NOT NULL, `alwaysShowSensitiveMedia` INTEGER NOT NULL, `mediaPreviewEnabled` INTEGER NOT NULL, `lastNotificationId` TEXT NOT NULL, `activeNotifications` TEXT NOT NULL, `emojis` TEXT NOT NULL, `tabPreferences` TEXT NOT NULL, `notificationsFilter` TEXT NOT NULL)",
	`77`	+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `domain` TEXT NOT NULL, `accessToken` TEXT NOT NULL, `isActive` INTEGER NOT NULL, `accountId` TEXT NOT NULL, `username` TEXT NOT NULL, `displayName` TEXT NOT NULL, `profilePictureUrl` TEXT NOT NULL, `notificationsEnabled` INTEGER NOT NULL, `notificationsMentioned` INTEGER NOT NULL, `notificationsFollowed` INTEGER NOT NULL, `notificationsReblogged` INTEGER NOT NULL, `notificationsFavourited` INTEGER NOT NULL, `notificationSound` INTEGER NOT NULL, `notificationVibration` INTEGER NOT NULL, `notificationLight` INTEGER NOT NULL, `defaultPostPrivacy` INTEGER NOT NULL, `defaultMediaSensitivity` INTEGER NOT NULL, `alwaysShowSensitiveMedia` INTEGER NOT NULL, `mediaPreviewEnabled` INTEGER NOT NULL, `lastNotificationId` TEXT NOT NULL, `activeNotifications` TEXT NOT NULL, `emojis` TEXT NOT NULL, `tabPreferences` TEXT NOT NULL, `notificationsFilter` TEXT NOT NULL)",
`78`	`78`	`"fields": [`
`79`	`79`	`{`
`80`	`80`	`"fieldPath": "id",`
`@@ -149,8 +149,8 @@`
`149`	`149`	`"notNull": true`
`150`	`150`	`},`
`151`	`151`	`{`
`152`		`- "fieldPath": "notificationsFavorited",`
`153`		`- "columnName": "notificationsFavorited",`
	`152`	`+ "fieldPath": "notificationsFavourited",`
	`153`	`+ "columnName": "notificationsFavourited",`
`154`	`154`	`"affinity": "INTEGER",`
`155`	`155`	`"notNull": true`
`156`	`156`	`},`
`@@ -656,7 +656,7 @@`
`656`	`656`	`],`
`657`	`657`	`"setupQueries": [`
`658`	`658`	`"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",`
`659`		`- "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"b9ca62605345d229ced2bb0c1f2db79b\")"`
	`659`	`+ "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"8904c68e2a9fb5969da94ffd951e9301\")"`
`660`	`660`	`]`
`661`	`661`	`}`
`662`	`662`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`	`1`	`/* Copyright 2018 Levi Bard`
`2`	`2`	`*`
`3`		`- * This file is a part of Tusky.`
	`3`	`+ * This file is a part of Roma.`
`4`	`4`	`*`
`5`	`5`	`* This program is free software; you can redistribute it and/or modify it under the terms of the`
`6`	`6`	`* GNU General Public License as published by the Free Software Foundation; either version 3 of the`
`7`	`7`	`* License, or (at your option) any later version.`
`8`	`8`	`*`
`9`		`- * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even`
	`9`	`+ * Roma is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even`
`10`	`10`	`* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General`
`11`	`11`	`* Public License for more details.`
`12`	`12`	`*`
`13`		`- * You should have received a copy of the GNU General Public License along with Tusky; if not,`
	`13`	`+ * You should have received a copy of the GNU General Public License along with Roma; if not,`
`14`	`14`	`* see <http://www.gnu.org/licenses>. */`
`15`	`15`
`16`	`16`	`package tech.bigfig.roma.entity`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,19 @@`
`1`	`1`	`/* Copyright 2019 Joel Pyska`
`2`	`2`	`*`
`3`		`- * This file is a part of Tusky.`
	`3`	`+ * This file is a part of Roma.`
`4`	`4`	`*`
`5`	`5`	`* This program is free software; you can redistribute it and/or modify it under the terms of the`
`6`	`6`	`* GNU General Public License as published by the Free Software Foundation; either version 3 of the`
`7`	`7`	`* License, or (at your option) any later version.`
`8`	`8`	`*`
`9`		`- * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even`
	`9`	`+ * Roma is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even`
`10`	`10`	`* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General`
`11`	`11`	`* Public License for more details.`
`12`	`12`	`*`
`13`		`- * You should have received a copy of the GNU General Public License along with Tusky; if not,`
	`13`	`+ * You should have received a copy of the GNU General Public License along with Roma; if not,`
`14`	`14`	`* see <http://www.gnu.org/licenses>. */`
`15`	`15`
`16`		`-package com.keylesspalace.tusky.util`
	`16`	`+package tech.bigfig.roma.util`
`17`	`17`
`18`	`18`	`import android.content.Context`
`19`	`19`	`import android.util.AttributeSet`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,21 @@`
`1`	`1`	`/* Copyright 2019 Joel Pyska`
`2`	`2`	`*`
`3`		`- * This file is a part of Tusky.`
	`3`	`+ * This file is a part of Roma.`
`4`	`4`	`*`
`5`	`5`	`* This program is free software; you can redistribute it and/or modify it under the terms of the`
`6`	`6`	`* GNU General Public License as published by the Free Software Foundation; either version 3 of the`
`7`	`7`	`* License, or (at your option) any later version.`
`8`	`8`	`*`
`9`		`- * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even`
	`9`	`+ * Roma is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even`
`10`	`10`	`* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General`
`11`	`11`	`* Public License for more details.`
`12`	`12`	`*`
`13`		`- * You should have received a copy of the GNU General Public License along with Tusky; if not,`
	`13`	`+ * You should have received a copy of the GNU General Public License along with Roma; if not,`
`14`	`14`	`* see <http://www.gnu.org/licenses>. */`
`15`	`15`
`16`		`-package com.keylesspalace.tusky.util`
	`16`	`+package tech.bigfig.roma.util`
`17`	`17`
`18`		`-import com.keylesspalace.tusky.entity.Notification`
	`18`	`+import tech.bigfig.roma.entity.Notification`
`19`	`19`	`import org.json.JSONArray`
`20`	`20`
`21`	`21`	`/**`