Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-02-09 00:08:41 +01:00
Code Issues Releases Wiki Activity

fixed build error

Browse Source
This commit is contained in:
Mariotaku Lee 2017-01-13 22:31:35 +08:00
parent 15817c8659
commit 6068cb3b2c
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java
View File

@ -42,6 +42,8 @@ import org.mariotaku.twidere.provider.TwidereDataStore;
import org.mariotaku.twidere.provider.TwidereDataStore.Statuses; import org.mariotaku.twidere.provider.TwidereDataStore.Statuses;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
@ -576,6 +578,7 @@ public class ParcelableStatus implements Parcelable, Comparable<ParcelableStatus
FilterFlags.BLOCKED_BY_USER, FilterFlags.BLOCKED_BY_USER,
FilterFlags.POSSIBILITY_SENSITIVE FilterFlags.POSSIBILITY_SENSITIVE
}, flag = true) }, flag = true)
@Retention(RetentionPolicy.SOURCE)
public @interface FilterFlags { public @interface FilterFlags {
/** /**
* Original tweet of a quote tweet is unavailable. * Original tweet of a quote tweet is unavailable.

10
twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/TwidereArrayUtilsTest.kt
View File

@ -1,11 +1,9 @@
package org.mariotaku.twidere.util package org.mariotaku.twidere.util
import org.junit.Assert
import org.junit.Test import org.junit.Test
import junit.framework.Assert.assertEquals
import org.junit.Assert.assertArrayEquals
/** /**
* Created by mariotaku on 16/1/31. * Created by mariotaku on 16/1/31.
*/ */
@ -23,7 +21,7 @@ class TwidereArrayUtilsTest {
//noinspection ConstantConditions //noinspection ConstantConditions
TwidereArrayUtils.mergeArray(merged, array1, array2, array3) TwidereArrayUtils.mergeArray(merged, array1, array2, array3)
val expected = arrayOf("1", "2", "1", "2") val expected = arrayOf("1", "2", "1", "2")
assertArrayEquals(expected, merged) Assert.assertArrayEquals(expected, merged)
} }
@Test @Test
@ -33,7 +31,7 @@ class TwidereArrayUtilsTest {
val array2 = arrayOf("1", "2") val array2 = arrayOf("1", "2")
val array3: Array<String>? = null val array3: Array<String>? = null
//noinspection ConstantConditions //noinspection ConstantConditions
assertEquals(4, TwidereArrayUtils.arraysLength(array1, array2, array3)) Assert.assertEquals(4, TwidereArrayUtils.arraysLength(array1, array2, array3))
assertEquals(6, TwidereArrayUtils.arraysLength(array1, array2, array2)) Assert.assertEquals(6, TwidereArrayUtils.arraysLength(array1, array2, array2))
} }
} }

2
twidere/src/fdroid/kotlin/org/mariotaku/twidere/fragment/OpenStreetMapViewerFragment.kt
View File

@ -35,7 +35,7 @@ import org.osmdroid.views.overlay.ItemizedOverlay
import org.osmdroid.views.overlay.OverlayItem import org.osmdroid.views.overlay.OverlayItem
import java.util.* import java.util.*
class OpenStreetMapViewerFragment : BaseSupportFragment(), Constants { class OpenStreetMapViewerFragment : BaseFragment(), Constants {
private var latitude: Double = 0.0 private var latitude: Double = 0.0
private var longitude: Double = 0.0 private var longitude: Double = 0.0