Android 7.1でランチャーアイコンが消えてしまっていた

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "jp.juggler.subwaytooter"
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode 191
-        versionName "1.9.1"
+        versionCode 192
+        versionName "1.9.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 

app/src/main/AndroidManifest.xml

@@ -18,7 +18,6 @@
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_spec"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:supportsRtl="true"

app/src/main/java/jp/juggler/subwaytooter/api_tootsearch/entity/TSToot.java

@@ -101,12 +101,16 @@ public class TSToot extends TootStatusLike {
 		JSONArray array = TSClient.getHits( root );
 		if( array != null ){
 			for( int i = 0, ie = array.length() ; i < ie ; ++ i ){
-				JSONObject src = array.optJSONObject( i );
-				if( src == null ) continue;
-				JSONObject src2 = src.optJSONObject( "_source" );
-				TSToot item = parse( context, access_info, src2 );
-				if( item == null ) continue;
-				list.add( item );
+				try{
+					JSONObject src = array.optJSONObject( i );
+					if( src == null ) continue;
+					JSONObject src2 = src.optJSONObject( "_source" );
+					TSToot item = parse( context, access_info, src2 );
+					if( item == null ) continue;
+					list.add( item );
+				}catch(Throwable ex){
+					log.trace(ex);
+				}
 			}
 		}
 		return list;

app/src/main/java/jp/juggler/subwaytooter/util/CustomEmojiCache.java

@@ -63,7 +63,7 @@ public class CustomEmojiCache {
 		}
 	}
 	
-	final ConcurrentHashMap< String, CacheItem > cache = new ConcurrentHashMap<>();
+	@NonNull final ConcurrentHashMap< String, CacheItem > cache = new ConcurrentHashMap<>();
 	
 	////////////////////////////////
 	// リクエスト
@@ -110,16 +110,22 @@ public class CustomEmojiCache {
 			long now = getNow();
 			
 			// 成功キャッシュ
-			CacheItem item = cache.get( url );
-			if( item != null ){
-				item.time_used = now;
-				return item.frames;
-			}
-			
-			// エラーキャッシュ
-			Long time_error = cache_error.get( url );
-			if( time_error != null && now < time_error + ERROR_EXPIRE ){
-				return null;
+			try{
+				CacheItem item = cache.get( url );
+				if( item != null ){
+					item.time_used = now;
+					return item.frames;
+				}
+				
+				// エラーキャッシュ
+				Long time_error = cache_error.get( url );
+				if( time_error != null && now < time_error + ERROR_EXPIRE ){
+					return null;
+				}
+			}catch(Throwable ex){
+				// NullPointerException at java.util.concurrent.ConcurrentHashMap.get (ConcurrentHashMap.java:915)
+				
+				log.trace(ex);
 			}
 		}
 		synchronized( queue ){

app/src/main/res/values/colors.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#51a7ff</color>
-
     <color name="Light_colorColumnListItemText">#80000000</color>
     <color name="Light_colorTimeSmall">#80000000</color>
     <color name="Light_colorColumnHeaderAcct">#80000000</color>