Skip to content

Commit 4e48cbb

Browse files
committed
[lib] Reduced minor code duplication
1 parent a8cec57 commit 4e48cbb

File tree

1 file changed

+7
-4
lines changed
  • tehreer-android/src/main/java/com/mta/tehreer/graphics

1 file changed

+7
-4
lines changed

tehreer-android/src/main/java/com/mta/tehreer/graphics/Typeface.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,18 @@ private void setupVariations() {
183183
}
184184

185185
private void setupNames() {
186+
NameTable nameTable = NameTable.from(this);
187+
if (nameTable == null) {
188+
return;
189+
}
190+
186191
final int[] nameRecordIndexes = new int[3];
187192
nGetNameRecordIndexes(nativeTypeface, nameRecordIndexes);
188193

189194
final int familyNameIndex = nameRecordIndexes[0];
190195
final int styleNameIndex = nameRecordIndexes[1];
191196
final int fullNameIndex = nameRecordIndexes[2];
192197

193-
NameTable nameTable = NameTable.from(this);
194-
195198
if (familyNameIndex != -1) {
196199
String recordString = nameTable.recordAt(familyNameIndex).string();
197200
if (recordString != null) {
@@ -201,13 +204,13 @@ private void setupNames() {
201204
if (styleNameIndex != -1) {
202205
String recordString = nameTable.recordAt(styleNameIndex).string();
203206
if (recordString != null) {
204-
styleName = nameTable.recordAt(styleNameIndex).string();
207+
styleName = recordString;
205208
}
206209
}
207210
if (fullNameIndex != -1) {
208211
String recordString = nameTable.recordAt(fullNameIndex).string();
209212
if (recordString != null) {
210-
fullName = nameTable.recordAt(fullNameIndex).string();
213+
fullName = recordString;
211214
}
212215
} else {
213216
if (!familyName.isEmpty()) {

0 commit comments

Comments
 (0)