Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1336 from TacoTheDank/maintenance 

Lints, libraries, deprecation fixes, and codestyle
This commit is contained in:
Tlaster 2020-07-20 16:17:19 +08:00 committed by GitHub
parent 53edcd4897 4b2aba0266
commit 44d9b6036a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
118 changed files with 391 additions and 1981 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -43,13 +43,13 @@ subprojects {
Kotlin : "${kotlinVersion}",
LoganSquare : '1.3.7',
Jackson : '2.7.4',
Jackson : '2.11.1',
ParcelablePlease : '1.0.2',
ExportablePreferences: '0.9.7',
MariotakuCommons : '0.9.20',
MariotakuCommons : '0.9.22',
ObjectCursor : '0.9.21',
RestFu : '0.9.60',
RestFu : '0.9.64',
]
}
}

25
lint.xml
View File

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><!--
~ Twidere - Twitter client for Android
~
~ Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
~
~ 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.
~
~ This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-->
<lint>
<!-- Disable the given check in this project -->
<issue id="MissingTranslation" severity="ignore" />
<issue id="PluralsCandidate" severity="ignore" />
</lint>

1
twidere.component.common/build.gradle
View File

@ -95,7 +95,6 @@ dependencies {
annotationProcessor "com.github.mariotaku.ObjectCursor:processor:${sharedVersions['ObjectCursor']}"
implementation "com.github.mariotaku.RestFu:library:${sharedVersions['RestFu']}"
implementation "com.github.mariotaku.RestFu:oauth:${sharedVersions['RestFu']}"
implementation "com.github.mariotaku.RestFu:oauth2:${sharedVersions['RestFu']}"
}
install {

2
twidere.component.nyan/build.gradle
View File

@ -38,5 +38,5 @@ android {
}
dependencies {
implementation 'androidx.core:core:1.2.0'
implementation 'androidx.core:core:1.3.0'
}

39
twidere/build.gradle
View File

@ -127,7 +127,7 @@ android {
lintOptions {
checkReleaseBuilds false
abortOnError false
lintConfig rootProject.file('lint.xml')
disable 'MissingTranslation', 'PluralsCandidate'
}
packagingOptions {
@ -175,11 +175,10 @@ ext {
libVersions = [
Kovenant : '3.3.0',
Mime4J : '0.7.2',
Dagger : '2.28',
Exoplayer : '2.11.5',
Dagger : '2.28.1',
Exoplayer : '2.11.7',
Glide : '4.11.0',
MediaViewerLibrary: '0.9.23',
PlayServices : '17.0.0',
Stetho : '1.5.1',
]
}
@ -189,7 +188,7 @@ dependencies {
implementation project(':twidere.component.nyan')
/** Kotlin **/
implementation "org.jetbrains.kotlin:kotlin-stdlib:${sharedVersions['Kotlin']}"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${sharedVersions['Kotlin']}"
implementation "nl.komponents.kovenant:kovenant:${libVersions['Kovenant']}"
implementation "nl.komponents.kovenant:kovenant-android:${libVersions['Kovenant']}"
implementation "nl.komponents.kovenant:kovenant-combine:${libVersions['Kovenant']}"
@ -201,24 +200,25 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
implementation 'androidx.browser:browser:1.2.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.core:core:1.2.0'
implementation 'androidx.core:core-ktx:1.2.0'
implementation 'androidx.core:core:1.3.0'
implementation 'androidx.core:core-ktx:1.3.0'
implementation 'androidx.drawerlayout:drawerlayout:1.1.0-alpha01'
implementation 'androidx.exifinterface:exifinterface:1.2.0'
implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.palette:palette-ktx:1.0.0'
implementation 'androidx.preference:preference:1.1.1'
implementation 'androidx.preference:preference-ktx:1.1.1'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'com.google.android.material:material:1.1.0'
/** Third-party dependencies **/
compileOnly 'javax.annotation:jsr250-api:1.0'
implementation 'com.twitter:twitter-text:1.14.7'
implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
implementation 'com.twitter.twittertext:twitter-text:3.1.0'
implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
implementation 'com.squareup:otto:1.3.8'
implementation 'dnsjava:dnsjava:2.1.9'
implementation 'dnsjava:dnsjava:3.2.2'
implementation 'com.commonsware.cwac:layouts:0.4.5'
implementation 'com.rengwuxian.materialedittext:library:2.1.4'
implementation 'com.pnikosis:materialish-progress:1.7'
@ -226,6 +226,7 @@ dependencies {
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.15'
implementation 'com.sprylab.android.texturevideoview:texturevideoview:1.2.1'
implementation 'com.squareup:pollexor:2.0.4'
implementation 'org.apache.commons:commons-lang3:3.10'
implementation 'org.apache.commons:commons-text:1.8'
implementation "org.apache.james:apache-mime4j-core:${libVersions['Mime4J']}"
implementation "org.apache.james:apache-mime4j-storage:${libVersions['Mime4J']}"
@ -251,10 +252,11 @@ dependencies {
kapt "com.github.bumptech.glide:compiler:${libVersions['Glide']}"
implementation 'jp.wasabeef:glide-transformations:4.1.0'
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
implementation 'io.nayuki:qrcodegen:1.6.0'
/** Custom dependencies **/
implementation 'com.github.mariotaku:AbstractTask:0.9.5'
implementation 'com.github.mariotaku:AbstractTask:0.9.7'
implementation 'com.github.mariotaku:DragSortListView:0.6.1'
implementation "com.github.mariotaku.ExportablePreferences:core:${sharedVersions['ExportablePreferences']}"
implementation("com.github.mariotaku.CommonsLibrary:emojione-android:${sharedVersions['MariotakuCommons']}") {
@ -272,14 +274,14 @@ dependencies {
implementation 'com.github.mariotaku:MessageBubbleView:3.5'
implementation "com.github.mariotaku.ObjectCursor:core:${sharedVersions['ObjectCursor']}"
kapt "com.github.mariotaku.ObjectCursor:processor:${sharedVersions['ObjectCursor']}"
implementation 'com.github.mariotaku:PickNCrop:0.9.27'
implementation 'com.github.mariotaku:PickNCrop:0.9.29'
implementation "com.github.mariotaku.RestFu:library:${sharedVersions['RestFu']}"
implementation "com.github.mariotaku.RestFu:logansquare:${sharedVersions['RestFu']}"
implementation "com.github.mariotaku.RestFu:oauth:${sharedVersions['RestFu']}"
implementation "com.github.mariotaku.RestFu:oauth2:${sharedVersions['RestFu']}"
implementation "com.github.mariotaku.RestFu:okhttp3:${sharedVersions['RestFu']}"
implementation 'com.github.mariotaku:SQLiteQB:0.9.15'
implementation 'com.github.mariotaku.UniqR:android:0.9.4'
implementation 'com.github.mariotaku.UniqR:android:0.9.10'
implementation 'com.github.Tlaster:Chameleon:0.9.28'
@ -289,9 +291,10 @@ dependencies {
if (enableGoogleVariant) {
// START Non-FOSS component
googleImplementation "com.google.android.gms:play-services-ads:${libVersions['PlayServices']}"
googleImplementation "com.google.android.gms:play-services-auth:${libVersions['PlayServices']}"
googleImplementation "com.google.android.gms:play-services-maps:${libVersions['PlayServices']}"
googleImplementation 'com.google.android.gms:play-services-ads:17.0.0'
googleImplementation 'com.google.android.gms:play-services-auth:17.0.0'
googleImplementation 'com.google.android.gms:play-services-maps:17.0.0'
googleImplementation 'com.google.maps.android:android-maps-utils:0.6.2'
googleImplementation 'com.anjlab.android.iab.v3:library:1.1.0'
googleImplementation 'com.dropbox.core:dropbox-core-sdk:3.1.3'
@ -314,7 +317,7 @@ dependencies {
/** Testing **/
testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.annotation:annotation:1.1.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test:rules:1.2.0'
@ -326,4 +329,4 @@ if (enableGoogleVariant) {
// START Non-FOSS component
apply plugin: 'com.google.gms.google-services'
// END Non-FOSS component
}
}

2
twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/text/twitter/ExtractorExtensionsTest.kt
View File

@ -21,7 +21,7 @@ package org.mariotaku.twidere.extension.text.twitter
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.twitter.Extractor
import com.twitter.twittertext.Extractor
import org.junit.Assert
import org.junit.Before
import org.junit.Test

94
twidere/src/main/java/io/nayuki/qrcodegen/BitBuffer.java
View File

@ -1,94 +0,0 @@
/*
* QR Code generator library (Java)
*
* Copyright (c) Project Nayuki. (MIT License)
* https://www.nayuki.io/page/qr-code-generator-library
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
* - The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
* - The Software is provided "as is", without warranty of any kind, express or
* implied, including but not limited to the warranties of merchantability,
* fitness for a particular purpose and noninfringement. In no event shall the
* authors or copyright holders be liable for any claim, damages or other
* liability, whether in an action of contract, tort or otherwise, arising from,
* out of or in connection with the Software or the use or other dealings in the
* Software.
*/
package io.nayuki.qrcodegen;
import androidx.annotation.NonNull;
import java.util.Arrays;
/**
* An appendable sequence of bits. Bits are packed in big endian within a byte.
*/
final class BitBuffer {
/*---- Fields ----*/
private byte[] data;
private int bitLength;
/*---- Constructor ----*/
// Creates an empty bit buffer (length 0).
public BitBuffer() {
data = new byte[16];
bitLength = 0;
}
/*---- Methods ----*/
// Returns the number of bits in the buffer, which is a non-negative value.
public int bitLength() {
return bitLength;
}
// Returns a copy of all bytes, padding up to the nearest byte.
public byte[] getBytes() {
return Arrays.copyOf(data, (bitLength + 7) / 8);
}
// Appends the given number of bits of the given value to this sequence.
// If 0 <= len <= 31, then this requires 0 <= val < 2^len.
public void appendBits(int val, int len) {
if (len < 0 || len > 32 || len < 32 && (val >>> len) != 0)
throw new IllegalArgumentException("Value out of range");
ensureCapacity(bitLength + len);
for (int i = len - 1; i >= 0; i--, bitLength++) // Append bit by bit
data[bitLength >>> 3] |= ((val >>> i) & 1) << (7 - (bitLength & 7));
}
// Appends the data of the given segment to this bit buffer.
public void appendData(@NonNull QrSegment seg) {
ensureCapacity(bitLength + seg.bitLength);
for (int i = 0; i < seg.bitLength; i++, bitLength++) { // Append bit by bit
int bit = (seg.getByte(i >>> 3) >>> (7 - (i & 7))) & 1;
data[bitLength >>> 3] |= bit << (7 - (bitLength & 7));
}
}
// Expands the buffer if necessary, so that it can hold at least the given bit length.
private void ensureCapacity(int newBitLen) {
while (data.length * 8 < newBitLen)
data = Arrays.copyOf(data, data.length * 2);
}
}

793
twidere/src/main/java/io/nayuki/qrcodegen/QrCode.java
View File

@ -1,793 +0,0 @@
/*
* QR Code generator library (Java)
*
* Copyright (c) Project Nayuki. (MIT License)
* https://www.nayuki.io/page/qr-code-generator-library
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
* - The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
* - The Software is provided "as is", without warranty of any kind, express or
* implied, including but not limited to the warranties of merchantability,
* fitness for a particular purpose and noninfringement. In no event shall the
* authors or copyright holders be liable for any claim, damages or other
* liability, whether in an action of contract, tort or otherwise, arising from,
* out of or in connection with the Software or the use or other dealings in the
* Software.
*/
package io.nayuki.qrcodegen;
import androidx.annotation.NonNull;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
* Represents an immutable square grid of black and white cells for a QR Code symbol, and
* provides static functions to create a QR Code from user-supplied textual or binary data.
* <p>This class covers the QR Code model 2 specification, supporting all versions (sizes)
* from 1 to 40, all 4 error correction levels, and only 3 character encoding modes.</p>
*/
public final class QrCode {
/*---- Public static factory functions ----*/
/**
* Returns a QR Code symbol representing the specified Unicode text string at the specified error correction level.
* As a conservative upper bound, this function is guaranteed to succeed for strings that have 738 or fewer Unicode
* code points (not UTF-16 code units). The smallest possible QR Code version is automatically chosen for the output.
* The ECC level of the result may be higher than the ecl argument if it can be done without increasing the version.
* @param text the text to be encoded, which can be any Unicode string
* @param ecl the error correction level to use (will be boosted)
* @return a QR Code representing the text
* @throws NullPointerException if the text or error correction level is {@code null}
* @throws IllegalArgumentException if the text fails to fit in the largest version QR Code, which means it is too long
*/
public static QrCode encodeText(@NonNull String text, @NonNull Ecc ecl) {
List<QrSegment> segs = QrSegment.makeSegments(text);
return encodeSegments(segs, ecl);
}
/**
* Returns a QR Code symbol representing the specified binary data string at the specified error correction level.
* This function always encodes using the binary segment mode, not any text mode. The maximum number of
* bytes allowed is 2953. The smallest possible QR Code version is automatically chosen for the output.
* The ECC level of the result may be higher than the ecl argument if it can be done without increasing the version.
* @param data the binary data to encode
* @param ecl the error correction level to use (will be boosted)
* @return a QR Code representing the binary data
* @throws NullPointerException if the data or error correction level is {@code null}
* @throws IllegalArgumentException if the data fails to fit in the largest version QR Code, which means it is too long
*/
public static QrCode encodeBinary(@NonNull byte[] data, @NonNull Ecc ecl) {
QrSegment seg = QrSegment.makeBytes(data);
return encodeSegments(Collections.singletonList(seg), ecl);
}
/**
* Returns a QR Code symbol representing the specified data segments at the specified error correction
* level or higher. The smallest possible QR Code version is automatically chosen for the output.
* <p>This function allows the user to create a custom sequence of segments that switches
* between modes (such as alphanumeric and binary) to encode text more efficiently. This
* function is considered to be lower level than simply encoding text or binary data.</p>
* @param segs the segments to encode
* @param ecl the error correction level to use (will be boosted)
* @return a QR Code representing the segments
* @throws NullPointerException if the list of segments, a segment, or the error correction level is {@code null}
* @throws IllegalArgumentException if the data is too long to fit in the largest version QR Code at the ECL
*/
public static QrCode encodeSegments(List<QrSegment> segs, Ecc ecl) {
return encodeSegments(segs, ecl, 1, 40, -1, true);
}
/**
* Returns a QR Code symbol representing the specified data segments with the specified encoding parameters.
* The smallest possible QR Code version within the specified range is automatically chosen for the output.
* <p>This function allows the user to create a custom sequence of segments that switches
* between modes (such as alphanumeric and binary) to encode text more efficiently.
* This function is considered to be lower level than simply encoding text or binary data.</p>
* @param segs the segments to encode
* @param ecl the error correction level to use (may be boosted)
* @param minVersion the minimum allowed version of the QR symbol (at least 1)
* @param maxVersion the maximum allowed version of the QR symbol (at most 40)
* @param mask the mask pattern to use, which is either -1 for automatic choice or from 0 to 7 for fixed choice
* @param boostEcl increases the error correction level if it can be done without increasing the version number
* @return a QR Code representing the segments
* @throws NullPointerException if the list of segments, a segment, or the error correction level is {@code null}
* @throws IllegalArgumentException if 1 &le; minVersion &le; maxVersion &le; 40 is violated, or if mask
* &lt; &minus;1 or mask > 7, or if the data is too long to fit in a QR Code at maxVersion at the ECL
*/
public static QrCode encodeSegments(@NonNull List<QrSegment> segs, @NonNull Ecc ecl, int minVersion, int maxVersion, int mask, boolean boostEcl) {
if (!(1 <= minVersion && minVersion <= maxVersion && maxVersion <= 40) || mask < -1 || mask > 7)
throw new IllegalArgumentException("Invalid value");
// Find the minimal version number to use
int version, dataUsedBits;
for (version = minVersion; ; version++) {
int dataCapacityBits = getNumDataCodewords(version, ecl) * 8; // Number of data bits available
dataUsedBits = QrSegment.getTotalBits(segs, version);
if (dataUsedBits != -1 && dataUsedBits <= dataCapacityBits)
break; // This version number is found to be suitable
if (version >= maxVersion) // All versions in the range could not fit the given data
throw new IllegalArgumentException("Data too long");
}
if (dataUsedBits == -1)
throw new AssertionError();
// Increase the error correction level while the data still fits in the current version number
for (Ecc newEcl : Ecc.values()) {
if (boostEcl && dataUsedBits <= getNumDataCodewords(version, newEcl) * 8)
ecl = newEcl;
}
// Create the data bit string by concatenating all segments
int dataCapacityBits = getNumDataCodewords(version, ecl) * 8;
BitBuffer bb = new BitBuffer();
for (QrSegment seg : segs) {
bb.appendBits(seg.mode.modeBits, 4);
bb.appendBits(seg.numChars, seg.mode.numCharCountBits(version));
bb.appendData(seg);
}
// Add terminator and pad up to a byte if applicable
bb.appendBits(0, Math.min(4, dataCapacityBits - bb.bitLength()));
bb.appendBits(0, (8 - bb.bitLength() % 8) % 8);
// Pad with alternate bytes until data capacity is reached
for (int padByte = 0xEC; bb.bitLength() < dataCapacityBits; padByte ^= 0xEC ^ 0x11)
bb.appendBits(padByte, 8);
if (bb.bitLength() % 8 != 0)
throw new AssertionError();
// Create the QR Code symbol
return new QrCode(version, ecl, bb.getBytes(), mask);
}
/*---- Instance fields ----*/
// Public immutable scalar parameters
/** This QR Code symbol's version number, which is always between 1 and 40 (inclusive). */
public final int version;
/** The width and height of this QR Code symbol, measured in modules.
* Always equal to version &times; 4 + 17, in the range 21 to 177. */
public final int size;
/** The error correction level used in this QR Code symbol. Never {@code null}. */
public final Ecc errorCorrectionLevel;
/** The mask pattern used in this QR Code symbol, in the range 0 to 7 (i.e. unsigned 3-bit integer).
* Note that even if a constructor was called with automatic masking requested
* (mask = -1), the resulting object will still have a mask value between 0 and 7. */
public final int mask;
// Private grids of modules/pixels (conceptually immutable)
private boolean[][] modules; // The modules of this QR Code symbol (false = white, true = black)
private boolean[][] isFunction; // Indicates function modules that are not subjected to masking
/*---- Constructors ----*/
/**
* Creates a new QR Code symbol with the specified version number, error correction level, binary data array, and mask number.
* <p>This is a cumbersome low-level constructor that should not be invoked directly by the user.
* To go one level up, see the {@link #encodeSegments(List,Ecc)} function.</p>
* @param ver the version number to use, which must be in the range 1 to 40, inclusive
* @param ecl the error correction level to use
* @param dataCodewords the raw binary user data to encode
* @param mask the mask pattern to use, which is either -1 for automatic choice or from 0 to 7 for fixed choice
* @throws NullPointerException if the byte array or error correction level is {@code null}
* @throws IllegalArgumentException if the version or mask value is out of range
*/
public QrCode(int ver, @NonNull Ecc ecl, @NonNull byte[] dataCodewords, int mask) {
// Check arguments
if (ver < 1 || ver > 40 || mask < -1 || mask > 7)
throw new IllegalArgumentException("Value out of range");
// Initialize fields
version = ver;
size = ver * 4 + 17;
errorCorrectionLevel = ecl;
modules = new boolean[size][size]; // Entirely white grid
isFunction = new boolean[size][size];
// Draw function patterns, draw all codewords, do masking
drawFunctionPatterns();
byte[] allCodewords = appendErrorCorrection(dataCodewords);
drawCodewords(allCodewords);
this.mask = handleConstructorMasking(mask);
}
/**
* Creates a new QR Code symbol based on the specified existing object, but with a potentially
* different mask pattern. The version, error correction level, codewords, etc. of the newly
* created object are all identical to the argument object; only the mask may differ.
* @param qr the existing QR Code to copy and modify
* @param mask the new mask pattern, 0 to 7 to force a fixed choice or -1 for an automatic choice
* @throws NullPointerException if the QR Code is {@code null}
* @throws IllegalArgumentException if the mask value is out of range
*/
public QrCode(@NonNull QrCode qr, int mask) {
// Check arguments
if (mask < -1 || mask > 7)
throw new IllegalArgumentException("Mask value out of range");
// Copy scalar fields
version = qr.version;
size = qr.size;
errorCorrectionLevel = qr.errorCorrectionLevel;
// Handle grid fields
isFunction = qr.isFunction; // Shallow copy because the data is read-only
modules = qr.modules.clone(); // Deep copy
for (int i = 0; i < modules.length; i++)
modules[i] = modules[i].clone();
// Handle masking
applyMask(qr.mask); // Undo old mask
this.mask = handleConstructorMasking(mask);
}
/*---- Public instance methods ----*/
/**
* Returns the color of the module (pixel) at the specified coordinates, which is either 0 for white or 1 for black. The top
* left corner has the coordinates (x=0, y=0). If the specified coordinates are out of bounds, then 0 (white) is returned.
* @param x the x coordinate, where 0 is the left edge and size&minus;1 is the right edge
* @param y the y coordinate, where 0 is the top edge and size&minus;1 is the bottom edge
* @return the module's color, which is either 0 (white) or 1 (black)
*/
public int getModule(int x, int y) {
if (0 <= x && x < size && 0 <= y && y < size)
return modules[y][x] ? 1 : 0;
else
return 0; // Infinite white border
}
/*---- Private helper methods for constructor: Drawing function modules ----*/
private void drawFunctionPatterns() {
// Draw horizontal and vertical timing patterns
for (int i = 0; i < size; i++) {
setFunctionModule(6, i, i % 2 == 0);
setFunctionModule(i, 6, i % 2 == 0);
}
// Draw 3 finder patterns (all corners except bottom right; overwrites some timing modules)
drawFinderPattern(3, 3);
drawFinderPattern(size - 4, 3);
drawFinderPattern(3, size - 4);
// Draw numerous alignment patterns
int[] alignPatPos = getAlignmentPatternPositions(version);
int numAlign = alignPatPos.length;
for (int i = 0; i < numAlign; i++) {
for (int j = 0; j < numAlign; j++) {
if (i == 0 && j == 0 || i == 0 && j == numAlign - 1 || i == numAlign - 1 && j == 0)
continue; // Skip the three finder corners
else
drawAlignmentPattern(alignPatPos[i], alignPatPos[j]);
}
}
// Draw configuration data
drawFormatBits(0); // Dummy mask value; overwritten later in the constructor
drawVersion();
}
// Draws two copies of the format bits (with its own error correction code)
// based on the given mask and this object's error correction level field.
private void drawFormatBits(int mask) {
// Calculate error correction code and pack bits
int data = errorCorrectionLevel.formatBits << 3 | mask; // errCorrLvl is uint2, mask is uint3
int rem = data;
for (int i = 0; i < 10; i++)
rem = (rem << 1) ^ ((rem >>> 9) * 0x537);
data = data << 10 | rem;
data ^= 0x5412; // uint15
if (data >>> 15 != 0)
throw new AssertionError();
// Draw first copy
for (int i = 0; i <= 5; i++)
setFunctionModule(8, i, ((data >>> i) & 1) != 0);
setFunctionModule(8, 7, ((data >>> 6) & 1) != 0);
setFunctionModule(8, 8, ((data >>> 7) & 1) != 0);
setFunctionModule(7, 8, ((data >>> 8) & 1) != 0);
for (int i = 9; i < 15; i++)
setFunctionModule(14 - i, 8, ((data >>> i) & 1) != 0);
// Draw second copy
for (int i = 0; i <= 7; i++)
setFunctionModule(size - 1 - i, 8, ((data >>> i) & 1) != 0);
for (int i = 8; i < 15; i++)
setFunctionModule(8, size - 15 + i, ((data >>> i) & 1) != 0);
setFunctionModule(8, size - 8, true);
}
// Draws two copies of the version bits (with its own error correction code),
// based on this object's version field (which only has an effect for 7 <= version <= 40).
private void drawVersion() {
if (version < 7)
return;
// Calculate error correction code and pack bits
int rem = version; // version is uint6, in the range [7, 40]
for (int i = 0; i < 12; i++)
rem = (rem << 1) ^ ((rem >>> 11) * 0x1F25);
int data = version << 12 | rem; // uint18
if (data >>> 18 != 0)
throw new AssertionError();
// Draw two copies
for (int i = 0; i < 18; i++) {
boolean bit = ((data >>> i) & 1) != 0;
int a = size - 11 + i % 3, b = i / 3;
setFunctionModule(a, b, bit);
setFunctionModule(b, a, bit);
}
}
// Draws a 9*9 finder pattern including the border separator, with the center module at (x, y).
private void drawFinderPattern(int x, int y) {
for (int i = -4; i <= 4; i++) {
for (int j = -4; j <= 4; j++) {
int dist = Math.max(Math.abs(i), Math.abs(j)); // Chebyshev/infinity norm
int xx = x + j, yy = y + i;
if (0 <= xx && xx < size && 0 <= yy && yy < size)
setFunctionModule(xx, yy, dist != 2 && dist != 4);
}
}
}
// Draws a 5*5 alignment pattern, with the center module at (x, y).
private void drawAlignmentPattern(int x, int y) {
for (int i = -2; i <= 2; i++) {
for (int j = -2; j <= 2; j++)
setFunctionModule(x + j, y + i, Math.max(Math.abs(i), Math.abs(j)) != 1);
}
}
// Sets the color of a module and marks it as a function module.
// Only used by the constructor. Coordinates must be in range.
private void setFunctionModule(int x, int y, boolean isBlack) {
modules[y][x] = isBlack;
isFunction[y][x] = true;
}
/*---- Private helper methods for constructor: Codewords and masking ----*/
// Returns a new byte string representing the given data with the appropriate error correction
// codewords appended to it, based on this object's version and error correction level.
private byte[] appendErrorCorrection(byte[] data) {
if (data.length != getNumDataCodewords(version, errorCorrectionLevel))
throw new IllegalArgumentException();
// Calculate parameter numbers
int numBlocks = NUM_ERROR_CORRECTION_BLOCKS[errorCorrectionLevel.ordinal()][version];
int blockEccLen = ECC_CODEWORDS_PER_BLOCK[errorCorrectionLevel.ordinal()][version];
int rawCodewords = getNumRawDataModules(version) / 8;
int numShortBlocks = numBlocks - rawCodewords % numBlocks;
int shortBlockLen = rawCodewords / numBlocks;
// Split data into blocks and append ECC to each block
byte[][] blocks = new byte[numBlocks][];
ReedSolomonGenerator rs = new ReedSolomonGenerator(blockEccLen);
for (int i = 0, k = 0; i < numBlocks; i++) {
byte[] dat = Arrays.copyOfRange(data, k, k + shortBlockLen - blockEccLen + (i < numShortBlocks ? 0 : 1));
byte[] block = Arrays.copyOf(dat, shortBlockLen + 1);
k += dat.length;
byte[] ecc = rs.getRemainder(dat);
System.arraycopy(ecc, 0, block, block.length - blockEccLen, ecc.length);
blocks[i] = block;
}
// Interleave (not concatenate) the bytes from every block into a single sequence
byte[] result = new byte[rawCodewords];
for (int i = 0, k = 0; i < blocks[0].length; i++) {
for (int j = 0; j < blocks.length; j++) {
// Skip the padding byte in short blocks
if (i != shortBlockLen - blockEccLen || j >= numShortBlocks) {
result[k] = blocks[j][i];
k++;
}
}
}
return result;
}
// Draws the given sequence of 8-bit codewords (data and error correction) onto the entire
// data area of this QR Code symbol. Function modules need to be marked off before this is called.
private void drawCodewords(@NonNull byte[] data) {
if (data.length != getNumRawDataModules(version) / 8)
throw new IllegalArgumentException();
int i = 0; // Bit index into the data
// Do the funny zigzag scan
for (int right = size - 1; right >= 1; right -= 2) { // Index of right column in each column pair
if (right == 6)
right = 5;
for (int vert = 0; vert < size; vert++) { // Vertical counter
for (int j = 0; j < 2; j++) {
int x = right - j; // Actual x coordinate
boolean upward = ((right + 1) & 2) == 0;
int y = upward ? size - 1 - vert : vert; // Actual y coordinate
if (!isFunction[y][x] && i < data.length * 8) {
modules[y][x] = ((data[i >>> 3] >>> (7 - (i & 7))) & 1) != 0;
i++;
}
// If there are any remainder bits (0 to 7), they are already
// set to 0/false/white when the grid of modules was initialized
}
}
}
if (i != data.length * 8)
throw new AssertionError();
}
// XORs the data modules in this QR Code with the given mask pattern. Due to XOR's mathematical
// properties, calling applyMask(m) twice with the same value is equivalent to no change at all.
// This means it is possible to apply a mask, undo it, and try another mask. Note that a final
// well-formed QR Code symbol needs exactly one mask applied (not zero, not two, etc.).
private void applyMask(int mask) {
if (mask < 0 || mask > 7)
throw new IllegalArgumentException("Mask value out of range");
for (int y = 0; y < size; y++) {
for (int x = 0; x < size; x++) {
boolean invert;
switch (mask) {
case 0: invert = (x + y) % 2 == 0; break;
case 1: invert = y % 2 == 0; break;
case 2: invert = x % 3 == 0; break;
case 3: invert = (x + y) % 3 == 0; break;
case 4: invert = (x / 3 + y / 2) % 2 == 0; break;
case 5: invert = x * y % 2 + x * y % 3 == 0; break;
case 6: invert = (x * y % 2 + x * y % 3) % 2 == 0; break;
case 7: invert = ((x + y) % 2 + x * y % 3) % 2 == 0; break;
default: throw new AssertionError();
}
modules[y][x] ^= invert & !isFunction[y][x];
}
}
}
// A messy helper function for the constructors. This QR Code must be in an unmasked state when this
// method is called. The given argument is the requested mask, which is -1 for auto or 0 to 7 for fixed.
// This method applies and returns the actual mask chosen, from 0 to 7.
private int handleConstructorMasking(int mask) {
if (mask == -1) { // Automatically choose best mask
int minPenalty = Integer.MAX_VALUE;
for (int i = 0; i < 8; i++) {
drawFormatBits(i);
applyMask(i);
int penalty = getPenaltyScore();
if (penalty < minPenalty) {
mask = i;
minPenalty = penalty;
}
applyMask(i); // Undoes the mask due to XOR
}
}
if (mask < 0 || mask > 7)
throw new AssertionError();
drawFormatBits(mask); // Overwrite old format bits
applyMask(mask); // Apply the final choice of mask
return mask; // The caller shall assign this value to the final-declared field
}
// Calculates and returns the penalty score based on state of this QR Code's current modules.
// This is used by the automatic mask choice algorithm to find the mask pattern that yields the lowest score.
private int getPenaltyScore() {
int result = 0;
// Adjacent modules in row having same color
for (int y = 0; y < size; y++) {
boolean colorX = false;
for (int x = 0, runX = 0; x < size; x++) {
if (x == 0 || modules[y][x] != colorX) {
colorX = modules[y][x];
runX = 1;
} else {
runX++;
if (runX == 5)
result += PENALTY_N1;
else if (runX > 5)
result++;
}
}
}
// Adjacent modules in column having same color
for (int x = 0; x < size; x++) {
boolean colorY = false;
for (int y = 0, runY = 0; y < size; y++) {
if (y == 0 || modules[y][x] != colorY) {
colorY = modules[y][x];
runY = 1;
} else {
runY++;
if (runY == 5)
result += PENALTY_N1;
else if (runY > 5)
result++;
}
}
}
// 2*2 blocks of modules having same color
for (int y = 0; y < size - 1; y++) {
for (int x = 0; x < size - 1; x++) {
boolean color = modules[y][x];
if ( color == modules[y][x + 1] &&
color == modules[y + 1][x] &&
color == modules[y + 1][x + 1])
result += PENALTY_N2;
}
}
// Finder-like pattern in rows
for (int y = 0; y < size; y++) {
for (int x = 0, bits = 0; x < size; x++) {
bits = ((bits << 1) & 0x7FF) | (modules[y][x] ? 1 : 0);
if (x >= 10 && (bits == 0x05D || bits == 0x5D0)) // Needs 11 bits accumulated
result += PENALTY_N3;
}
}
// Finder-like pattern in columns
for (int x = 0; x < size; x++) {
for (int y = 0, bits = 0; y < size; y++) {
bits = ((bits << 1) & 0x7FF) | (modules[y][x] ? 1 : 0);
if (y >= 10 && (bits == 0x05D || bits == 0x5D0)) // Needs 11 bits accumulated
result += PENALTY_N3;
}
}
// Balance of black and white modules
int black = 0;
for (boolean[] row : modules) {
for (boolean color : row) {
if (color)
black++;
}
}
int total = size * size;
// Find smallest k such that (45-5k)% <= dark/total <= (55+5k)%
for (int k = 0; black*20 < (9-k)*total || black*20 > (11+k)*total; k++)
result += PENALTY_N4;
return result;
}
/*---- Private static helper functions ----*/
// Returns a set of positions of the alignment patterns in ascending order. These positions are
// used on both the x and y axes. Each value in the resulting array is in the range [0, 177).
// This stateless pure function could be implemented as table of 40 variable-length lists of unsigned bytes.
private static int[] getAlignmentPatternPositions(int ver) {
if (ver < 1 || ver > 40)
throw new IllegalArgumentException("Version number out of range");
else if (ver == 1)
return new int[]{};
else {
int numAlign = ver / 7 + 2;
int step;
if (ver != 32)
step = (ver * 4 + numAlign * 2 + 1) / (2 * numAlign - 2) * 2; // ceil((size - 13) / (2*numAlign - 2)) * 2
else // C-C-C-Combo breaker!
step = 26;
int[] result = new int[numAlign];
int size = ver * 4 + 17;
result[0] = 6;
for (int i = result.length - 1, pos = size - 7; i >= 1; i--, pos -= step)
result[i] = pos;
return result;
}
}
// Returns the number of data bits that can be stored in a QR Code of the given version number, after
// all function modules are excluded. This includes remainder bits, so it might not be a multiple of 8.
// The result is in the range [208, 29648]. This could be implemented as a 40-entry lookup table.
private static int getNumRawDataModules(int ver) {
if (ver < 1 || ver > 40)
throw new IllegalArgumentException("Version number out of range");
int size = ver * 4 + 17;
int result = size * size; // Number of modules in the whole QR symbol square
result -= 64 * 3; // Subtract the three finders with separators
result -= 15 * 2 + 1; // Subtract the format information and black module
result -= (size - 16) * 2; // Subtract the timing patterns
// The five lines above are equivalent to: int result = (16 * ver + 128) * ver + 64;
if (ver >= 2) {
int numAlign = ver / 7 + 2;
result -= (numAlign - 1) * (numAlign - 1) * 25; // Subtract alignment patterns not overlapping with timing patterns
result -= (numAlign - 2) * 2 * 20; // Subtract alignment patterns that overlap with timing patterns
// The two lines above are equivalent to: result -= (25 * numAlign - 10) * numAlign - 55;
if (ver >= 7)
result -= 18 * 2; // Subtract version information
}
return result;
}
// Returns the number of 8-bit data (i.e. not error correction) codewords contained in any
// QR Code of the given version number and error correction level, with remainder bits discarded.
// This stateless pure function could be implemented as a (40*4)-cell lookup table.
static int getNumDataCodewords(int ver, Ecc ecl) {
if (ver < 1 || ver > 40)
throw new IllegalArgumentException("Version number out of range");
return getNumRawDataModules(ver) / 8 - ECC_CODEWORDS_PER_BLOCK[ecl.ordinal()][ver] * NUM_ERROR_CORRECTION_BLOCKS[ecl.ordinal()][ver];
}
/*---- Private tables of constants ----*/
// For use in getPenaltyScore(), when evaluating which mask is best.
private static final int PENALTY_N1 = 3;
private static final int PENALTY_N2 = 3;
private static final int PENALTY_N3 = 40;
private static final int PENALTY_N4 = 10;
private static final byte[][] ECC_CODEWORDS_PER_BLOCK = {
// Version: (note that index 0 is for padding, and is set to an illegal value)
//0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level
{-1, 7, 10, 15, 20, 26, 18, 20, 24, 30, 18, 20, 24, 26, 30, 22, 24, 28, 30, 28, 28, 28, 28, 30, 30, 26, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // Low
{-1, 10, 16, 26, 18, 24, 16, 18, 22, 22, 26, 30, 22, 22, 24, 24, 28, 28, 26, 26, 26, 26, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28}, // Medium
{-1, 13, 22, 18, 26, 18, 24, 18, 22, 20, 24, 28, 26, 24, 20, 30, 24, 28, 28, 26, 30, 28, 30, 30, 30, 30, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // Quartile
{-1, 17, 28, 22, 16, 22, 28, 26, 26, 24, 28, 24, 28, 22, 24, 24, 30, 28, 28, 26, 28, 30, 24, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // High
};
private static final byte[][] NUM_ERROR_CORRECTION_BLOCKS = {
// Version: (note that index 0 is for padding, and is set to an illegal value)
//0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level
{-1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4, 4, 4, 4, 6, 6, 6, 6, 7, 8, 8, 9, 9, 10, 12, 12, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25}, // Low
{-1, 1, 1, 1, 2, 2, 4, 4, 4, 5, 5, 5, 8, 9, 9, 10, 10, 11, 13, 14, 16, 17, 17, 18, 20, 21, 23, 25, 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49}, // Medium
{-1, 1, 1, 2, 2, 4, 4, 6, 6, 8, 8, 8, 10, 12, 16, 12, 17, 16, 18, 21, 20, 23, 23, 25, 27, 29, 34, 34, 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68}, // Quartile
{-1, 1, 1, 2, 4, 4, 4, 5, 6, 8, 8, 11, 11, 16, 16, 18, 16, 19, 21, 25, 25, 25, 34, 30, 32, 35, 37, 40, 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81}, // High
};
/*---- Public helper enumeration ----*/
/**
* Represents the error correction level used in a QR Code symbol.
*/
public enum Ecc {
// These enum constants must be declared in ascending order of error protection,
// for the sake of the implicit ordinal() method and values() function.
LOW(1), MEDIUM(0), QUARTILE(3), HIGH(2);
// In the range 0 to 3 (unsigned 2-bit integer).
final int formatBits;
// Constructor.
Ecc(int fb) {
formatBits = fb;
}
}
/*---- Private helper class ----*/
/**
* Computes the Reed-Solomon error correction codewords for a sequence of data codewords
* at a given degree. Objects are immutable, and the state only depends on the degree.
* This class exists because the divisor polynomial does not need to be recalculated for every input.
*/
private static final class ReedSolomonGenerator {
/*-- Immutable field --*/
// Coefficients of the divisor polynomial, stored from highest to lowest power, excluding the leading term which
// is always 1. For example the polynomial x^3 + 255x^2 + 8x + 93 is stored as the uint8 array {255, 8, 93}.
private final byte[] coefficients;
/*-- Constructor --*/
/**
* Creates a Reed-Solomon ECC generator for the specified degree. This could be implemented
* as a lookup table over all possible parameter values, instead of as an algorithm.
* @param degree the divisor polynomial degree, which must be between 1 and 255
* @throws IllegalArgumentException if degree &lt; 1 or degree > 255
*/
public ReedSolomonGenerator(int degree) {
if (degree < 1 || degree > 255)
throw new IllegalArgumentException("Degree out of range");
// Start with the monomial x^0
coefficients = new byte[degree];
coefficients[degree - 1] = 1;
// Compute the product polynomial (x - r^0) * (x - r^1) * (x - r^2) * ... * (x - r^{degree-1}),
// drop the highest term, and store the rest of the coefficients in order of descending powers.
// Note that r = 0x02, which is a generator element of this field GF(2^8/0x11D).
int root = 1;
for (int i = 0; i < degree; i++) {
// Multiply the current product by (x - r^i)
for (int j = 0; j < coefficients.length; j++) {
coefficients[j] = (byte)multiply(coefficients[j] & 0xFF, root);
if (j + 1 < coefficients.length)
coefficients[j] ^= coefficients[j + 1];
}
root = multiply(root, 0x02);
}
}
/*-- Method --*/
/**
* Computes and returns the Reed-Solomon error correction codewords for the specified sequence of data codewords.
* The returned object is always a new byte array. This method does not alter this object's state (because it is immutable).
* @param data the sequence of data codewords
* @return the Reed-Solomon error correction codewords
* @throws NullPointerException if the data is {@code null}
*/
public byte[] getRemainder(@NonNull byte[] data) {
// Compute the remainder by performing polynomial division
byte[] result = new byte[coefficients.length];
for (byte b : data) {
int factor = (b ^ result[0]) & 0xFF;
System.arraycopy(result, 1, result, 0, result.length - 1);
result[result.length - 1] = 0;
for (int i = 0; i < result.length; i++)
result[i] ^= multiply(coefficients[i] & 0xFF, factor);
}
return result;
}
/*-- Static function --*/
// Returns the product of the two given field elements modulo GF(2^8/0x11D). The arguments and result
// are unsigned 8-bit integers. This could be implemented as a lookup table of 256*256 entries of uint8.
private static int multiply(int x, int y) {
if (x >>> 8 != 0 || y >>> 8 != 0)
throw new IllegalArgumentException("Byte out of range");
// Russian peasant multiplication
int z = 0;
for (int i = 7; i >= 0; i--) {
z = (z << 1) ^ ((z >>> 7) * 0x11D);
z ^= ((y >>> i) & 1) * x;
}
if (z >>> 8 != 0)
throw new AssertionError();
return z;
}
}
}

280
twidere/src/main/java/io/nayuki/qrcodegen/QrSegment.java
View File

@ -1,280 +0,0 @@
/*
* QR Code generator library (Java)
*
* Copyright (c) Project Nayuki. (MIT License)
* https://www.nayuki.io/page/qr-code-generator-library
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
* - The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
* - The Software is provided "as is", without warranty of any kind, express or
* implied, including but not limited to the warranties of merchantability,
* fitness for a particular purpose and noninfringement. In no event shall the
* authors or copyright holders be liable for any claim, damages or other
* liability, whether in an action of contract, tort or otherwise, arising from,
* out of or in connection with the Software or the use or other dealings in the
* Software.
*/
package io.nayuki.qrcodegen;
import androidx.annotation.NonNull;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;
/**
* Represents a character string to be encoded in a QR Code symbol. Each segment has
* a mode, and a sequence of characters that is already encoded as a sequence of bits.
* Instances of this class are immutable.
* <p>This segment class imposes no length restrictions, but QR Codes have restrictions.
* Even in the most favorable conditions, a QR Code can only hold 7089 characters of data.
* Any segment longer than this is meaningless for the purpose of generating QR Codes.</p>
*/
public final class QrSegment {
/*---- Static factory functions ----*/
/**
* Returns a segment representing the specified binary data encoded in byte mode.
* @param data the binary data
* @return a segment containing the data
* @throws NullPointerException if the array is {@code null}
*/
public static QrSegment makeBytes(@NonNull byte[] data) {
return new QrSegment(Mode.BYTE, data.length, data, data.length * 8);
}
/**
* Returns a segment representing the specified string of decimal digits encoded in numeric mode.
* @param digits a string consisting of digits from 0 to 9
* @return a segment containing the data
* @throws NullPointerException if the string is {@code null}
* @throws IllegalArgumentException if the string contains non-digit characters
*/
public static QrSegment makeNumeric(@NonNull String digits) {
if (!NUMERIC_REGEX.matcher(digits).matches())
throw new IllegalArgumentException("String contains non-numeric characters");
BitBuffer bb = new BitBuffer();
int i;
for (i = 0; i + 3 <= digits.length(); i += 3) // Process groups of 3
bb.appendBits(Integer.parseInt(digits.substring(i, i + 3)), 10);
int rem = digits.length() - i;
if (rem > 0) // 1 or 2 digits remaining
bb.appendBits(Integer.parseInt(digits.substring(i)), rem * 3 + 1);
return new QrSegment(Mode.NUMERIC, digits.length(), bb.getBytes(), bb.bitLength());
}
/**
* Returns a segment representing the specified text string encoded in alphanumeric mode. The characters allowed are:
* 0 to 9, A to Z (uppercase only), space, dollar, percent, asterisk, plus, hyphen, period, slash, colon.
* @param text a string of text, with only certain characters allowed
* @return a segment containing the data
* @throws NullPointerException if the string is {@code null}
* @throws IllegalArgumentException if the string contains non-encodable characters
*/
public static QrSegment makeAlphanumeric(@NonNull String text) {
if (!ALPHANUMERIC_REGEX.matcher(text).matches())
throw new IllegalArgumentException("String contains unencodable characters in alphanumeric mode");
BitBuffer bb = new BitBuffer();
int i;
for (i = 0; i + 2 <= text.length(); i += 2) { // Process groups of 2
int temp = ALPHANUMERIC_CHARSET.indexOf(text.charAt(i)) * 45;
temp += ALPHANUMERIC_CHARSET.indexOf(text.charAt(i + 1));
bb.appendBits(temp, 11);
}
if (i < text.length()) // 1 character remaining
bb.appendBits(ALPHANUMERIC_CHARSET.indexOf(text.charAt(i)), 6);
return new QrSegment(Mode.ALPHANUMERIC, text.length(), bb.getBytes(), bb.bitLength());
}
/**
* Returns a new mutable list of zero or more segments to represent the specified Unicode text string.
* The result may use various segment modes and switch modes to optimize the length of the bit stream.
* @param text the text to be encoded, which can be any Unicode string
* @return a list of segments containing the text
* @throws NullPointerException if the text is {@code null}
*/
public static List<QrSegment> makeSegments(@NonNull String text) {
// Select the most efficient segment encoding automatically
List<QrSegment> result = new ArrayList<>();
if (text.equals(""))
return result;
else if (NUMERIC_REGEX.matcher(text).matches())
result.add(makeNumeric(text));
else if (ALPHANUMERIC_REGEX.matcher(text).matches())
result.add(makeAlphanumeric(text));
else
result.add(makeBytes(text.getBytes(Charset.forName("UTF-8"))));
return result;
}
/**
* Returns a segment representing an Extended Channel Interpretation (ECI) designator with the specified assignment value.
* @param assignVal the ECI assignment number (see the AIM ECI specification)
* @return a segment containing the data
* @throws IllegalArgumentException if the value is outside the range [0, 10<sup>6</sup>)
*/
public static QrSegment makeEci(int assignVal) {
byte[] data;
if (0 <= assignVal && assignVal < (1 << 7))
data = new byte[]{(byte)assignVal};
else if ((1 << 7) <= assignVal && assignVal < (1 << 14))
data = new byte[]{(byte)(0x80 | (assignVal >>> 8)), (byte)assignVal};
else if ((1 << 14) <= assignVal && assignVal < 999999)
data = new byte[]{(byte)(0xC0 | (assignVal >>> 16)), (byte)(assignVal >>> 8), (byte)assignVal};
else
throw new IllegalArgumentException("ECI assignment value out of range");
return new QrSegment(Mode.ECI, 0, data, data.length * 8);
}
/*---- Instance fields ----*/
/** The mode indicator for this segment. Never {@code null}. */
public final Mode mode;
/** The length of this segment's unencoded data, measured in characters. Always zero or positive. */
public final int numChars;
/** The bits of this segment packed into a byte array in big endian. Accessed through {@link #getByte(int)}. Not {@code null}. */
private final byte[] data;
/** The length of this segment's encoded data, measured in bits. Satisfies 0 &le; {@code bitLength} &le; {@code data.length} &times; 8. */
public final int bitLength;
/*---- Constructor ----*/
/**
* Creates a new QR Code data segment with the specified parameters and data.
* @param md the mode, which is not {@code null}
* @param numCh the data length in characters, which is non-negative
* @param bitLen the data length in bits, which is non-negative
* @param b the bits packed into bytes, which is not {@code null}
* @throws NullPointerException if the mode or array is {@code null}
* @throws IllegalArgumentException if the character count or bit length are negative or invalid
*/
public QrSegment(@NonNull Mode md, int numCh, @NonNull byte[] b, int bitLen) {
if (numCh < 0 || bitLen < 0 || bitLen > b.length * 8L)
throw new IllegalArgumentException("Invalid value");
mode = md;
numChars = numCh;
data = Arrays.copyOf(b, (bitLen + 7) / 8); // Trim to precise length and also make defensive copy
bitLength = bitLen;
}
/*---- Method ----*/
/**
* Returns the data byte at the specified index.
* @param index the index to retrieve from, satisfying 0 &le; {@code index} &lt; ceil({@code bitLength} &divide; 8)
* @return the data byte at the specified index
* @throws IndexOutOfBoundsException if the index is out of bounds
*/
public byte getByte(int index) {
if (index < 0 || index > data.length)
throw new IndexOutOfBoundsException();
return data[index];
}
// Package-private helper function.
static int getTotalBits(@NonNull List<QrSegment> segs, int version) {
if (version < 1 || version > 40)
throw new IllegalArgumentException("Version number out of range");
long result = 0;
for (QrSegment seg : segs) {
int ccbits = seg.mode.numCharCountBits(version);
// Fail if segment length value doesn't fit in the length field's bit-width
if (seg.numChars >= (1 << ccbits))
return -1;
result += 4L + ccbits + seg.bitLength;
if (result > Integer.MAX_VALUE)
return -1;
}
return (int)result;
}
/*---- Constants ----*/
/** Can test whether a string is encodable in numeric mode (such as by using {@link #makeNumeric(String)}). */
public static final Pattern NUMERIC_REGEX = Pattern.compile("[0-9]*");
/** Can test whether a string is encodable in alphanumeric mode (such as by using {@link #makeAlphanumeric(String)}). */
public static final Pattern ALPHANUMERIC_REGEX = Pattern.compile("[A-Z0-9 $%*+./:-]*");
/** The set of all legal characters in alphanumeric mode, where each character value maps to the index in the string. */
private static final String ALPHANUMERIC_CHARSET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:";
/*---- Public helper enumeration ----*/
/**
* The mode field of a segment. Immutable. Provides methods to retrieve closely related values.
*/
public enum Mode {
/*-- Constants --*/
NUMERIC (0x1, 10, 12, 14),
ALPHANUMERIC(0x2, 9, 11, 13),
BYTE (0x4, 8, 16, 16),
KANJI (0x8, 8, 10, 12),
ECI (0x7, 0, 0, 0);
/*-- Fields --*/
/** An unsigned 4-bit integer value (range 0 to 15) representing the mode indicator bits for this mode object. */
final int modeBits;
private final int[] numBitsCharCount;
/*-- Constructor --*/
Mode(int mode, int... ccbits) {
this.modeBits = mode;
numBitsCharCount = ccbits;
}
/*-- Method --*/
/**
* Returns the bit width of the segment character count field for this mode object at the specified version number.
* @param ver the version number, which is between 1 to 40, inclusive
* @return the number of bits for the character count, which is between 8 to 16, inclusive
* @throws IllegalArgumentException if the version number is out of range
*/
int numCharCountBits(int ver) {
if ( 1 <= ver && ver <= 9) return numBitsCharCount[0];
else if (10 <= ver && ver <= 26) return numBitsCharCount[1];
else if (27 <= ver && ver <= 40) return numBitsCharCount[2];
else throw new IllegalArgumentException("Version number out of range");
}
}
}

5
twidere/src/main/java/io/nayuki/qrcodegen/package-info.java
View File

@ -1,5 +0,0 @@
/**
* This package contains code from https://github.com/nayuki/QR-Code-generator
* And licensed under MIT license
*/
package io.nayuki.qrcodegen;

13
twidere/src/main/java/org/mariotaku/twidere/fragment/FileSelectorDialogFragment.java
View File

@ -1,18 +1,18 @@
/*
* Twidere - Twitter client for Android
*
*
* Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
*
*
* 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.
*
*
* This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
*/
@ -30,6 +30,7 @@ import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import androidx.loader.app.LoaderManager;
import androidx.loader.app.LoaderManager.LoaderCallbacks;
import androidx.loader.content.FixedAsyncTaskLoader;
import androidx.loader.content.Loader;
@ -73,7 +74,7 @@ public class FileSelectorDialogFragment extends BaseDialogFragment implements Lo
public void onActivityCreated(final Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
final Bundle args = getArguments();
getLoaderManager().initLoader(0, args, this);
LoaderManager.getInstance(this).initLoader(0, args, this);
}
@Override
@ -155,7 +156,7 @@ public class FileSelectorDialogFragment extends BaseDialogFragment implements Lo
if (file.isDirectory()) {
final Bundle args = getArguments();
args.putString(EXTRA_PATH, file.getAbsolutePath());
getLoaderManager().restartLoader(0, args, this);
LoaderManager.getInstance(this).restartLoader(0, args, this);
} else if (file.isFile() && !isPickDirectory()) {
final FragmentActivity a = getActivity();
if (a instanceof Callback) {

2
twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java
View File

@ -67,7 +67,7 @@ public class KeyboardShortcutsFragment extends BasePreferenceFragment implements
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.reset) {
final DialogFragment f = new ResetKeyboardShortcutConfirmDialogFragment();
f.show(getFragmentManager(), "reset_keyboard_shortcut_confirm");
f.show(getParentFragmentManager(), "reset_keyboard_shortcut_confirm");
return true;
}
return super.onOptionsItemSelected(item);

2
twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java
View File

@ -56,7 +56,7 @@ abstract class MultiSelectListPreference extends DialogPreference implements IDi
public void displayDialog(@NonNull PreferenceFragmentCompat fragment) {
final MultiSelectListDialogFragment df = MultiSelectListDialogFragment.newInstance(getKey());
df.setTargetFragment(fragment, 0);
df.show(fragment.getFragmentManager(), getKey());
df.show(fragment.getParentFragmentManager(), getKey());
}
protected abstract boolean[] getDefaults();

2
twidere/src/main/java/org/mariotaku/twidere/preference/NotificationTypePreference.java
View File

@ -98,7 +98,7 @@ public class NotificationTypePreference extends DialogPreference implements
public void displayDialog(@NonNull PreferenceFragmentCompat fragment) {
final NotificationTypeDialogFragment df = NotificationTypeDialogFragment.newInstance(getKey());
df.setTargetFragment(fragment, 0);
df.show(fragment.getFragmentManager(), getKey());
df.show(fragment.getParentFragmentManager(), getKey());
}
public int getDefaultValue() {

2
twidere/src/main/java/org/mariotaku/twidere/preference/SeekBarDialogPreference.java
View File

@ -188,7 +188,7 @@ public class SeekBarDialogPreference extends DialogPreference implements IDialog
public void displayDialog(@NonNull PreferenceFragmentCompat fragment) {
SeekBarDialogPreferenceFragment df = SeekBarDialogPreferenceFragment.newInstance(getKey());
df.setTargetFragment(fragment, 0);
df.show(fragment.getFragmentManager(), getKey());
df.show(fragment.getParentFragmentManager(), getKey());
}
public static class SeekBarDialogPreferenceFragment extends ThemedPreferenceDialogFragmentCompat {

2
twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java
View File

@ -52,7 +52,7 @@ public class SettingsImportExportPreference extends DialogPreference implements
public void displayDialog(@NonNull PreferenceFragmentCompat fragment) {
ImportExportDialogFragment df = ImportExportDialogFragment.newInstance(getKey());
df.setTargetFragment(fragment, 0);
df.show(fragment.getFragmentManager(), getKey());
df.show(fragment.getParentFragmentManager(), getKey());
}
public static class ImportExportDialogFragment extends PreferenceDialogFragmentCompat {

2
twidere/src/main/java/org/mariotaku/twidere/preference/ThemeBackgroundPreference.java
View File

@ -98,7 +98,7 @@ public class ThemeBackgroundPreference extends DialogPreference implements Const
public void displayDialog(@NonNull PreferenceFragmentCompat fragment) {
InternalDialogFragment df = InternalDialogFragment.newInstance(getKey());
df.setTargetFragment(fragment, 0);
df.show(fragment.getFragmentManager(), getKey());
df.show(fragment.getParentFragmentManager(), getKey());
}
private void saveValue() {

6
twidere/src/main/java/org/mariotaku/twidere/util/TwidereLinkify.java
View File

@ -26,9 +26,9 @@ import android.text.Spannable;
import android.text.Spanned;
import android.text.style.URLSpan;
import com.twitter.Extractor;
import com.twitter.Extractor.Entity;
import com.twitter.Regex;
import com.twitter.twittertext.Extractor;
import com.twitter.twittertext.Extractor.Entity;
import com.twitter.twittertext.Regex;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.model.UserKey;

63
twidere/src/main/java/org/mariotaku/twidere/util/content/SupportFragmentReloadCursorObserver.java
View File

@ -1,63 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* 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.
*
* This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.util.content;
import android.database.ContentObserver;
import android.database.Cursor;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.loader.app.LoaderManager.LoaderCallbacks;
import org.mariotaku.twidere.TwidereConstants;
public class SupportFragmentReloadCursorObserver extends ContentObserver implements TwidereConstants {
private final Fragment mFragment;
private final int mLoaderId;
private final LoaderCallbacks<Cursor> mCallback;
public SupportFragmentReloadCursorObserver(final Fragment fragment, final int loaderId,
final LoaderCallbacks<Cursor> callback) {
super(createHandler());
mFragment = fragment;
mLoaderId = loaderId;
mCallback = callback;
}
private static Handler createHandler() {
if (Thread.currentThread().getId() != 1) return new Handler(Looper.getMainLooper());
return new Handler();
}
@Override
public final void onChange(final boolean selfChange) {
onChange(selfChange, null);
}
@Override
public void onChange(final boolean selfChange, @Nullable final Uri uri) {
if (mFragment == null || mFragment.getActivity() == null || mFragment.isDetached()) return;
// Handle change.
mFragment.getLoaderManager().restartLoader(mLoaderId, null, mCallback);
}
}

2
twidere/src/main/java/org/mariotaku/twidere/util/support/ActivitySupport.java
View File

@ -45,7 +45,7 @@ public class ActivitySupport {
}
private static TaskDescription toNativeTaskDescription(TaskDescriptionCompat taskDescription) {
return new TaskDescription(taskDescription.getLabel(), taskDescription.getIcon(), taskDescription.getPrimaryColor());
return new TaskDescription(taskDescription.getLabel(), taskDescription.getPrimaryColor());
}
}

2
twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
View File

@ -56,7 +56,7 @@ import android.view.animation.DecelerateInterpolator
import android.widget.ImageView
import android.widget.Toast
import com.bumptech.glide.Glide
import com.twitter.Extractor
import com.twitter.twittertext.Extractor
import kotlinx.android.synthetic.main.activity_compose.*
import nl.komponents.kovenant.task
import org.mariotaku.abstask.library.AbstractTask

7
twidere/src/main/kotlin/org/mariotaku/twidere/activity/QuickSearchBarActivity.kt
View File

@ -28,6 +28,7 @@ import android.database.Cursor
import android.graphics.PorterDuff.Mode
import android.net.Uri
import android.os.Bundle
import androidx.loader.app.LoaderManager
import androidx.loader.app.LoaderManager.LoaderCallbacks
import androidx.loader.content.CursorLoader
import androidx.loader.content.Loader
@ -157,7 +158,7 @@ class QuickSearchBarActivity : BaseActivity(), OnClickListener, LoaderCallbacks<
searchQuery.setSelection(searchQuery.length())
}
supportLoaderManager.initLoader(0, null, this)
LoaderManager.getInstance(this).initLoader(0, null, this)
updateSubmitButton()
promotionService.loadBanner(adContainer)
@ -179,7 +180,7 @@ class QuickSearchBarActivity : BaseActivity(), OnClickListener, LoaderCallbacks<
adapter.addRemovedPositions(reverseSortedPositions)
ContentResolverUtils.bulkDelete(contentResolver, SearchHistory.CONTENT_URI, SearchHistory._ID,
false, ids, null, null)
supportLoaderManager.restartLoader(0, null, this)
LoaderManager.getInstance(this).restartLoader(0, null, this)
}
override fun onClick(v: View) {
@ -298,7 +299,7 @@ class QuickSearchBarActivity : BaseActivity(), OnClickListener, LoaderCallbacks<
}
override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
supportLoaderManager.restartLoader(0, null, this)
LoaderManager.getInstance(this).restartLoader(0, null, this)
}
override fun onNothingSelected(parent: AdapterView<*>) {

8
twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt
View File

@ -583,9 +583,9 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher,
val builder = AlertDialog.Builder(requireContext())
builder.setView(R.layout.dialog_expandable_list)
val dialog = builder.create()
dialog.onShow {
it.applyTheme()
val listView = it.expandableList
dialog.onShow { alertDialog ->
alertDialog.applyTheme()
val listView = alertDialog.expandableList
val adapter = LoginTypeAdapter(requireContext())
listView.setAdapter(adapter)
listView.setOnGroupClickListener { _, _, groupPosition, _ ->
@ -613,7 +613,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher,
return@setOnChildClickListener true
}
loaderManager.initLoader(0, null, this)
LoaderManager.getInstance(this).initLoader(0, null, this)
}
return dialog
}

18
twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt
View File

@ -275,6 +275,24 @@ class TrendsLocationSelectorActivity : BaseActivity() {
dest.writeTypedArray(children, flags)
}
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as LocationsData
if (root != other.root) return false
if (!children.contentEquals(other.children)) return false
return true
}
override fun hashCode(): Int {
var result = root.hashCode()
result = 31 * result + children.contentHashCode()
return result
}
companion object {
@JvmField
val CREATOR = object : Parcelable.Creator<LocationsData> {

6
twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt
View File

@ -55,7 +55,7 @@ class UserListSelectorActivity : BaseActivity(),
override var refreshing: Boolean
get() {
return supportLoaderManager.hasRunningLoadersSafe()
return LoaderManager.getInstance(this).hasRunningLoadersSafe()
}
set(value) {
}
@ -199,9 +199,9 @@ class UserListSelectorActivity : BaseActivity(),
}
if (!loaderInitialized) {
loaderInitialized = true
supportLoaderManager.initLoader(0, args, this)
LoaderManager.getInstance(this).initLoader(0, args, this)
} else {
supportLoaderManager.restartLoader(0, args, this)
LoaderManager.getInstance(this).restartLoader(0, args, this)
}
}

4
twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserSelectorActivity.kt
View File

@ -153,10 +153,10 @@ class UserSelectorActivity : BaseActivity(), OnItemClickListener, LoaderManager.
this[EXTRA_FROM_CACHE] = fromCache
}
if (loaderInitialized) {
supportLoaderManager.initLoader(0, args, this)
LoaderManager.getInstance(this).initLoader(0, args, this)
loaderInitialized = true
} else {
supportLoaderManager.restartLoader(0, args, this)
LoaderManager.getInstance(this).restartLoader(0, args, this)
}
}

4
twidere/src/main/kotlin/org/mariotaku/twidere/activity/WebLinkHandlerActivity.kt
View File

@ -177,7 +177,7 @@ class WebLinkHandlerActivity : Activity() {
if (pathSegments[0] in TWITTER_RESERVED_PATHS) {
return Pair(null, true)
}
return handleUserSpecificPageIntent(uri, pathSegments, pathSegments[0])
return handleUserSpecificPageIntent(pathSegments, pathSegments[0])
}
}
}
@ -185,7 +185,7 @@ class WebLinkHandlerActivity : Activity() {
return Pair(homeIntent, true)
}
private fun handleUserSpecificPageIntent(uri: Uri, pathSegments: List<String>, screenName: String): Pair<Intent?, Boolean> {
private fun handleUserSpecificPageIntent(pathSegments: List<String>, screenName: String): Pair<Intent?, Boolean> {
val segsSize = pathSegments.size
if (segsSize == 1) {
val builder = Uri.Builder()

2
twidere/src/main/kotlin/org/mariotaku/twidere/adapter/DummyItemAdapter.kt
View File

@ -104,7 +104,7 @@ class DummyItemAdapter(
override fun getAccountKey(position: Int, raw: Boolean) = UserKey.INVALID
override fun findStatusById(accountKey: UserKey, statusId: String) = null
override fun findStatusById(accountKey: UserKey, statusId: String): Nothing? = null
override fun isCardNumbersShown(position: Int): Boolean {
if (position == RecyclerView.NO_POSITION) return showCardNumbers

4
twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt
View File

@ -27,6 +27,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.bumptech.glide.RequestManager
import org.apache.commons.lang3.time.DateUtils
import org.mariotaku.chameleon.Chameleon
import org.mariotaku.chameleon.ChameleonUtils
import org.mariotaku.kpreferences.get
@ -39,7 +40,6 @@ import org.mariotaku.twidere.constant.linkHighlightOptionKey
import org.mariotaku.twidere.constant.mediaPreviewStyleKey
import org.mariotaku.twidere.constant.nameFirstKey
import org.mariotaku.twidere.exception.UnsupportedCountIndexException
import org.mariotaku.twidere.extension.isSameDay
import org.mariotaku.twidere.extension.model.timestamp
import org.mariotaku.twidere.model.*
import org.mariotaku.twidere.model.ParcelableMessage.MessageType
@ -137,7 +137,7 @@ class MessagesConversationAdapter(
+ itemCounts[ITEM_START_MESSAGE] - 1) {
calendars.first.timeInMillis = getMessageTimestamp(position + 1)
calendars.second.timeInMillis = message.timestamp
showDate = !calendars.first.isSameDay(calendars.second)
showDate = !DateUtils.isSameDay(calendars.first, calendars.second)
}
(holder as AbsMessageViewHolder).display(message, showDate)
}

2
twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.kt
View File

@ -22,7 +22,7 @@ package org.mariotaku.twidere.adapter
import android.annotation.SuppressLint
import android.content.Context
import android.database.CursorIndexOutOfBoundsException
import androidx.legacy.widget.Space
import android.widget.Space
import androidx.recyclerview.widget.RecyclerView
import android.view.LayoutInflater
import android.view.View

2
twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.kt
View File

@ -24,7 +24,7 @@ import android.database.CursorIndexOutOfBoundsException
import android.util.SparseBooleanArray
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.legacy.widget.Space
import android.widget.Space
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.RequestManager
import org.mariotaku.kpreferences.get

4
twidere/src/main/kotlin/org/mariotaku/twidere/alias/TwitterAliases.kt
View File

@ -19,4 +19,6 @@
package org.mariotaku.twidere.alias
typealias TwitterRegex = com.twitter.Regex
import com.twitter.twittertext.Regex
typealias TwitterRegex = Regex

12
twidere/src/main/kotlin/org/mariotaku/twidere/app/TwidereApplication.kt
View File

@ -1,18 +1,18 @@
/*
* Twidere - Twitter client for Android
*
*
* Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
*
*
* 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.
*
*
* This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
*/
@ -36,6 +36,7 @@ import androidx.multidex.MultiDex
import com.bumptech.glide.Glide
import nl.komponents.kovenant.task
import okhttp3.Dns
import org.apache.commons.lang3.concurrent.ConcurrentUtils
import org.mariotaku.abstask.library.TaskStarter
import org.mariotaku.commons.logansquare.LoganSquareMapperFinder
import org.mariotaku.kpreferences.KPreferences
@ -59,7 +60,6 @@ import org.mariotaku.twidere.extension.setLocale
import org.mariotaku.twidere.model.DefaultFeatures
import org.mariotaku.twidere.receiver.ConnectivityStateReceiver
import org.mariotaku.twidere.util.*
import org.mariotaku.twidere.util.concurrent.ConstantFuture
import org.mariotaku.twidere.util.content.TwidereSQLiteOpenHelper
import org.mariotaku.twidere.util.dagger.ApplicationModule
import org.mariotaku.twidere.util.dagger.GeneralComponent
@ -320,7 +320,7 @@ class TwidereApplication : Application(), OnSharedPreferenceChangeListener {
LoganSquareMapperFinder.setDefaultExecutor(object : LoganSquareMapperFinder.FutureExecutor {
override fun <T> submit(callable: Callable<T>): Future<T> {
if (Looper.getMainLooper().isCurrentThreadCompat) {
return ConstantFuture(callable.call())
return ConcurrentUtils.constantFuture(callable.call())
}
return executor.submit(callable)
}

31
twidere/src/main/kotlin/org/mariotaku/twidere/extension/CalendarExtensions.kt
View File

@ -1,31 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2017 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* 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.
*
* This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.extension
import java.util.*
/**
* Created by mariotaku on 2017/9/25.
*/
fun Calendar.isSameDay(that: Calendar): Boolean {
return this[Calendar.ERA] == that[Calendar.ERA] &&
this[Calendar.YEAR] == that[Calendar.YEAR] &&
this[Calendar.DAY_OF_YEAR] == that[Calendar.DAY_OF_YEAR]
}

4
twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/StatusExtensions.kt
View File

@ -21,6 +21,7 @@ package org.mariotaku.twidere.extension.model.api
import android.text.Spanned
import android.text.style.URLSpan
import org.apache.commons.text.translate.EntityArrays
import org.apache.commons.text.translate.LookupTranslator
import org.mariotaku.commons.text.CodePointArray
import org.mariotaku.ktextension.isNotNullOrEmpty
@ -40,7 +41,6 @@ import org.mariotaku.twidere.model.util.ParcelableLocationUtils
import org.mariotaku.twidere.model.util.ParcelableMediaUtils
import org.mariotaku.twidere.text.AcctMentionSpan
import org.mariotaku.twidere.text.HashtagSpan
import org.mariotaku.twidere.util.EntityArrays
import org.mariotaku.twidere.util.HtmlBuilder
import org.mariotaku.twidere.util.HtmlSpanBuilder
import org.mariotaku.twidere.util.InternalTwitterContentUtils
@ -421,4 +421,4 @@ class StatusTextWithIndices {
var text: String? = null
var spans: Array<SpanItem>? = null
var range: IntArray? = null
}
}

16
twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/ActivityExtensions.kt
View File

@ -71,26 +71,26 @@ fun Activity.toParcelable(accountKey: UserKey, accountType: String, isGap: Boole
it.toParcelable(accountKey, accountType, profileImageSize = profileImageSize)
}
result.targets = ParcelableActivity.RelatedObject().also {
it.statuses = targetStatuses?.mapToArray {
result.targets = ParcelableActivity.RelatedObject().also { relatedObject ->
relatedObject.statuses = targetStatuses?.mapToArray {
it.toParcelable(accountKey, accountType, profileImageSize)
}
it.users = targetUsers?.mapToArray {
relatedObject.users = targetUsers?.mapToArray {
it.toParcelable(accountKey, accountType, profileImageSize = profileImageSize)
}
it.user_lists = targetUserLists?.mapToArray {
relatedObject.user_lists = targetUserLists?.mapToArray {
it.toParcelable(accountKey, profileImageSize = profileImageSize)
}
}
result.target_objects = ParcelableActivity.RelatedObject().also {
it.statuses = targetObjectStatuses?.mapToArray {
result.target_objects = ParcelableActivity.RelatedObject().also { relatedObject ->
relatedObject.statuses = targetObjectStatuses?.mapToArray {
it.toParcelable(accountKey, accountType, profileImageSize)
}
it.users = targetObjectUsers?.mapToArray {
relatedObject.users = targetObjectUsers?.mapToArray {
it.toParcelable(accountKey, accountType, profileImageSize = profileImageSize)
}
it.user_lists = targetObjectUserLists?.mapToArray {
relatedObject.user_lists = targetObjectUserLists?.mapToArray {
it.toParcelable(accountKey, profileImageSize = profileImageSize)
}
}

2
twidere/src/main/kotlin/org/mariotaku/twidere/extension/text/twitter/ExtractorExtensions.kt
View File

@ -19,7 +19,7 @@
package org.mariotaku.twidere.extension.text.twitter
import com.twitter.Extractor
import com.twitter.twittertext.Extractor
import org.mariotaku.twidere.extension.model.replyMentions
import org.mariotaku.twidere.model.ParcelableStatus
import org.mariotaku.twidere.model.ParcelableUserMention

4
twidere/src/main/kotlin/org/mariotaku/twidere/extension/text/twitter/ValidatorExtensions.kt
View File

@ -19,8 +19,8 @@
package org.mariotaku.twidere.extension.text.twitter
import com.twitter.Extractor
import com.twitter.Validator
import com.twitter.twittertext.Extractor
import com.twitter.twittertext.Validator
import org.mariotaku.twidere.model.ParcelableStatus
import org.mariotaku.twidere.model.UserKey

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt
View File

@ -152,7 +152,7 @@ class APIEditorDialogFragment : BaseDialogFragment() {
adapter = CustomAPIConfigArrayAdapter(requireContext())
val builder = AlertDialog.Builder(requireContext())
builder.setAdapter(adapter, this)
loaderManager.initLoader(0, null, this)
LoaderManager.getInstance(this).initLoader(0, null, this)
val dialog = builder.create()
dialog.onShow { it.applyTheme() }
return dialog

5
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt
View File

@ -33,6 +33,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView.OnScrollListener
import android.view.*
import androidx.loader.app.LoaderManager
import com.squareup.otto.Subscribe
import kotlinx.android.synthetic.main.fragment_content_recyclerview.*
import org.mariotaku.kpreferences.get
@ -110,7 +111,7 @@ abstract class AbsActivitiesFragment protected constructor() :
val loaderArgs = Bundle(arguments)
loaderArgs.putBoolean(EXTRA_FROM_USER, true)
loaderManager.initLoader(loaderId, loaderArgs, this)
LoaderManager.getInstance(this).initLoader(loaderId, loaderArgs, this)
showProgress()
}
@ -531,7 +532,7 @@ abstract class AbsActivitiesFragment protected constructor() :
return true
}
else -> activity?.let {
fragmentManager?.let { fragmentManager ->
parentFragmentManager.let { fragmentManager ->
MenuUtils.handleStatusClick(it, this, fragmentManager,
preferences, userColorNameManager, twitterWrapper, status, item)
}

5
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsMediaStatusesFragment.kt
View File

@ -21,6 +21,7 @@ package org.mariotaku.twidere.fragment
import android.content.Context
import android.os.Bundle
import androidx.loader.app.LoaderManager
import androidx.loader.app.LoaderManager.LoaderCallbacks
import androidx.loader.app.hasRunningLoadersSafe
import androidx.loader.content.Loader
@ -49,7 +50,7 @@ abstract class AbsMediaStatusesFragment : AbsContentRecyclerViewFragment<Stagger
final override var refreshing: Boolean
get() {
if (context == null || isDetached) return false
return loaderManager.hasRunningLoadersSafe()
return LoaderManager.getInstance(this).hasRunningLoadersSafe()
}
set(value) {
super.refreshing = value
@ -69,7 +70,7 @@ abstract class AbsMediaStatusesFragment : AbsContentRecyclerViewFragment<Stagger
adapter.statusClickListener = this
val loaderArgs = Bundle(arguments)
loaderArgs.putBoolean(EXTRA_FROM_USER, true)
loaderManager.initLoader(loaderId, loaderArgs, this)
LoaderManager.getInstance(this).initLoader(loaderId, loaderArgs, this)
showProgress()
}

5
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt
View File

@ -35,6 +35,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView.OnScrollListener
import android.view.*
import androidx.loader.app.LoaderManager
import com.squareup.otto.Subscribe
import kotlinx.android.synthetic.main.fragment_content_recyclerview.*
import org.mariotaku.kpreferences.get
@ -490,7 +491,7 @@ abstract class AbsStatusesFragment : AbsContentListRecyclerViewFragment<Parcelab
if (isDetached || host == null || loaderInitialized) return
val loaderArgs = Bundle(arguments)
loaderArgs.putBoolean(EXTRA_FROM_USER, true)
loaderManager.initLoader(loaderId, loaderArgs, this)
LoaderManager.getInstance(this).initLoader(loaderId, loaderArgs, this)
loaderInitialized = true
}
@ -575,7 +576,7 @@ abstract class AbsStatusesFragment : AbsContentListRecyclerViewFragment<Parcelab
resolver?.update(contentUri, values, where, null)
return true
}
else -> return MenuUtils.handleStatusClick(requireActivity(), this, requireFragmentManager(),
else -> return MenuUtils.handleStatusClick(requireActivity(), this, parentFragmentManager,
preferences, userColorNameManager, twitterWrapper, status, item)
}
}

25
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt
View File

@ -46,6 +46,7 @@ import androidx.appcompat.view.SupportMenuInflater
import androidx.appcompat.widget.ActionMenuView.OnMenuItemClickListener
import androidx.core.content.ContextCompat
import androidx.core.view.MenuItemCompat
import androidx.loader.app.LoaderManager
import androidx.loader.app.LoaderManager.LoaderCallbacks
import androidx.loader.content.FixedAsyncTaskLoader
import androidx.loader.content.Loader
@ -286,9 +287,9 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks<AccountsInfo>,
fun loadAccounts() {
if (!loaderInitialized) {
loaderInitialized = true
loaderManager.initLoader(0, null, this)
LoaderManager.getInstance(this).initLoader(0, null, this)
} else {
loaderManager.restartLoader(0, null, this)
LoaderManager.getInstance(this).restartLoader(0, null, this)
}
}
@ -659,7 +660,25 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks<AccountsInfo>,
data class AccountsInfo(
val accounts: Array<AccountDetails>,
val draftsCount: Int
)
) {
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as AccountsInfo
if (!accounts.contentEquals(other.accounts)) return false
if (draftsCount != other.draftsCount) return false
return true
}
override fun hashCode(): Int {
var result = accounts.contentHashCode()
result = 31 * result + draftsCount
return result
}
}
class AccountsInfoLoader(
context: Context,

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt
View File

@ -86,7 +86,7 @@ class AccountsManagerFragment : BaseFragment(), LoaderManager.LoaderCallbacks<Li
emptyIcon.setImageResource(R.drawable.ic_info_error_generic)
setListShown(false)
loaderManager.initLoader(0, null, this)
LoaderManager.getInstance(this).initLoader(0, null, this)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AddStatusFilterDialogFragment.kt
View File

@ -24,7 +24,7 @@ import android.content.ContentValues
import android.os.Bundle
import androidx.fragment.app.FragmentManager
import androidx.appcompat.app.AlertDialog
import com.twitter.Extractor
import com.twitter.twittertext.Extractor
import org.mariotaku.kpreferences.get
import org.mariotaku.twidere.R
import org.mariotaku.twidere.constant.IntentConstants.EXTRA_STATUS

5
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorActivitiesFragment.kt
View File

@ -29,6 +29,7 @@ import android.os.Bundle
import android.os.Handler
import androidx.loader.content.Loader
import android.widget.Toast
import androidx.loader.app.LoaderManager
import com.squareup.otto.Subscribe
import org.mariotaku.ktextension.*
import org.mariotaku.library.objectcursor.ObjectCursor
@ -174,7 +175,7 @@ abstract class CursorActivitiesFragment : AbsActivitiesFragment() {
}
override val shouldAbort: Boolean
get() = currentContext == null
get() = false
})
}
@ -237,7 +238,7 @@ abstract class CursorActivitiesFragment : AbsActivitiesFragment() {
args.putAll(fragmentArgs)
args.putBoolean(EXTRA_FROM_USER, true)
}
loaderManager.restartLoader(loaderId, args, this)
LoaderManager.getInstance(this).restartLoader(loaderId, args, this)
}
fun replaceStatusStates(result: ParcelableStatus?) {

3
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt
View File

@ -28,6 +28,7 @@ import android.os.Bundle
import android.os.Handler
import androidx.loader.content.Loader
import android.widget.Toast
import androidx.loader.app.LoaderManager
import com.bumptech.glide.RequestManager
import com.squareup.otto.Subscribe
import kotlinx.android.synthetic.main.fragment_content_recyclerview.*
@ -236,7 +237,7 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() {
args.putAll(fragmentArgs)
args.putBoolean(EXTRA_FROM_USER, true)
}
loaderManager.restartLoader(loaderId, args, this)
LoaderManager.getInstance(this).restartLoader(loaderId, args, this)
}
private fun showContentOrError() {

5
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CustomTabsFragment.kt
View File

@ -39,6 +39,7 @@ import android.view.*
import android.widget.*
import android.widget.AbsListView.MultiChoiceModeListener
import android.widget.AdapterView.OnItemClickListener
import androidx.loader.app.LoaderManager
import com.mobeta.android.dslv.SimpleDragSortCursorAdapter
import kotlinx.android.synthetic.main.dialog_custom_tab_editor.*
import kotlinx.android.synthetic.main.layout_draggable_list_with_empty_view.*
@ -102,7 +103,7 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks<Cursor?>, MultiChoice
df.arguments = Bundle {
this[EXTRA_OBJECT] = tab
}
fragmentManager?.let { df.show(it, TabEditorDialogFragment.TAG_EDIT_TAB) }
parentFragmentManager.let { df.show(it, TabEditorDialogFragment.TAG_EDIT_TAB) }
}
listView.adapter = adapter
listView.emptyView = emptyView
@ -115,7 +116,7 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks<Cursor?>, MultiChoice
}
emptyText.setText(R.string.no_tab)
emptyIcon.setImageResource(R.drawable.ic_info_tab)
loaderManager.initLoader(0, null, this)
LoaderManager.getInstance(this).initLoader(0, null, this)
setListShown(false)
}

12
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditUserListDialogFragment.kt
View File

@ -46,13 +46,13 @@ class EditUserListDialogFragment : BaseDialogFragment() {
builder.positive(android.R.string.ok, this::onPositiveClick)
builder.setNegativeButton(android.R.string.cancel, null)
val dialog = builder.create()
dialog.onShow { dialog ->
dialog.applyTheme()
dialog.editName.addValidator(UserListNameValidator(getString(R.string.invalid_list_name)))
dialog.onShow { alertDialog ->
alertDialog.applyTheme()
alertDialog.editName.addValidator(UserListNameValidator(getString(R.string.invalid_list_name)))
if (savedInstanceState == null) {
dialog.editName.setText(arguments?.getString(EXTRA_LIST_NAME))
dialog.editDescription.setText(arguments?.getString(EXTRA_DESCRIPTION))
dialog.isPublic.isChecked = arguments?.getBoolean(EXTRA_IS_PUBLIC, true) ?: true
alertDialog.editName.setText(arguments?.getString(EXTRA_LIST_NAME))
alertDialog.editDescription.setText(arguments?.getString(EXTRA_DESCRIPTION))
alertDialog.isPublic.isChecked = arguments?.getBoolean(EXTRA_IS_PUBLIC, true) ?: true
}
}
return dialog

3
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtensionsListFragment.kt
View File

@ -33,6 +33,7 @@ import android.view.MenuItem
import android.view.View
import android.widget.AdapterView
import android.widget.AdapterView.AdapterContextMenuInfo
import androidx.loader.app.LoaderManager
import com.bumptech.glide.RequestManager
import kotlinx.android.synthetic.main.fragment_content_listview.*
import org.mariotaku.ktextension.isNullOrEmpty
@ -52,7 +53,7 @@ class ExtensionsListFragment : AbsContentListViewFragment<ExtensionsAdapter>(),
listView.onItemClickListener = this
loaderManager.initLoader(0, null, this)
LoaderManager.getInstance(this).initLoader(0, null, this)
showProgress()
}

5
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/GroupFragment.kt
View File

@ -5,6 +5,7 @@ import android.nfc.NdefMessage
import android.nfc.NdefRecord
import android.nfc.NfcAdapter
import android.os.Bundle
import androidx.loader.app.LoaderManager
import androidx.loader.app.LoaderManager.LoaderCallbacks
import androidx.loader.content.FixedAsyncTaskLoader
import androidx.loader.content.Loader
@ -69,7 +70,7 @@ class GroupFragment : AbsToolbarTabPagesFragment(), LoaderCallbacks<SingleRespon
fun displayGroup(group: ParcelableGroup?) {
val activity = activity ?: return
loaderManager.destroyLoader(0)
LoaderManager.getInstance(this).destroyLoader(0)
this.group = group
if (group != null) {
@ -82,7 +83,7 @@ class GroupFragment : AbsToolbarTabPagesFragment(), LoaderCallbacks<SingleRespon
fun getGroupInfo(omitIntentExtra: Boolean) {
val lm = loaderManager
val lm = LoaderManager.getInstance(this)
lm.destroyLoader(0)
val args = Bundle(arguments)
args.putBoolean(EXTRA_OMIT_INTENT_EXTRA, omitIntentExtra)

4
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/HostMappingsListFragment.kt
View File

@ -116,14 +116,14 @@ class HostMappingsListFragment : AbsContentListViewFragment<HostMappingsListFrag
args.putBoolean(EXTRA_EDIT_MODE, true)
val df = AddMappingDialogFragment()
df.arguments = args
fragmentManager?.let { df.show(it, "add_mapping") }
parentFragmentManager.let { df.show(it, "add_mapping") }
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
R.id.add -> {
val df = AddMappingDialogFragment()
fragmentManager?.let { df.show(it, "add_mapping") }
parentFragmentManager.let { df.show(it, "add_mapping") }
}
}
return super.onOptionsItemSelected(item)

5
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ItemsListFragment.kt
View File

@ -11,6 +11,7 @@ import android.view.ContextMenu
import android.view.MenuInflater
import android.view.MenuItem
import android.view.View
import androidx.loader.app.LoaderManager
import com.bumptech.glide.RequestManager
import kotlinx.android.synthetic.main.fragment_content_recyclerview.*
import org.mariotaku.kpreferences.get
@ -46,7 +47,7 @@ open class ItemsListFragment : AbsContentListRecyclerViewFragment<VariousItemsAd
override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
registerForContextMenu(recyclerView)
loaderManager.initLoader(0, null, this)
LoaderManager.getInstance(this).initLoader(0, null, this)
refreshEnabled = false
showProgress()
}
@ -175,7 +176,7 @@ open class ItemsListFragment : AbsContentListRecyclerViewFragment<VariousItemsAd
startActivity(chooser)
return true
}
return MenuUtils.handleStatusClick(requireActivity(), this, requireFragmentManager(),
return MenuUtils.handleStatusClick(requireActivity(), this, parentFragmentManager,
preferences, userColorNameManager, twitterWrapper, status, item)
}
}

7
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableGroupsFragment.kt
View File

@ -24,6 +24,7 @@ import android.os.Bundle
import androidx.loader.app.LoaderManager.LoaderCallbacks
import androidx.loader.content.Loader
import android.view.KeyEvent
import androidx.loader.app.LoaderManager
import androidx.loader.app.hasRunningLoadersSafe
import com.bumptech.glide.RequestManager
import kotlinx.android.synthetic.main.fragment_content_recyclerview.*
@ -57,7 +58,7 @@ abstract class ParcelableGroupsFragment : AbsContentListRecyclerViewFragment<Par
override var refreshing: Boolean
get() {
if (context == null || isDetached) return false
return loaderManager.hasRunningLoadersSafe()
return LoaderManager.getInstance(this).hasRunningLoadersSafe()
}
set(value) {
super.refreshing = value
@ -101,7 +102,7 @@ abstract class ParcelableGroupsFragment : AbsContentListRecyclerViewFragment<Par
val loaderArgs = Bundle(arguments)
loaderArgs.putBoolean(EXTRA_FROM_USER, true)
loaderArgs.putParcelable(EXTRA_PAGINATION, nextPagination)
loaderManager.restartLoader(0, loaderArgs, this)
LoaderManager.getInstance(this).restartLoader(0, loaderArgs, this)
}
override fun handleKeyboardShortcutSingle(handler: KeyboardShortcutsHandler, keyCode: Int, event: KeyEvent, metaState: Int): Boolean {
@ -125,7 +126,7 @@ abstract class ParcelableGroupsFragment : AbsContentListRecyclerViewFragment<Par
this)
val loaderArgs = Bundle(arguments)
loaderArgs.putBoolean(EXTRA_FROM_USER, true)
loaderManager.initLoader(0, loaderArgs, this)
LoaderManager.getInstance(this).initLoader(0, loaderArgs, this)
}
override fun onCreateLoader(id: Int, args: Bundle?): Loader<List<ParcelableGroup>?> {

5
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.kt
View File

@ -24,6 +24,7 @@ import android.os.Bundle
import androidx.loader.app.hasRunningLoadersSafe
import androidx.loader.content.Loader
import android.text.TextUtils
import androidx.loader.app.LoaderManager
import com.bumptech.glide.RequestManager
import com.squareup.otto.Subscribe
import org.mariotaku.twidere.R
@ -57,7 +58,7 @@ abstract class ParcelableStatusesFragment : AbsStatusesFragment() {
override var refreshing: Boolean
get() {
if (context == null || isDetached) return false
return loaderManager.hasRunningLoadersSafe()
return LoaderManager.getInstance(this).hasRunningLoadersSafe()
}
set(value) {
super.refreshing = value
@ -113,7 +114,7 @@ abstract class ParcelableStatusesFragment : AbsStatusesFragment() {
args.putBoolean(EXTRA_LOADING_MORE, param.isLoadingMore)
args.putBoolean(EXTRA_FROM_USER, true)
args.putParcelable(EXTRA_PAGINATION, param.pagination?.getOrNull(0))
loaderManager.restartLoader(loaderId, args, this)
LoaderManager.getInstance(this).restartLoader(loaderId, args, this)
return true
}

9
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt
View File

@ -21,6 +21,7 @@ package org.mariotaku.twidere.fragment
import android.content.Context
import android.os.Bundle
import androidx.loader.app.LoaderManager
import androidx.loader.app.LoaderManager.LoaderCallbacks
import androidx.loader.app.hasRunningLoadersSafe
import androidx.loader.content.Loader
@ -62,7 +63,7 @@ abstract class ParcelableUserListsFragment : AbsContentListRecyclerViewFragment<
override var refreshing: Boolean
get() {
if (context == null || isDetached) return false
return loaderManager.hasRunningLoadersSafe()
return LoaderManager.getInstance(this).hasRunningLoadersSafe()
}
set(value) {
super.refreshing = value
@ -103,7 +104,7 @@ abstract class ParcelableUserListsFragment : AbsContentListRecyclerViewFragment<
val loaderArgs = Bundle(arguments)
loaderArgs.putBoolean(EXTRA_FROM_USER, true)
loaderArgs.putParcelable(EXTRA_PAGINATION, nextPagination)
loaderManager.restartLoader(0, loaderArgs, this)
LoaderManager.getInstance(this).restartLoader(0, loaderArgs, this)
}
override fun handleKeyboardShortcutSingle(handler: KeyboardShortcutsHandler, keyCode: Int,
@ -130,7 +131,7 @@ abstract class ParcelableUserListsFragment : AbsContentListRecyclerViewFragment<
this)
val loaderArgs = Bundle(arguments)
loaderArgs.putBoolean(EXTRA_FROM_USER, true)
loaderManager.initLoader(0, loaderArgs, this)
LoaderManager.getInstance(this).initLoader(0, loaderArgs, this)
}
override fun onCreateLoader(id: Int, args: Bundle?): Loader<List<ParcelableUserList>> {
@ -159,7 +160,7 @@ abstract class ParcelableUserListsFragment : AbsContentListRecyclerViewFragment<
val loaderArgs = Bundle(arguments).apply {
this[EXTRA_FROM_USER] = true
}
loaderManager.restartLoader(0, loaderArgs, this)
LoaderManager.getInstance(this).restartLoader(0, loaderArgs, this)
showProgress()
return true
}

9
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUsersFragment.kt
View File

@ -28,6 +28,7 @@ import androidx.loader.content.Loader
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import android.view.KeyEvent
import androidx.loader.app.LoaderManager
import com.bumptech.glide.RequestManager
import com.squareup.otto.Subscribe
import kotlinx.android.synthetic.main.fragment_content_recyclerview.*
@ -65,7 +66,7 @@ abstract class ParcelableUsersFragment : AbsContentListRecyclerViewFragment<Parc
override var refreshing: Boolean
get() {
if (context == null || isDetached) return false
return loaderManager.hasRunningLoadersSafe()
return LoaderManager.getInstance(this).hasRunningLoadersSafe()
}
set(value) {
super.refreshing = value
@ -102,7 +103,7 @@ abstract class ParcelableUsersFragment : AbsContentListRecyclerViewFragment<Parc
this)
val loaderArgs = Bundle(arguments)
loaderArgs.putBoolean(EXTRA_FROM_USER, true)
loaderManager.initLoader(0, loaderArgs, this)
LoaderManager.getInstance(this).initLoader(0, loaderArgs, this)
}
override fun onStart() {
@ -164,7 +165,7 @@ abstract class ParcelableUsersFragment : AbsContentListRecyclerViewFragment<Parc
val loaderArgs = Bundle(arguments)
loaderArgs.putBoolean(EXTRA_FROM_USER, true)
loaderArgs.putParcelable(EXTRA_PAGINATION, nextPagination)
loaderManager.restartLoader(0, loaderArgs, this)
LoaderManager.getInstance(this).restartLoader(0, loaderArgs, this)
}
override fun onCreateAdapter(context: Context, requestManager: RequestManager): ParcelableUsersAdapter {
@ -212,7 +213,7 @@ abstract class ParcelableUsersFragment : AbsContentListRecyclerViewFragment<Parc
val accountKey = user.account_key ?: return
if (twitterWrapper.isUpdatingRelationship(accountKey, user.key)) return
if (user.is_following) {
fragmentManager?.let { DestroyFriendshipDialogFragment.show(it, user) }
parentFragmentManager.let { DestroyFriendshipDialogFragment.show(it, user) }
} else {
twitterWrapper.createFriendshipAsync(accountKey, user.key, user.screen_name)
}

9
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SavedSearchesListFragment.kt
View File

@ -21,6 +21,7 @@ package org.mariotaku.twidere.fragment
import android.content.Context
import android.os.Bundle
import androidx.loader.app.LoaderManager
import androidx.loader.app.LoaderManager.LoaderCallbacks
import androidx.loader.app.hasRunningLoadersSafe
import androidx.loader.content.Loader
@ -44,7 +45,7 @@ class SavedSearchesListFragment : AbsContentListViewFragment<SavedSearchesAdapte
AdapterView.OnItemLongClickListener {
override var refreshing: Boolean
get() = loaderManager.hasRunningLoadersSafe()
get() = LoaderManager.getInstance(this).hasRunningLoadersSafe()
set(value) {
super.refreshing = value
}
@ -56,7 +57,7 @@ class SavedSearchesListFragment : AbsContentListViewFragment<SavedSearchesAdapte
super.onActivityCreated(savedInstanceState)
listView.onItemClickListener = this
listView.onItemLongClickListener = this
loaderManager.initLoader(0, null, this)
LoaderManager.getInstance(this).initLoader(0, null, this)
showProgress()
}
@ -80,7 +81,7 @@ class SavedSearchesListFragment : AbsContentListViewFragment<SavedSearchesAdapte
override fun onItemLongClick(view: AdapterView<*>, child: View, position: Int, id: Long): Boolean {
val item = adapter.findItem(id) ?: return false
fragmentManager?.let { DestroySavedSearchDialogFragment.show(it, accountKey, item.id, item.name) }
parentFragmentManager.let { DestroySavedSearchDialogFragment.show(it, accountKey, item.id, item.name) }
return true
}
@ -104,7 +105,7 @@ class SavedSearchesListFragment : AbsContentListViewFragment<SavedSearchesAdapte
override fun onRefresh() {
if (refreshing) return
loaderManager.restartLoader(0, null, this)
LoaderManager.getInstance(this).restartLoader(0, null, this)
}
@Subscribe

5
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/TrendsSuggestionsFragment.kt
View File

@ -29,6 +29,7 @@ import androidx.loader.content.Loader
import android.view.View
import android.widget.AdapterView
import android.widget.ListView
import androidx.loader.app.LoaderManager
import com.bumptech.glide.RequestManager
import com.squareup.otto.Subscribe
import kotlinx.android.synthetic.main.fragment_content_listview.*
@ -68,7 +69,7 @@ class TrendsSuggestionsFragment : AbsContentListViewFragment<TrendsAdapter>(), L
override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
listView.onItemClickListener = this
loaderManager.initLoader(0, null, this)
LoaderManager.getInstance(this).initLoader(0, null, this)
showProgress()
}
@ -123,7 +124,7 @@ class TrendsSuggestionsFragment : AbsContentListViewFragment<TrendsAdapter>(), L
override fun onStart() {
super.onStart()
loaderManager.restartLoader(0, null, this)
LoaderManager.getInstance(this).restartLoader(0, null, this)
bus.register(this)
}

17
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt
View File

@ -73,6 +73,7 @@ import android.view.View.OnTouchListener
import android.view.animation.AnimationUtils
import android.widget.TextView
import android.widget.Toast
import androidx.loader.app.LoaderManager
import com.squareup.otto.Subscribe
import kotlinx.android.synthetic.main.fragment_user.*
import kotlinx.android.synthetic.main.fragment_user.view.*
@ -432,7 +433,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
}
profileImage.visibility = View.VISIBLE
val resources = resources
val lm = loaderManager
val lm = LoaderManager.getInstance(this)
lm.destroyLoader(LOADER_ID_USER)
lm.destroyLoader(LOADER_ID_FRIENDSHIP)
cardContent.visibility = View.VISIBLE
@ -530,7 +531,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
externalThemeManager.emoji?.applyTo(it)
}
val userCreationDay = condition@ if (user.created_at >= 0) {
val userCreationDay = if (user.created_at >= 0) {
val cal = Calendar.getInstance()
val currentMonth = cal.get(Calendar.MONTH)
val currentDay = cal.get(Calendar.DAY_OF_MONTH)
@ -577,7 +578,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
fun getUserInfo(accountKey: UserKey, userKey: UserKey?, screenName: String?,
omitIntentExtra: Boolean) {
val lm = loaderManager
val lm = LoaderManager.getInstance(this)
lm.destroyLoader(LOADER_ID_USER)
lm.destroyLoader(LOADER_ID_FRIENDSHIP)
val args = Bundle()
@ -787,7 +788,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
override fun onDestroyView() {
user = null
relationship = null
val lm = loaderManager
val lm = LoaderManager.getInstance(this)
lm.destroyLoader(LOADER_ID_USER)
lm.destroyLoader(LOADER_ID_FRIENDSHIP)
super.onDestroyView()
@ -903,7 +904,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
val twitter = twitterWrapper
val user = user ?: return false
val accountKey = user.account_key ?: return false
val currentFragmentManager = fragmentManager ?: return false
val currentFragmentManager = parentFragmentManager
val userRelationship = relationship
when (item.itemId) {
R.id.block -> {
@ -1221,7 +1222,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
override fun onClick(view: View) {
val activity = activity ?: return
val fragmentManager = fragmentManager ?: return
val fragmentManager = parentFragmentManager
val user = user ?: return
val accountKey = user.account_key ?: return
when (view.id) {
@ -1394,7 +1395,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
private fun getFriendship() {
val user = user ?: return
relationship = null
val lm = loaderManager
val lm = LoaderManager.getInstance(this)
lm.destroyLoader(LOADER_ID_FRIENDSHIP)
val args = Bundle()
args.putParcelable(EXTRA_ACCOUNT_KEY, user.account_key)
@ -1890,7 +1891,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
df.arguments = Bundle {
this[EXTRA_ACCOUNT_KEY] = accountKey
}
df.show(requireFragmentManager(), "create_user_list")
df.show(parentFragmentManager, "create_user_list")
}
}
return dialog

9
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListFragment.kt
View File

@ -28,6 +28,7 @@ import android.nfc.NdefMessage
import android.nfc.NdefRecord
import android.nfc.NfcAdapter.CreateNdefMessageCallback
import android.os.Bundle
import androidx.loader.app.LoaderManager
import androidx.loader.app.LoaderManager.LoaderCallbacks
import androidx.loader.content.FixedAsyncTaskLoader
import androidx.loader.content.Loader
@ -81,7 +82,7 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener,
fun displayUserList(userList: ParcelableUserList?) {
val activity = activity ?: return
loaderManager.destroyLoader(0)
LoaderManager.getInstance(this).destroyLoader(0)
this.userList = userList
if (userList != null) {
@ -93,7 +94,7 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener,
}
fun getUserListInfo(omitIntentExtra: Boolean) {
val lm = loaderManager
val lm = LoaderManager.getInstance(this)
lm.destroyLoader(0)
val args = Bundle(arguments)
args.putBoolean(EXTRA_OMIT_INTENT_EXTRA, omitIntentExtra)
@ -180,7 +181,7 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener,
override fun onDestroyView() {
userList = null
loaderManager.destroyLoader(0)
LoaderManager.getInstance(this).destroyLoader(0)
super.onDestroyView()
}
@ -227,7 +228,7 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener,
val twitter = twitterWrapper
val userList = userList ?: return false
val activity = activity ?: return false
val fragmentManager = fragmentManager ?: return false
val fragmentManager = parentFragmentManager
when (item.itemId) {
R.id.add -> {
if (userList.user_key != userList.account_key) return false

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListsOwnershipsFragment.kt
View File

@ -68,7 +68,7 @@ class UserListsOwnershipsFragment : ParcelableUserListsFragment() {
val args = Bundle()
args.putParcelable(EXTRA_ACCOUNT_KEY, accountKey)
f.arguments = args
fragmentManager?.let { f.show(it, null) }
parentFragmentManager.let { f.show(it, null) }
return true
}
}

5
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt
View File

@ -33,7 +33,8 @@ import android.text.TextUtils.isEmpty
import android.view.*
import android.view.View.OnClickListener
import android.widget.Toast
import com.twitter.Validator
import androidx.loader.app.LoaderManager
import com.twitter.twittertext.Validator
import kotlinx.android.synthetic.main.fragment_user_profile_editor.*
import nl.komponents.kovenant.combine.and
import nl.komponents.kovenant.ui.promiseOnUi
@ -337,7 +338,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener,
private fun getUserInfo() {
if (activity == null || isDetached) return
val lm = loaderManager
val lm = LoaderManager.getInstance(this)
lm.destroyLoader(LOADER_ID_USER)
getUserInfoCalled = true
if (userInfoLoaderInitialized) {

4
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserQrDialogFragment.kt
View File

@ -125,13 +125,13 @@ class UserQrDialogFragment : BaseDialogFragment() {
return task {
try {
return@task requestManager.loadOriginalProfileImage(requireContext(), user, 0)
.into(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get()
.submit(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get()
} catch (e: ExecutionException) {
// Ignore
}
// Return fallback profile image
return@task requestManager.loadProfileImage(requireContext(), user, 0, size = profileImageSize)
.into(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get()
.submit(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get()
}
}

3
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/drafts/DraftsListFragment.kt
View File

@ -41,6 +41,7 @@ import android.widget.AbsListView.MultiChoiceModeListener
import android.widget.AdapterView
import android.widget.AdapterView.OnItemClickListener
import android.widget.ListView
import androidx.loader.app.LoaderManager
import com.bumptech.glide.RequestManager
import kotlinx.android.synthetic.main.fragment_content_listview.*
import org.mariotaku.kpreferences.get
@ -84,7 +85,7 @@ class DraftsListFragment : AbsContentListViewFragment<DraftsAdapter>(), LoaderCa
listView.choiceMode = ListView.CHOICE_MODE_MULTIPLE_MODAL
listView.setMultiChoiceModeListener(this)
refreshEnabled = false
loaderManager.initLoader(0, null, this)
LoaderManager.getInstance(this).initLoader(0, null, this)
showProgress()
}

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt
View File

@ -151,7 +151,7 @@ class AddEditItemFragment : BaseDialogFragment() {
val df = ExtraFeaturesIntroductionDialogFragment.create(
ExtraFeaturesService.FEATURE_ADVANCED_FILTERS)
df.setTargetFragment(this@AddEditItemFragment, REQUEST_CHANGE_SCOPE_PURCHASE)
df.show(requireFragmentManager(), ExtraFeaturesIntroductionDialogFragment.FRAGMENT_TAG)
df.show(parentFragmentManager, ExtraFeaturesIntroductionDialogFragment.FRAGMENT_TAG)
}
}

4
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersFragment.kt
View File

@ -88,7 +88,7 @@ abstract class BaseFiltersFragment : AbsContentListViewFragment<SimpleCursorAdap
onItemClick(pos)
}
listView.setMultiChoiceModeListener(this)
loaderManager.initLoader(0, null, this)
LoaderManager.getInstance(this).initLoader(0, null, this)
refreshEnabled = false
showProgress()
}
@ -235,7 +235,7 @@ abstract class BaseFiltersFragment : AbsContentListViewFragment<SimpleCursorAdap
this[EXTRA_VALUE] = value
this[EXTRA_SCOPE] = scope
}
fragmentManager?.let { dialog.show(it, "add_rule") }
parentFragmentManager.let { dialog.show(it, "add_rule") }
}

8
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersImportFragment.kt
View File

@ -58,7 +58,7 @@ abstract class BaseFiltersImportFragment : AbsContentListRecyclerViewFragment<Se
setHasOptionsMenu(true)
val loaderArgs = Bundle(arguments)
loaderArgs.putBoolean(EXTRA_FROM_USER, true)
loaderManager.initLoader(0, loaderArgs, this)
LoaderManager.getInstance(this).initLoader(0, loaderArgs, this)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@ -107,7 +107,7 @@ abstract class BaseFiltersImportFragment : AbsContentListRecyclerViewFragment<Se
return true
}
if (!extraFeaturesService.isAdvancedFiltersEnabled) {
fragmentManager?.let {
parentFragmentManager.let {
ExtraFeaturesIntroductionDialogFragment.show(it,
feature = ExtraFeaturesService.FEATURE_ADVANCED_FILTERS,
requestCode = REQUEST_PURCHASE_EXTRA_FEATURES)
@ -182,14 +182,14 @@ abstract class BaseFiltersImportFragment : AbsContentListRecyclerViewFragment<Se
val loaderArgs = Bundle(arguments)
loaderArgs.putBoolean(EXTRA_FROM_USER, true)
loaderArgs.putParcelable(EXTRA_NEXT_PAGINATION, nextPagination)
loaderManager.restartLoader(0, loaderArgs, this)
LoaderManager.getInstance(this).restartLoader(0, loaderArgs, this)
}
override fun onCreateAdapter(context: Context, requestManager: RequestManager): SelectableUsersAdapter {
val adapter = SelectableUsersAdapter(context, this.requestManager)
adapter.itemCheckedListener = listener@ { _, _ ->
if (!extraFeaturesService.isAdvancedFiltersEnabled) {
ExtraFeaturesIntroductionDialogFragment.show(requireFragmentManager(),
ExtraFeaturesIntroductionDialogFragment.show(parentFragmentManager,
feature = ExtraFeaturesService.FEATURE_ADVANCED_FILTERS,
requestCode = REQUEST_PURCHASE_EXTRA_FEATURES)
return@listener false

14
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt
View File

@ -67,7 +67,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac
listContainer.visibility = View.GONE
progressContainer.visibility = View.VISIBLE
loaderManager.initLoader(0, null, this)
LoaderManager.getInstance(this).initLoader(0, null, this)
if (!extraFeaturesService.isSupported()) {
@ -76,7 +76,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac
}
if (savedInstanceState == null) {
fragmentManager?.let { fragmentManager ->
parentFragmentManager.let { fragmentManager ->
when (arguments?.getString(EXTRA_ACTION)) {
ACTION_ADD_URL_SUBSCRIPTION -> {
if (!extraFeaturesService.isAdvancedFiltersEnabled) {
@ -131,17 +131,17 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac
when (item.itemId) {
R.id.add -> {
val df = AddUrlSubscriptionDialogFragment()
fragmentManager?.let { df.show(it, "add_url_subscription") }
parentFragmentManager.let { df.show(it, "add_url_subscription") }
return true
}
R.id.refresh -> {
executeAfterFragmentResumed { fragment ->
ProgressDialogFragment.show(fragment.childFragmentManager, FRAGMENT_TAG_RREFRESH_FILTERS)
ProgressDialogFragment.show(fragment.childFragmentManager, FRAGMENT_TAG_REFRESH_FILTERS)
val task = RefreshFiltersSubscriptionsTask(fragment.requireContext())
val fragmentRef = WeakReference(fragment)
task.callback = {
fragmentRef.get()?.executeAfterFragmentResumed { fragment ->
fragment.fragmentManager?.dismissDialogFragment(FRAGMENT_TAG_RREFRESH_FILTERS)
fragment.parentFragmentManager.dismissDialogFragment(FRAGMENT_TAG_REFRESH_FILTERS)
}
}
TaskStarter.execute(task)
@ -255,7 +255,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac
this[EXTRA_ADD_SUBSCRIPTION_URL] = arguments?.getString(EXTRA_ADD_SUBSCRIPTION_URL)
this[EXTRA_ADD_SUBSCRIPTION_NAME] = arguments?.getString(EXTRA_ADD_SUBSCRIPTION_NAME)
}
fragmentManager?.let { df.show(it, "add_url_subscription") }
parentFragmentManager.let { df.show(it, "add_url_subscription") }
}
class FilterSubscriptionsAdapter(context: Context) : SimpleCursorAdapter(context,
@ -337,7 +337,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac
const val EXTRA_ADD_SUBSCRIPTION_URL = "add_subscription.url"
const val EXTRA_ADD_SUBSCRIPTION_NAME = "add_subscription.name"
private const val REQUEST_ADD_URL_SUBSCRIPTION_PURCHASE = 101
private const val FRAGMENT_TAG_RREFRESH_FILTERS = "refresh_filters"
private const val FRAGMENT_TAG_REFRESH_FILTERS = "refresh_filters"
}
}

3
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt
View File

@ -24,6 +24,7 @@ import android.content.Context
import android.graphics.Bitmap
import android.graphics.BitmapFactory
import android.net.Uri
import android.os.AsyncTask
import com.davemorrissey.labs.subscaleview.ImageSource
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
import com.davemorrissey.labs.subscaleview.decoder.SkiaImageDecoder
@ -91,7 +92,7 @@ class ImagePageFragment : SubsampleImageViewerFragment() {
override fun setupImageView(imageView: SubsamplingScaleImageView) {
imageView.maxScale = resources.displayMetrics.density
imageView.setBitmapDecoderClass(PreviewBitmapDecoder::class.java)
imageView.setParallelLoadingEnabled(true)
imageView.setExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
imageView.setOnClickListener {
val activity = activity as? MediaViewerActivity ?: return@setOnClickListener
activity.toggleBar()

23
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageConversationInfoFragment.kt
View File

@ -28,20 +28,20 @@ import android.content.Intent
import android.graphics.Rect
import android.net.Uri
import android.os.Bundle
import android.view.*
import android.widget.CompoundButton
import android.widget.EditText
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentActivity
import androidx.loader.app.LoaderManager
import androidx.loader.content.FixedAsyncTaskLoader
import androidx.loader.content.Loader
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.FixedLinearLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.appcompat.widget.Toolbar
import android.view.*
import android.widget.CompoundButton
import android.widget.EditText
import com.bumptech.glide.RequestManager
import kotlinx.android.synthetic.main.activity_home_content.view.*
import kotlinx.android.synthetic.main.fragment_messages_conversation_info.*
@ -72,7 +72,6 @@ import org.mariotaku.twidere.adapter.iface.IItemCountsAdapter
import org.mariotaku.twidere.annotation.AccountType
import org.mariotaku.twidere.annotation.ImageShapeStyle
import org.mariotaku.twidere.annotation.ProfileImageSize
import org.mariotaku.twidere.constant.IntentConstants
import org.mariotaku.twidere.constant.IntentConstants.*
import org.mariotaku.twidere.constant.nameFirstKey
import org.mariotaku.twidere.constant.profileImageStyleKey
@ -182,7 +181,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
}
}
loaderManager.initLoader(0, null, this)
LoaderManager.getInstance(this).initLoader(0, null, this)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@ -331,10 +330,10 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
ProgressDialogFragment.show(childFragmentManager, "add_participant_progress")
val weakThis = WeakReference(this)
val task = AddParticipantsTask(requireContext(), accountKey, conversationId, listOf(user))
task.callback = callback@ { succeed ->
task.callback = callback@ {
val f = weakThis.get() ?: return@callback
f.dismissDialogThen("add_participant_progress") {
loaderManager.restartLoader(0, null, this)
LoaderManager.getInstance(this).restartLoader(0, null, this)
}
}
TaskStarter.execute(task)
@ -347,7 +346,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
task.callback = callback@ { _ ->
val f = weakThis.get() ?: return@callback
f.dismissDialogThen("set_notifications_disabled_progress") {
loaderManager.restartLoader(0, null, this)
LoaderManager.getInstance(this).restartLoader(0, null, this)
}
}
TaskStarter.execute(task)
@ -470,7 +469,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
}.alwaysUi {
val fragment = weakThis.get() ?: return@alwaysUi
fragment.dismissDialogThen(tag) {
loaderManager.restartLoader(0, null, this)
LoaderManager.getInstance(this).restartLoader(0, null, this)
}
}
}

13
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt
View File

@ -25,16 +25,17 @@ import android.graphics.Canvas
import android.graphics.Paint
import android.graphics.RectF
import android.os.Bundle
import androidx.annotation.WorkerThread
import androidx.loader.app.LoaderManager.LoaderCallbacks
import androidx.loader.content.Loader
import androidx.recyclerview.widget.LinearLayoutManager
import android.text.Editable
import android.text.Spannable
import android.text.SpannableStringBuilder
import android.text.TextUtils
import android.text.style.ReplacementSpan
import android.view.*
import androidx.annotation.WorkerThread
import androidx.loader.app.LoaderManager
import androidx.loader.app.LoaderManager.LoaderCallbacks
import androidx.loader.content.Loader
import androidx.recyclerview.widget.LinearLayoutManager
import kotlinx.android.synthetic.main.fragment_messages_conversation_new.*
import org.mariotaku.kpreferences.get
import org.mariotaku.ktextension.*
@ -305,10 +306,10 @@ class MessageNewConversationFragment : BaseFragment(), LoaderCallbacks<List<Parc
this[EXTRA_FROM_CACHE] = fromType
}
if (loaderInitialized) {
loaderManager.initLoader(0, args, this)
LoaderManager.getInstance(this).initLoader(0, args, this)
loaderInitialized = true
} else {
loaderManager.restartLoader(0, args, this)
LoaderManager.getInstance(this).restartLoader(0, args, this)
}
if (performSearchRequestRunnable != null) {
editParticipants.removeCallbacks(performSearchRequestRunnable)

7
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt
View File

@ -205,7 +205,7 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment<Messages
updateMediaPreview()
loaderManager.initLoader(0, null, this)
LoaderManager.getInstance(this).initLoader(0, null, this)
showProgress()
}
@ -413,7 +413,7 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment<Messages
if (activity is LinkHandlerActivity) {
activity.intent = IntentUtils.messageConversation(accountKey, newConversationId)
}
loaderManager.restartLoader(0, null, this)
LoaderManager.getInstance(this).restartLoader(0, null, this)
}
private fun performSendMessage() {
@ -526,8 +526,7 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment<Messages
val stateIcon = if (conversation.notificationDisabled) {
ContextCompat.getDrawable(context, R.drawable.ic_message_type_speaker_muted)?.apply {
mutate()
setColorFilter(conversationTitle.currentTextColor, PorterDuff.Mode.SRC_ATOP)
mutate().setColorFilter(conversationTitle.currentTextColor, PorterDuff.Mode.SRC_ATOP)
}
} else {
null

3
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesEntriesFragment.kt
View File

@ -29,6 +29,7 @@ import android.view.ContextMenu
import android.view.MenuInflater
import android.view.MenuItem
import android.view.View
import androidx.loader.app.LoaderManager
import com.bumptech.glide.RequestManager
import com.squareup.otto.Subscribe
import kotlinx.android.synthetic.main.activity_premium_dashboard.*
@ -86,7 +87,7 @@ class MessagesEntriesFragment : AbsContentListRecyclerViewFragment<MessagesEntri
super.onActivityCreated(savedInstanceState)
adapter.listener = this
adapter.loadMoreSupportedPosition = ILoadMoreSupportAdapter.END
loaderManager.initLoader(loaderId, null, this)
LoaderManager.getInstance(this).initLoader(loaderId, null, this)
registerForContextMenu(recyclerView)
}

8
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsStatusDialogFragment.kt
View File

@ -79,9 +79,9 @@ abstract class AbsStatusDialogFragment : BaseDialogFragment() {
adapter.showAccountsColor = true
val dialog = builder.create()
dialog.onShow {
val context = it.context
it.applyTheme()
dialog.onShow { alertDialog ->
val context = alertDialog.context
alertDialog.applyTheme()
val am = AccountManager.get(context)
val details = AccountUtils.getAccountDetails(am, accountKey, true) ?: run {
@ -89,7 +89,7 @@ abstract class AbsStatusDialogFragment : BaseDialogFragment() {
return@onShow
}
val weakThis = WeakReference(this)
val weakHolder = WeakReference(StatusViewHolder(adapter = adapter, itemView = it.itemContent).apply {
val weakHolder = WeakReference(StatusViewHolder(adapter = adapter, itemView = alertDialog.itemContent).apply {
setupViewOptions()
})
val extraStatus = status

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/BlockStatusUsersDialogFragment.kt
View File

@ -50,7 +50,7 @@ class BlockStatusUsersDialogFragment : BaseDialogFragment() {
}.toTypedArray()
builder.setTitle(R.string.action_status_block_users)
builder.setItems(displayNames) { _, which ->
CreateUserBlockDialogFragment.show(requireFragmentManager(), referencedUsers[which])
CreateUserBlockDialogFragment.show(parentFragmentManager, referencedUsers[which])
}
val dialog = builder.create()
dialog.applyOnShow { applyTheme() }

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/MuteStatusUsersDialogFragment.kt
View File

@ -50,7 +50,7 @@ class MuteStatusUsersDialogFragment : BaseDialogFragment() {
}.toTypedArray()
builder.setTitle(R.string.action_status_mute_users)
builder.setItems(displayNames) { _, which ->
CreateUserMuteDialogFragment.show(requireFragmentManager(), referencedUsers[which])
CreateUserMuteDialogFragment.show(parentFragmentManager, referencedUsers[which])
}
val dialog = builder.create()
dialog.onShow { it.applyTheme() }

19
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt
View File

@ -36,6 +36,7 @@ import android.text.TextUtils
import android.view.*
import android.widget.Toast
import androidx.appcompat.app.AlertDialog
import androidx.loader.app.LoaderManager
import androidx.loader.app.LoaderManager.LoaderCallbacks
import androidx.loader.app.hasRunningLoadersSafe
import androidx.loader.content.FixedAsyncTaskLoader
@ -210,7 +211,7 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
if (args.containsKey(EXTRA_STATUS)) {
args.putParcelable(EXTRA_STATUS, status)
}
loaderManager.restartLoader(LOADER_ID_DETAIL_STATUS, args, this)
LoaderManager.getInstance(this).restartLoader(LOADER_ID_DETAIL_STATUS, args, this)
}
}
REQUEST_SELECT_ACCOUNT -> {
@ -261,7 +262,7 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
setState(STATE_LOADING)
loaderManager.initLoader(LOADER_ID_DETAIL_STATUS, arguments, this)
LoaderManager.getInstance(this).initLoader(LOADER_ID_DETAIL_STATUS, arguments, this)
}
override fun onMediaClick(holder: IStatusViewHolder, view: View, current: ParcelableMedia, statusPosition: Int) {
@ -425,7 +426,7 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
}
override val refreshing: Boolean
get() = loaderManager.hasRunningLoadersSafe()
get() = LoaderManager.getInstance(this).hasRunningLoadersSafe()
override fun onLoadMoreContents(@IndicatorPosition position: Long) {
if (!hasMoreConversation) return
@ -485,10 +486,10 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
this[EXTRA_STATUS] = status
}
if (conversationLoaderInitialized) {
loaderManager.restartLoader(LOADER_ID_STATUS_CONVERSATIONS, args, conversationsLoaderCallback)
LoaderManager.getInstance(this).restartLoader(LOADER_ID_STATUS_CONVERSATIONS, args, conversationsLoaderCallback)
return
}
loaderManager.initLoader(LOADER_ID_STATUS_CONVERSATIONS, args, conversationsLoaderCallback)
LoaderManager.getInstance(this).initLoader(LOADER_ID_STATUS_CONVERSATIONS, args, conversationsLoaderCallback)
conversationLoaderInitialized = true
}
@ -500,10 +501,10 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
this[EXTRA_STATUS_ID] = status.originalId
}
if (activityLoaderInitialized) {
loaderManager.restartLoader(LOADER_ID_STATUS_ACTIVITY, args, statusActivityLoaderCallback)
LoaderManager.getInstance(this).restartLoader(LOADER_ID_STATUS_ACTIVITY, args, statusActivityLoaderCallback)
return
}
loaderManager.initLoader(LOADER_ID_STATUS_ACTIVITY, args, statusActivityLoaderCallback)
LoaderManager.getInstance(this).initLoader(LOADER_ID_STATUS_ACTIVITY, args, statusActivityLoaderCallback)
activityLoaderInitialized = true
}
@ -592,7 +593,7 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
override fun onContextItemSelected(item: MenuItem): Boolean {
val activity = activity ?: return false
val fragmentManager = fragmentManager ?: return false
val fragmentManager = parentFragmentManager
if (!userVisibleHint) return false
val contextMenuInfo = item.menuInfo as? ExtendedRecyclerView.ContextMenuInfo ?: return false
val status = adapter.getStatus(contextMenuInfo.position)
@ -650,7 +651,7 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
val fragment = weakThis.get() ?: return@successUi
val df = TranslationDestinationDialogFragment.create(languages, accountLanguage)
df.setTargetFragment(fragment, 0)
df.show(fragment.requireFragmentManager(), "translation_destination_settings")
df.show(fragment.parentFragmentManager, "translation_destination_settings")
}.alwaysUi {
val fragment = weakThis.get() ?: return@alwaysUi
fragment.dismissProgressDialog("get_language_settings")

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/TranslationDestinationDialogFragment.kt
View File

@ -52,7 +52,7 @@ class TranslationDestinationDialogFragment : BaseDialogFragment() {
builder.setSingleChoiceItems(languages.mapToArray { it.name }, selectedIndex) { _, which ->
currentIndex.set(which)
}
builder.setPositiveButton(android.R.string.ok) lambda@ { di, _ ->
builder.setPositiveButton(android.R.string.ok) lambda@ { _, _ ->
val idx = currentIndex.get()
if (idx < 0) return@lambda
preferences[translationDestinationKey] = languages[idx].code

3
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/MediaStatusesSearchFragment.kt
View File

@ -21,6 +21,7 @@ package org.mariotaku.twidere.fragment.statuses
import android.content.Context
import android.os.Bundle
import androidx.loader.app.LoaderManager
import androidx.loader.content.Loader
import org.mariotaku.twidere.TwidereConstants.*
import org.mariotaku.twidere.fragment.AbsMediaStatusesFragment
@ -52,7 +53,7 @@ class MediaStatusesSearchFragment : AbsMediaStatusesFragment() {
args.putString(EXTRA_MAX_ID, maxId)
args.putString(EXTRA_SINCE_ID, sinceId)
args.putBoolean(EXTRA_FROM_USER, true)
loaderManager.restartLoader(loaderId, args, this)
LoaderManager.getInstance(this).restartLoader(loaderId, args, this)
return 0
}

3
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMediaTimelineFragment.kt
View File

@ -21,6 +21,7 @@ package org.mariotaku.twidere.fragment.statuses
import android.content.Context
import android.os.Bundle
import androidx.loader.app.LoaderManager
import androidx.loader.content.Loader
import org.mariotaku.twidere.constant.IntentConstants.*
import org.mariotaku.twidere.fragment.AbsMediaStatusesFragment
@ -52,7 +53,7 @@ class UserMediaTimelineFragment : AbsMediaStatusesFragment() {
args.putString(EXTRA_MAX_ID, maxId)
args.putString(EXTRA_SINCE_ID, sinceId)
args.putBoolean(EXTRA_FROM_USER, true)
loaderManager.restartLoader(loaderId, args, this)
LoaderManager.getInstance(this).restartLoader(loaderId, args, this)
return 0
}

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserTimelineFragment.kt
View File

@ -138,7 +138,7 @@ class UserTimelineFragment : ParcelableStatusesFragment() {
override fun onFilterClick(holder: TimelineFilterHeaderViewHolder) {
val df = UserTimelineFilterDialogFragment()
df.setTargetFragment(this, REQUEST_SET_TIMELINE_FILTER)
fragmentManager?.let { df.show(it, "set_timeline_filter") }
parentFragmentManager.let { df.show(it, "set_timeline_filter") }
}
@Subscribe

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/users/UserListMembersFragment.kt
View File

@ -110,7 +110,7 @@ class UserListMembersFragment : ParcelableUsersFragment() {
val user = adapter.getUser(contextMenuInfo.position) ?: return false
when (item.itemId) {
R.id.delete_from_list -> {
fragmentManager?.let { DeleteUserListMembersDialogFragment.show(it, userList, user) }
parentFragmentManager.let { DeleteUserListMembersDialogFragment.show(it, userList, user) }
return true
}
}

35
twidere/src/main/kotlin/org/mariotaku/twidere/loader/ExtensionsListLoader.kt
View File

@ -118,6 +118,35 @@ class ExtensionsListLoader(
info.metaData?.getString(METADATA_KEY_EXTENSION_SETTINGS)
)
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as ExtensionInfo
if (packageName != other.packageName) return false
if (label != other.label) return false
if (description != other.description) return false
if (icon != other.icon) return false
if (permissions != null) {
if (other.permissions == null) return false
if (!permissions.contentEquals(other.permissions)) return false
} else if (other.permissions != null) return false
if (settings != other.settings) return false
return true
}
override fun hashCode(): Int {
var result = packageName.hashCode()
result = 31 * result + label.hashCode()
result = 31 * result + (description?.hashCode() ?: 0)
result = 31 * result + (icon?.hashCode() ?: 0)
result = 31 * result + (permissions?.contentHashCode() ?: 0)
result = 31 * result + (settings?.hashCode() ?: 0)
return result
}
}
/**
@ -126,8 +155,8 @@ class ExtensionsListLoader(
*/
class InterestingConfigChanges {
internal val lastConfiguration = Configuration()
internal var lastDensity: Int = 0
private val lastConfiguration = Configuration()
private var lastDensity: Int = 0
internal fun applyNewConfig(res: Resources): Boolean {
val configChanges = lastConfiguration.updateFrom(res.configuration)
@ -165,7 +194,7 @@ class ExtensionsListLoader(
}
}
class ExtensionInfoComparator(val collator: Collator) : Comparator<ExtensionInfo> {
class ExtensionInfoComparator(private val collator: Collator) : Comparator<ExtensionInfo> {
override fun compare(o1: ExtensionInfo, o2: ExtensionInfo): Int {
val label1 = o1.label.toString()
val label2 = o2.label.toString()

18
twidere/src/main/kotlin/org/mariotaku/twidere/model/ParameterizedExpression.kt
View File

@ -27,4 +27,22 @@ import org.mariotaku.sqliteqb.library.Expression
data class ParameterizedExpression(var expression: Expression, val parameters: Array<String>) {
val sql: String
get() = expression.sql
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as ParameterizedExpression
if (expression != other.expression) return false
if (!parameters.contentEquals(other.parameters)) return false
return true
}
override fun hashCode(): Int {
var result = expression.hashCode()
result = 31 * result + parameters.contentHashCode()
return result
}
}

8
twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableRelationshipUtils.kt
View File

@ -69,15 +69,15 @@ object ParcelableRelationshipUtils {
*/
fun insert(cr: ContentResolver, relationships: Collection<ParcelableRelationship>) {
val insertItems = ArraySet<ParcelableRelationship>()
relationships.forEach {
if (it._id > 0) {
val where = Expression.equals(CachedRelationships._ID, it._id).sql
relationships.forEach { parcelableRelationship ->
if (parcelableRelationship._id > 0) {
val where = Expression.equals(CachedRelationships._ID, parcelableRelationship._id).sql
cr.updateItems(CachedRelationships.CONTENT_URI, CachedRelationships.COLUMNS, where, null,
ParcelableRelationship::class.java) {
return@updateItems it
}
} else {
insertItems.add(it)
insertItems.add(parcelableRelationship)
}
}
cr.bulkInsert(CachedRelationships.CONTENT_URI, insertItems, ParcelableRelationship::class.java)

2
twidere/src/main/kotlin/org/mariotaku/twidere/preference/ColorPickerPreference.kt
View File

@ -81,7 +81,7 @@ class ColorPickerPreference(context: Context, attrs: AttributeSet? = null) :
override fun displayDialog(fragment: PreferenceFragmentCompat) {
val df = ColorPickerPreferenceDialogFragment.newInstance(key)
df.setTargetFragment(fragment, 0)
fragment.fragmentManager?.let { df.show(it, key) }
fragment.parentFragmentManager.let { df.show(it, key) }
}
override fun onBindViewHolder(holder: PreferenceViewHolder) {

2
twidere/src/main/kotlin/org/mariotaku/twidere/preference/DefaultAPIPreference.kt
View File

@ -35,7 +35,7 @@ class DefaultAPIPreference(
override fun displayDialog(fragment: PreferenceFragmentCompat) {
val df = APIEditorDialogFragment()
df.setTargetFragment(fragment, 0)
fragment.fragmentManager?.let { df.show(it, key) }
fragment.parentFragmentManager.let { df.show(it, key) }
}
}

2
twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt
View File

@ -72,7 +72,7 @@ class KeyboardShortcutPreference(context: Context, attrs: AttributeSet? = null)
override fun displayDialog(fragment: PreferenceFragmentCompat) {
val df = KeyboardShortcutDialogFragment.newInstance(action)
df.setTargetFragment(fragment, 0)
fragment.fragmentManager?.let { df.show(it, action) }
fragment.parentFragmentManager.let { df.show(it, action) }
}
class KeyboardShortcutDialogFragment : ThemedPreferenceDialogFragmentCompat(), DialogInterface.OnKeyListener {

2
twidere/src/main/kotlin/org/mariotaku/twidere/preference/RandomizeAccountNamePreference.kt
View File

@ -58,7 +58,7 @@ class RandomizeAccountNamePreference @JvmOverloads constructor(
override fun displayDialog(fragment: PreferenceFragmentCompat) {
val df = RenameAccountsConfirmDialogFragment.newInstance(key, getPersistedBoolean(false))
df.setTargetFragment(fragment, 0)
fragment.fragmentManager?.let { df.show(it, key) }
fragment.parentFragmentManager.let { df.show(it, key) }
}
class RenameAccountsConfirmDialogFragment : PreferenceDialogFragmentCompat() {

2
twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedEditTextPreference.kt
View File

@ -36,6 +36,6 @@ class ThemedEditTextPreference(context: Context, attrs: AttributeSet? = null) :
override fun displayDialog(fragment: PreferenceFragmentCompat) {
val df = ThemedEditTextPreferenceDialogFragmentCompat.newInstance(key)
df.setTargetFragment(fragment, 0)
fragment.fragmentManager?.let { df.show(it, key) }
fragment.parentFragmentManager.let { df.show(it, key) }
}
}

2
twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedListPreference.kt
View File

@ -17,6 +17,6 @@ open class ThemedListPreference(context: Context, attrs: AttributeSet? = null) :
override fun displayDialog(fragment: PreferenceFragmentCompat) {
val df = ThemedListPreferenceDialogFragmentCompat.newInstance(key)
df.setTargetFragment(fragment, 0)
fragment.fragmentManager?.let { df.show(it, key) }
fragment.parentFragmentManager.let { df.show(it, key) }
}
}

2
twidere/src/main/kotlin/org/mariotaku/twidere/service/BaseIntentService.kt
View File

@ -2,7 +2,7 @@ package org.mariotaku.twidere.service
import android.app.IntentService
import android.content.SharedPreferences
import com.twitter.Extractor
import com.twitter.twittertext.Extractor
import org.mariotaku.twidere.util.AsyncTwitterWrapper
import org.mariotaku.twidere.util.NotificationManagerWrapper
import org.mariotaku.twidere.util.UserColorNameManager

2
twidere/src/main/kotlin/org/mariotaku/twidere/service/BaseService.kt
View File

@ -22,7 +22,7 @@ package org.mariotaku.twidere.service
import android.app.Service
import android.content.SharedPreferences
import android.net.ConnectivityManager
import com.twitter.Extractor
import com.twitter.twittertext.Extractor
import org.mariotaku.twidere.util.*
import org.mariotaku.twidere.util.dagger.GeneralComponent
import org.mariotaku.twidere.util.notification.ContentNotificationManager

2
twidere/src/main/kotlin/org/mariotaku/twidere/task/BaseAbstractTask.kt
View File

@ -3,7 +3,7 @@ package org.mariotaku.twidere.task
import android.content.Context
import android.content.SharedPreferences
import com.squareup.otto.Bus
import com.twitter.Extractor
import com.twitter.twittertext.Extractor
import org.mariotaku.abstask.library.AbstractTask
import org.mariotaku.kpreferences.KPreferences
import org.mariotaku.restfu.http.RestHttpClient

4
twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/GetActivitiesAboutMeTask.kt
View File

@ -123,8 +123,8 @@ class GetActivitiesAboutMeTask(context: Context) : GetActivitiesTask(context) {
}
return GetTimelineResult(account, activities, activities.flatMap {
it.sources?.toList().orEmpty()
}, timeline.flatMap {
it.entities?.hashtags?.map { it.text }.orEmpty()
}, timeline.flatMap { status ->
status.entities?.hashtags?.map { it.text }.orEmpty()
})
}

26
twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/UpdateStatusTask.kt
View File

@ -687,7 +687,27 @@ class UpdateStatusTask(
val ids: Array<String>,
val deleteOnSuccess: List<MediaDeletionItem>,
val deleteAlways: List<MediaDeletionItem>
)
) {
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as SharedMediaUploadResult
if (!ids.contentEquals(other.ids)) return false
if (deleteOnSuccess != other.deleteOnSuccess) return false
if (deleteAlways != other.deleteAlways) return false
return true
}
override fun hashCode(): Int {
var result = ids.contentHashCode()
result = 31 * result + deleteOnSuccess.hashCode()
result = 31 * result + deleteAlways.hashCode()
return result
}
}
companion object {
@ -914,7 +934,7 @@ class UpdateStatusTask(
return null
}
if (imageLimit == null || (imageLimit.checkGeomentry(o.outWidth, o.outHeight)
if (imageLimit == null || (imageLimit.checkGeometry(o.outWidth, o.outHeight)
&& imageLimit.checkSize(imageSize, chucked))) return null
o.inSampleSize = o.calculateInSampleSize(imageLimit.maxWidth, imageLimit.maxHeight)
o.inJustDecodeBounds = false
@ -1092,7 +1112,7 @@ class UpdateStatusTask(
context.contentResolver.delete(Drafts.CONTENT_URI, where, null)
}
fun AccountExtras.ImageLimit.checkGeomentry(width: Int, height: Int): Boolean {
fun AccountExtras.ImageLimit.checkGeometry(width: Int, height: Int): Boolean {
if (this.maxWidth <= 0 || this.maxHeight <= 0) return true
return (width <= this.maxWidth && height <= this.maxHeight) || (height <= this.maxWidth
&& width <= this.maxHeight)

4
twidere/src/main/kotlin/org/mariotaku/twidere/util/AsyncTwitterWrapper.kt
View File

@ -360,10 +360,6 @@ class AsyncTwitterWrapper(
}
override fun onException(callback: Any?, exception: MicroBlogException) {
if (exception !is MicroBlogException) {
Analyzer.logException(exception)
return
}
DebugLog.w(TwidereConstants.LOGTAG, "Unable to update friendship", exception)
}

4
twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreUtils.kt
View File

@ -242,7 +242,7 @@ object DataStoreUtils {
val (where, whereArgs) = getIdsWhere(isOfficial)
getNewestActivityMaxSortPositions(context, uri, keys, where, whereArgs)
}, { arr1, arr2 ->
LongArray(accountKeys.size) { arr1.elementAtOrNull(it)?.takeIf { it > 0 } ?: arr2.elementAtOrNull(it) ?: 0 }
LongArray(accountKeys.size) { array -> arr1.elementAtOrNull(array)?.takeIf { it > 0 } ?: arr2.elementAtOrNull(array) ?: 0 }
}, accountKeys)
}
@ -259,7 +259,7 @@ object DataStoreUtils {
val (where, whereArgs) = getIdsWhere(isOfficial)
getOldestActivityMaxSortPositions(context, uri, keys, where, whereArgs)
}, { arr1, arr2 ->
LongArray(accountKeys.size) { arr1.elementAtOrNull(it)?.takeIf { it > 0 } ?: arr2.elementAtOrNull(it) ?: 0 }
LongArray(accountKeys.size) { array -> arr1.elementAtOrNull(array)?.takeIf { it > 0 } ?: arr2.elementAtOrNull(array) ?: 0 }
}, accountKeys)
}

393
twidere/src/main/kotlin/org/mariotaku/twidere/util/EntityArrays.kt
View File

@ -1,393 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mariotaku.twidere.util
import java.util.*
/**
* Class holding various entity data for HTML and XML - generally for use with
* the LookupTranslator.
* All Maps are generated using `java.util.Collections.unmodifiableMap()`.
*
* @since 1.0
*/
object EntityArrays {
/**
* A Map&lt;CharSequence, CharSequence&gt; to to escape
* [ISO-8859-1](https://secure.wikimedia.org/wikipedia/en/wiki/ISO/IEC_8859-1)
* characters to their named HTML 3.x equivalents.
*/
val ISO8859_1_ESCAPE: Map<CharSequence, CharSequence> = mapOf(
"\u00A0" to "&nbsp;", // non-breaking space
"\u00A1" to "&iexcl;", // inverted exclamation mark
"\u00A2" to "&cent;", // cent sign
"\u00A3" to "&pound;", // pound sign
"\u00A4" to "&curren;", // currency sign
"\u00A5" to "&yen;", // yen sign = yuan sign
"\u00A6" to "&brvbar;", // broken bar = broken vertical bar
"\u00A7" to "&sect;", // section sign
"\u00A8" to "&uml;", // diaeresis = spacing diaeresis
"\u00A9" to "&copy;", // © - copyright sign
"\u00AA" to "&ordf;", // feminine ordinal indicator
"\u00AB" to "&laquo;", // left-pointing double angle quotation mark = left pointing guillemet
"\u00AC" to "&not;", // not sign
"\u00AD" to "&shy;", // soft hyphen = discretionary hyphen
"\u00AE" to "&reg;", // ® - registered trademark sign
"\u00AF" to "&macr;", // macron = spacing macron = overline = APL overbar
"\u00B0" to "&deg;", // degree sign
"\u00B1" to "&plusmn;", // plus-minus sign = plus-or-minus sign
"\u00B2" to "&sup2;", // superscript two = superscript digit two = squared
"\u00B3" to "&sup3;", // superscript three = superscript digit three = cubed
"\u00B4" to "&acute;", // acute accent = spacing acute
"\u00B5" to "&micro;", // micro sign
"\u00B6" to "&para;", // pilcrow sign = paragraph sign
"\u00B7" to "&middot;", // middle dot = Georgian comma = Greek middle dot
"\u00B8" to "&cedil;", // cedilla = spacing cedilla
"\u00B9" to "&sup1;", // superscript one = superscript digit one
"\u00BA" to "&ordm;", // masculine ordinal indicator
"\u00BB" to "&raquo;", // right-pointing double angle quotation mark = right pointing guillemet
"\u00BC" to "&frac14;", // vulgar fraction one quarter = fraction one quarter
"\u00BD" to "&frac12;", // vulgar fraction one half = fraction one half
"\u00BE" to "&frac34;", // vulgar fraction three quarters = fraction three quarters
"\u00BF" to "&iquest;", // inverted question mark = turned question mark
"\u00C0" to "&Agrave;", // À - uppercase A, grave accent
"\u00C1" to "&Aacute;", // Á - uppercase A, acute accent
"\u00C2" to "&Acirc;", // Â - uppercase A, circumflex accent
"\u00C3" to "&Atilde;", // Ã - uppercase A, tilde
"\u00C4" to "&Auml;", // Ä - uppercase A, umlaut
"\u00C5" to "&Aring;", // Å - uppercase A, ring
"\u00C6" to "&AElig;", // Æ - uppercase AE
"\u00C7" to "&Ccedil;", // Ç - uppercase C, cedilla
"\u00C8" to "&Egrave;", // È - uppercase E, grave accent
"\u00C9" to "&Eacute;", // É - uppercase E, acute accent
"\u00CA" to "&Ecirc;", // Ê - uppercase E, circumflex accent
"\u00CB" to "&Euml;", // Ë - uppercase E, umlaut
"\u00CC" to "&Igrave;", // Ì - uppercase I, grave accent
"\u00CD" to "&Iacute;", // Í - uppercase I, acute accent
"\u00CE" to "&Icirc;", // Î - uppercase I, circumflex accent
"\u00CF" to "&Iuml;", // Ï - uppercase I, umlaut
"\u00D0" to "&ETH;", // Ð - uppercase Eth, Icelandic
"\u00D1" to "&Ntilde;", // Ñ - uppercase N, tilde
"\u00D2" to "&Ograve;", // Ò - uppercase O, grave accent
"\u00D3" to "&Oacute;", // Ó - uppercase O, acute accent
"\u00D4" to "&Ocirc;", // Ô - uppercase O, circumflex accent
"\u00D5" to "&Otilde;", // Õ - uppercase O, tilde
"\u00D6" to "&Ouml;", // Ö - uppercase O, umlaut
"\u00D7" to "&times;", // multiplication sign
"\u00D8" to "&Oslash;", // Ø - uppercase O, slash
"\u00D9" to "&Ugrave;", // Ù - uppercase U, grave accent
"\u00DA" to "&Uacute;", // Ú - uppercase U, acute accent
"\u00DB" to "&Ucirc;", // Û - uppercase U, circumflex accent
"\u00DC" to "&Uuml;", // Ü - uppercase U, umlaut
"\u00DD" to "&Yacute;", // Ý - uppercase Y, acute accent
"\u00DE" to "&THORN;", // Þ - uppercase THORN, Icelandic
"\u00DF" to "&szlig;", // ß - lowercase sharps, German
"\u00E0" to "&agrave;", // à - lowercase a, grave accent
"\u00E1" to "&aacute;", // á - lowercase a, acute accent
"\u00E2" to "&acirc;", // â - lowercase a, circumflex accent
"\u00E3" to "&atilde;", // ã - lowercase a, tilde
"\u00E4" to "&auml;", // ä - lowercase a, umlaut
"\u00E5" to "&aring;", // å - lowercase a, ring
"\u00E6" to "&aelig;", // æ - lowercase ae
"\u00E7" to "&ccedil;", // ç - lowercase c, cedilla
"\u00E8" to "&egrave;", // è - lowercase e, grave accent
"\u00E9" to "&eacute;", // é - lowercase e, acute accent
"\u00EA" to "&ecirc;", // ê - lowercase e, circumflex accent
"\u00EB" to "&euml;", // ë - lowercase e, umlaut
"\u00EC" to "&igrave;", // ì - lowercase i, grave accent
"\u00ED" to "&iacute;", // í - lowercase i, acute accent
"\u00EE" to "&icirc;", // î - lowercase i, circumflex accent
"\u00EF" to "&iuml;", // ï - lowercase i, umlaut
"\u00F0" to "&eth;", // ð - lowercase eth, Icelandic
"\u00F1" to "&ntilde;", // ñ - lowercase n, tilde
"\u00F2" to "&ograve;", // ò - lowercase o, grave accent
"\u00F3" to "&oacute;", // ó - lowercase o, acute accent
"\u00F4" to "&ocirc;", // ô - lowercase o, circumflex accent
"\u00F5" to "&otilde;", // õ - lowercase o, tilde
"\u00F6" to "&ouml;", // ö - lowercase o, umlaut
"\u00F7" to "&divide;", // division sign
"\u00F8" to "&oslash;", // ø - lowercase o, slash
"\u00F9" to "&ugrave;", // ù - lowercase u, grave accent
"\u00FA" to "&uacute;", // ú - lowercase u, acute accent
"\u00FB" to "&ucirc;", // û - lowercase u, circumflex accent
"\u00FC" to "&uuml;", // ü - lowercase u, umlaut
"\u00FD" to "&yacute;", // ý - lowercase y, acute accent
"\u00FE" to "&thorn;", // þ - lowercase thorn, Icelandic
"\u00FF" to "&yuml;" // ÿ - lowercase y, umlaut
)
/**
* Reverse of [.ISO8859_1_ESCAPE] for unescaping purposes.
*/
val ISO8859_1_UNESCAPE: Map<CharSequence, CharSequence> = ISO8859_1_ESCAPE.invert()
/**
* A Map&lt;CharSequence, CharSequence&gt; to escape additional
* [character entity references](http://www.w3.org/TR/REC-html40/sgml/entities.html).
* Note that this must be used with [.ISO8859_1_ESCAPE] to get the full list of
* HTML 4.0 character entities.
*/
val HTML40_EXTENDED_ESCAPE: Map<CharSequence, CharSequence> = mapOf(
// <!-- Latin Extended-B -->
"\u0192" to "&fnof;", // latin small f with hook = function= florin, U+0192 ISOtech -->
// <!-- Greek -->
"\u0391" to "&Alpha;", // greek capital letter alpha, U+0391 -->
"\u0392" to "&Beta;", // greek capital letter beta, U+0392 -->
"\u0393" to "&Gamma;", // greek capital letter gamma,U+0393 ISOgrk3 -->
"\u0394" to "&Delta;", // greek capital letter delta,U+0394 ISOgrk3 -->
"\u0395" to "&Epsilon;", // greek capital letter epsilon, U+0395 -->
"\u0396" to "&Zeta;", // greek capital letter zeta, U+0396 -->
"\u0397" to "&Eta;", // greek capital letter eta, U+0397 -->
"\u0398" to "&Theta;", // greek capital letter theta,U+0398 ISOgrk3 -->
"\u0399" to "&Iota;", // greek capital letter iota, U+0399 -->
"\u039A" to "&Kappa;", // greek capital letter kappa, U+039A -->
"\u039B" to "&Lambda;", // greek capital letter lambda,U+039B ISOgrk3 -->
"\u039C" to "&Mu;", // greek capital letter mu, U+039C -->
"\u039D" to "&Nu;", // greek capital letter nu, U+039D -->
"\u039E" to "&Xi;", // greek capital letter xi, U+039E ISOgrk3 -->
"\u039F" to "&Omicron;", // greek capital letter omicron, U+039F -->
"\u03A0" to "&Pi;", // greek capital letter pi, U+03A0 ISOgrk3 -->
"\u03A1" to "&Rho;", // greek capital letter rho, U+03A1 -->
// <!-- there is no Sigmaf, and no U+03A2 character either -->
"\u03A3" to "&Sigma;", // greek capital letter sigma,U+03A3 ISOgrk3 -->
"\u03A4" to "&Tau;", // greek capital letter tau, U+03A4 -->
"\u03A5" to "&Upsilon;", // greek capital letter upsilon,U+03A5 ISOgrk3 -->
"\u03A6" to "&Phi;", // greek capital letter phi,U+03A6 ISOgrk3 -->
"\u03A7" to "&Chi;", // greek capital letter chi, U+03A7 -->
"\u03A8" to "&Psi;", // greek capital letter psi,U+03A8 ISOgrk3 -->
"\u03A9" to "&Omega;", // greek capital letter omega,U+03A9 ISOgrk3 -->
"\u03B1" to "&alpha;", // greek small letter alpha,U+03B1 ISOgrk3 -->
"\u03B2" to "&beta;", // greek small letter beta, U+03B2 ISOgrk3 -->
"\u03B3" to "&gamma;", // greek small letter gamma,U+03B3 ISOgrk3 -->
"\u03B4" to "&delta;", // greek small letter delta,U+03B4 ISOgrk3 -->
"\u03B5" to "&epsilon;", // greek small letter epsilon,U+03B5 ISOgrk3 -->
"\u03B6" to "&zeta;", // greek small letter zeta, U+03B6 ISOgrk3 -->
"\u03B7" to "&eta;", // greek small letter eta, U+03B7 ISOgrk3 -->
"\u03B8" to "&theta;", // greek small letter theta,U+03B8 ISOgrk3 -->
"\u03B9" to "&iota;", // greek small letter iota, U+03B9 ISOgrk3 -->
"\u03BA" to "&kappa;", // greek small letter kappa,U+03BA ISOgrk3 -->
"\u03BB" to "&lambda;", // greek small letter lambda,U+03BB ISOgrk3 -->
"\u03BC" to "&mu;", // greek small letter mu, U+03BC ISOgrk3 -->
"\u03BD" to "&nu;", // greek small letter nu, U+03BD ISOgrk3 -->
"\u03BE" to "&xi;", // greek small letter xi, U+03BE ISOgrk3 -->
"\u03BF" to "&omicron;", // greek small letter omicron, U+03BF NEW -->
"\u03C0" to "&pi;", // greek small letter pi, U+03C0 ISOgrk3 -->
"\u03C1" to "&rho;", // greek small letter rho, U+03C1 ISOgrk3 -->
"\u03C2" to "&sigmaf;", // greek small letter final sigma,U+03C2 ISOgrk3 -->
"\u03C3" to "&sigma;", // greek small letter sigma,U+03C3 ISOgrk3 -->
"\u03C4" to "&tau;", // greek small letter tau, U+03C4 ISOgrk3 -->
"\u03C5" to "&upsilon;", // greek small letter upsilon,U+03C5 ISOgrk3 -->
"\u03C6" to "&phi;", // greek small letter phi, U+03C6 ISOgrk3 -->
"\u03C7" to "&chi;", // greek small letter chi, U+03C7 ISOgrk3 -->
"\u03C8" to "&psi;", // greek small letter psi, U+03C8 ISOgrk3 -->
"\u03C9" to "&omega;", // greek small letter omega,U+03C9 ISOgrk3 -->
"\u03D1" to "&thetasym;", // greek small letter theta symbol,U+03D1 NEW -->
"\u03D2" to "&upsih;", // greek upsilon with hook symbol,U+03D2 NEW -->
"\u03D6" to "&piv;", // greek pi symbol, U+03D6 ISOgrk3 -->
// <!-- General Punctuation -->
"\u2022" to "&bull;", // bullet = black small circle,U+2022 ISOpub -->
// <!-- bullet is NOT the same as bullet operator, U+2219 -->
"\u2026" to "&hellip;", // horizontal ellipsis = three dot leader,U+2026 ISOpub -->
"\u2032" to "&prime;", // prime = minutes = feet, U+2032 ISOtech -->
"\u2033" to "&Prime;", // double prime = seconds = inches,U+2033 ISOtech -->
"\u203E" to "&oline;", // overline = spacing overscore,U+203E NEW -->
"\u2044" to "&frasl;", // fraction slash, U+2044 NEW -->
// <!-- Letterlike Symbols -->
"\u2118" to "&weierp;", // script capital P = power set= Weierstrass p, U+2118 ISOamso -->
"\u2111" to "&image;", // blackletter capital I = imaginary part,U+2111 ISOamso -->
"\u211C" to "&real;", // blackletter capital R = real part symbol,U+211C ISOamso -->
"\u2122" to "&trade;", // trade mark sign, U+2122 ISOnum -->
"\u2135" to "&alefsym;", // alef symbol = first transfinite cardinal,U+2135 NEW -->
// <!-- alef symbol is NOT the same as hebrew letter alef,U+05D0 although the
// same glyph could be used to depict both characters -->
// <!-- Arrows -->
"\u2190" to "&larr;", // leftwards arrow, U+2190 ISOnum -->
"\u2191" to "&uarr;", // upwards arrow, U+2191 ISOnum-->
"\u2192" to "&rarr;", // rightwards arrow, U+2192 ISOnum -->
"\u2193" to "&darr;", // downwards arrow, U+2193 ISOnum -->
"\u2194" to "&harr;", // left right arrow, U+2194 ISOamsa -->
"\u21B5" to "&crarr;", // downwards arrow with corner leftwards= carriage return, U+21B5 NEW -->
"\u21D0" to "&lArr;", // leftwards double arrow, U+21D0 ISOtech -->
// <!-- ISO 10646 does not say that lArr is the same as the 'is implied by'
// arrow but also does not have any other character for that function.
// So ? lArr canbe used for 'is implied by' as ISOtech suggests -->
"\u21D1" to "&uArr;", // upwards double arrow, U+21D1 ISOamsa -->
"\u21D2" to "&rArr;", // rightwards double arrow,U+21D2 ISOtech -->
// <!-- ISO 10646 does not say this is the 'implies' character but does not
// have another character with this function so ?rArr can be used for
// 'implies' as ISOtech suggests -->
"\u21D3" to "&dArr;", // downwards double arrow, U+21D3 ISOamsa -->
"\u21D4" to "&hArr;", // left right double arrow,U+21D4 ISOamsa -->
// <!-- Mathematical Operators -->
"\u2200" to "&forall;", // for all, U+2200 ISOtech -->
"\u2202" to "&part;", // partial differential, U+2202 ISOtech -->
"\u2203" to "&exist;", // there exists, U+2203 ISOtech -->
"\u2205" to "&empty;", // empty set = null set = diameter,U+2205 ISOamso -->
"\u2207" to "&nabla;", // nabla = backward difference,U+2207 ISOtech -->
"\u2208" to "&isin;", // element of, U+2208 ISOtech -->
"\u2209" to "&notin;", // not an element of, U+2209 ISOtech -->
"\u220B" to "&ni;", // contains as member, U+220B ISOtech -->
// <!-- should there be a more memorable name than 'ni'? -->
"\u220F" to "&prod;", // n-ary product = product sign,U+220F ISOamsb -->
// <!-- prod is NOT the same character as U+03A0 'greek capital letter pi'
// though the same glyph might be used for both -->
"\u2211" to "&sum;", // n-ary summation, U+2211 ISOamsb -->
// <!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
// though the same glyph might be used for both -->
"\u2212" to "&minus;", // minus sign, U+2212 ISOtech -->
"\u2217" to "&lowast;", // asterisk operator, U+2217 ISOtech -->
"\u221A" to "&radic;", // square root = radical sign,U+221A ISOtech -->
"\u221D" to "&prop;", // proportional to, U+221D ISOtech -->
"\u221E" to "&infin;", // infinity, U+221E ISOtech -->
"\u2220" to "&ang;", // angle, U+2220 ISOamso -->
"\u2227" to "&and;", // logical and = wedge, U+2227 ISOtech -->
"\u2228" to "&or;", // logical or = vee, U+2228 ISOtech -->
"\u2229" to "&cap;", // intersection = cap, U+2229 ISOtech -->
"\u222A" to "&cup;", // union = cup, U+222A ISOtech -->
"\u222B" to "&int;", // integral, U+222B ISOtech -->
"\u2234" to "&there4;", // therefore, U+2234 ISOtech -->
"\u223C" to "&sim;", // tilde operator = varies with = similar to,U+223C ISOtech -->
// <!-- tilde operator is NOT the same character as the tilde, U+007E,although
// the same glyph might be used to represent both -->
"\u2245" to "&cong;", // approximately equal to, U+2245 ISOtech -->
"\u2248" to "&asymp;", // almost equal to = asymptotic to,U+2248 ISOamsr -->
"\u2260" to "&ne;", // not equal to, U+2260 ISOtech -->
"\u2261" to "&equiv;", // identical to, U+2261 ISOtech -->
"\u2264" to "&le;", // less-than or equal to, U+2264 ISOtech -->
"\u2265" to "&ge;", // greater-than or equal to,U+2265 ISOtech -->
"\u2282" to "&sub;", // subset of, U+2282 ISOtech -->
"\u2283" to "&sup;", // superset of, U+2283 ISOtech -->
// <!-- note that nsup, 'not a superset of, U+2283' is not covered by the
// Symbol font encoding and is not included. Should it be, for symmetry?
// It is in ISOamsn -->,
"\u2284" to "&nsub;", // not a subset of, U+2284 ISOamsn -->
"\u2286" to "&sube;", // subset of or equal to, U+2286 ISOtech -->
"\u2287" to "&supe;", // superset of or equal to,U+2287 ISOtech -->
"\u2295" to "&oplus;", // circled plus = direct sum,U+2295 ISOamsb -->
"\u2297" to "&otimes;", // circled times = vector product,U+2297 ISOamsb -->
"\u22A5" to "&perp;", // up tack = orthogonal to = perpendicular,U+22A5 ISOtech -->
"\u22C5" to "&sdot;", // dot operator, U+22C5 ISOamsb -->
// <!-- dot operator is NOT the same character as U+00B7 middle dot -->
// <!-- Miscellaneous Technical -->
"\u2308" to "&lceil;", // left ceiling = apl upstile,U+2308 ISOamsc -->
"\u2309" to "&rceil;", // right ceiling, U+2309 ISOamsc -->
"\u230A" to "&lfloor;", // left floor = apl downstile,U+230A ISOamsc -->
"\u230B" to "&rfloor;", // right floor, U+230B ISOamsc -->
"\u2329" to "&lang;", // left-pointing angle bracket = bra,U+2329 ISOtech -->
// <!-- lang is NOT the same character as U+003C 'less than' or U+2039 'single left-pointing angle quotation
// mark' -->
"\u232A" to "&rang;", // right-pointing angle bracket = ket,U+232A ISOtech -->
// <!-- rang is NOT the same character as U+003E 'greater than' or U+203A
// 'single right-pointing angle quotation mark' -->
// <!-- Geometric Shapes -->
"\u25CA" to "&loz;", // lozenge, U+25CA ISOpub -->
// <!-- Miscellaneous Symbols -->
"\u2660" to "&spades;", // black spade suit, U+2660 ISOpub -->
// <!-- black here seems to mean filled as opposed to hollow -->
"\u2663" to "&clubs;", // black club suit = shamrock,U+2663 ISOpub -->
"\u2665" to "&hearts;", // black heart suit = valentine,U+2665 ISOpub -->
"\u2666" to "&diams;", // black diamond suit, U+2666 ISOpub -->
// <!-- Latin Extended-A -->
"\u0152" to "&OElig;", // -- latin capital ligature OE,U+0152 ISOlat2 -->
"\u0153" to "&oelig;", // -- latin small ligature oe, U+0153 ISOlat2 -->
// <!-- ligature is a misnomer, this is a separate character in some languages -->
"\u0160" to "&Scaron;", // -- latin capital letter S with caron,U+0160 ISOlat2 -->
"\u0161" to "&scaron;", // -- latin small letter s with caron,U+0161 ISOlat2 -->
"\u0178" to "&Yuml;", // -- latin capital letter Y with diaeresis,U+0178 ISOlat2 -->
// <!-- Spacing Modifier Letters -->
"\u02C6" to "&circ;", // -- modifier letter circumflex accent,U+02C6 ISOpub -->
"\u02DC" to "&tilde;", // small tilde, U+02DC ISOdia -->
// <!-- General Punctuation -->
"\u2002" to "&ensp;", // en space, U+2002 ISOpub -->
"\u2003" to "&emsp;", // em space, U+2003 ISOpub -->
"\u2009" to "&thinsp;", // thin space, U+2009 ISOpub -->
"\u200C" to "&zwnj;", // zero width non-joiner,U+200C NEW RFC 2070 -->
"\u200D" to "&zwj;", // zero width joiner, U+200D NEW RFC 2070 -->
"\u200E" to "&lrm;", // left-to-right mark, U+200E NEW RFC 2070 -->
"\u200F" to "&rlm;", // right-to-left mark, U+200F NEW RFC 2070 -->
"\u2013" to "&ndash;", // en dash, U+2013 ISOpub -->
"\u2014" to "&mdash;", // em dash, U+2014 ISOpub -->
"\u2018" to "&lsquo;", // left single quotation mark,U+2018 ISOnum -->
"\u2019" to "&rsquo;", // right single quotation mark,U+2019 ISOnum -->
"\u201A" to "&sbquo;", // single low-9 quotation mark, U+201A NEW -->
"\u201C" to "&ldquo;", // left double quotation mark,U+201C ISOnum -->
"\u201D" to "&rdquo;", // right double quotation mark,U+201D ISOnum -->
"\u201E" to "&bdquo;", // double low-9 quotation mark, U+201E NEW -->
"\u2020" to "&dagger;", // dagger, U+2020 ISOpub -->
"\u2021" to "&Dagger;", // double dagger, U+2021 ISOpub -->
"\u2030" to "&permil;", // per mille sign, U+2030 ISOtech -->
"\u2039" to "&lsaquo;", // single left-pointing angle quotation mark,U+2039 ISO proposed -->
// <!-- lsaquo is proposed but not yet ISO standardized -->
"\u203A" to "&rsaquo;", // single right-pointing angle quotation mark,U+203A ISO proposed -->
// <!-- rsaquo is proposed but not yet ISO standardized -->
"\u20AC" to "&euro;" // -- euro sign, U+20AC NEW -->
)
/**
* Reverse of [.HTML40_EXTENDED_ESCAPE] for unescaping purposes.
*/
val HTML40_EXTENDED_UNESCAPE: Map<CharSequence, CharSequence> = HTML40_EXTENDED_ESCAPE.invert()
/**
* A Map&lt;CharSequence, CharSequence&gt; to escape the basic XML and HTML
* character entities.
*
* Namely: `" & < >`
*/
val BASIC_ESCAPE: Map<CharSequence, CharSequence> = mapOf(
"\"" to "&quot;", // " - double-quote
"&" to "&amp;", // & - ampersand
"<" to "&lt;", // < - less-than
">" to "&gt;" // > - greater-than
)
/**
* Reverse of [.BASIC_ESCAPE] for unescaping purposes.
*/
val BASIC_UNESCAPE: Map<CharSequence, CharSequence> = BASIC_ESCAPE.invert()
/**
* A Map&lt;CharSequence, CharSequence&gt; to escape the apostrophe character to
* its XML character entity.
*/
val APOS_ESCAPE: Map<CharSequence, CharSequence> = mapOf(
"'" to "&apos;" // XML apostrophe
)
/**
* Reverse of [.APOS_ESCAPE] for unescaping purposes.
*/
val APOS_UNESCAPE: Map<CharSequence, CharSequence> = APOS_ESCAPE.invert()
/**
* Used to invert an escape Map into an unescape Map.
* @param this@invert Map&lt;String, String&gt; to be inverted
* @return Map&lt;String, String&gt; inverted array
*/
private fun <K, V> Map<K, V>.invert(): Map<V, K> {
val newMap = HashMap<V, K>()
val it = entries.iterator()
while (it.hasNext()) {
val pair = it.next()
newMap[pair.value] = pair.key
}
return newMap
}
}

Some files were not shown because too many files have changed in this diff Show More