mirror of https://github.com/M66B/FairEmail.git
Prevent crash
This commit is contained in:
parent
51cd5accf8
commit
f5b38bd806
|
@ -30,7 +30,7 @@
|
||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
|
|
|
@ -32,6 +32,7 @@ import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.ParcelFileDescriptor;
|
import android.os.ParcelFileDescriptor;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
|
import android.text.TextUtils;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
|
@ -503,14 +504,20 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
|
||||||
prefs.edit().putLong("last_update_check", now).apply();
|
prefs.edit().putLong("last_update_check", now).apply();
|
||||||
|
|
||||||
UpdateInfo info = new UpdateInfo();
|
UpdateInfo info = new UpdateInfo();
|
||||||
|
info.tag_name = jroot.getString("tag_name");
|
||||||
info.html_url = jroot.getString("html_url");
|
info.html_url = jroot.getString("html_url");
|
||||||
|
if (TextUtils.isEmpty(info.html_url))
|
||||||
|
return null;
|
||||||
|
|
||||||
JSONArray jassets = jroot.getJSONArray("assets");
|
JSONArray jassets = jroot.getJSONArray("assets");
|
||||||
for (int i = 0; i < jassets.length(); i++) {
|
for (int i = 0; i < jassets.length(); i++) {
|
||||||
JSONObject jasset = jassets.getJSONObject(i);
|
JSONObject jasset = jassets.getJSONObject(i);
|
||||||
if (jasset.has("name")) {
|
if (jasset.has("name")) {
|
||||||
String name = jasset.getString("name");
|
String name = jasset.getString("name");
|
||||||
if (name != null && name.endsWith(".apk")) {
|
if (name != null && name.endsWith(".apk")) {
|
||||||
info.tag_name = jroot.getString("tag_name");
|
if (TextUtils.isEmpty(info.tag_name))
|
||||||
|
info.tag_name = name;
|
||||||
|
|
||||||
Log.i(Helper.TAG, "Latest version=" + info.tag_name);
|
Log.i(Helper.TAG, "Latest version=" + info.tag_name);
|
||||||
if (BuildConfig.VERSION_NAME.equals(info.tag_name))
|
if (BuildConfig.VERSION_NAME.equals(info.tag_name))
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue