Compare commits
4 Commits
android-0.
...
android-0.
Author | SHA1 | Date | |
---|---|---|---|
ffbd8cfb76 | |||
2d1664574d | |||
5d3aa1f625 | |||
3fa53c7654 |
@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
|
||||
android {
|
||||
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)
|
||||
defaultConfig {
|
||||
versionCode 4745245
|
||||
versionCode 4745246
|
||||
versionName "$I2P_VERSION"
|
||||
minSdkVersion 9
|
||||
targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
|
||||
|
@ -5,6 +5,7 @@ import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.preference.PreferenceManager;
|
||||
import net.i2p.android.router.util.Util;
|
||||
|
||||
import net.i2p.android.router.I2PConstants;
|
||||
import net.i2p.android.router.service.RouterService;
|
||||
@ -19,7 +20,12 @@ public class OnBootReceiver extends BroadcastReceiver implements I2PConstants {
|
||||
|
||||
if (startOnBoot) {
|
||||
Intent routerService = new Intent(context, RouterService.class);
|
||||
context.startService(routerService);
|
||||
// Ticket #2404
|
||||
try {
|
||||
context.startService(routerService);
|
||||
} catch (IllegalStateException ex) {
|
||||
Util.e("Error: ", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -67,7 +67,10 @@ public abstract class AbstractWizardModel implements ModelCallbacks {
|
||||
|
||||
public void load(Bundle savedValues) {
|
||||
for (String key : savedValues.keySet()) {
|
||||
mRootPageList.findByKey(key).resetData(savedValues.getBundle(key));
|
||||
// Expanded the code to hunt NPE - Ticket #2389
|
||||
Page tmp = mRootPageList.findByKey(key);
|
||||
Bundle tmpBundle = savedValues.getBundle(key);
|
||||
tmp.resetData(tmpBundle);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -352,5 +352,6 @@
|
||||
<string name="error_logs_copied_to_clipboard">错误日志已复制到剪贴板</string>
|
||||
<string name="logs_copied_to_clipboard">日志已复制到剪贴板</string>
|
||||
<string name="label_browser_configuration">浏览器配置</string>
|
||||
<string name="no_market_app">没有找到应用商店,请手动安装</string>
|
||||
<string name="unset">未设置</string>
|
||||
</resources>
|
||||
|
@ -4,7 +4,7 @@ buildscript {
|
||||
google()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.2.0'
|
||||
classpath 'com.android.tools.build:gradle:3.3.0'
|
||||
classpath 'com.android.tools.lint:lint-gradle:26.1.1'
|
||||
}
|
||||
}
|
||||
|
@ -13,6 +13,6 @@ POM_DEVELOPER_ID=str4d
|
||||
POM_DEVELOPER_NAME=str4d
|
||||
POM_DEVELOPER_EMAIL=str4d@i2pmail.org
|
||||
|
||||
I2P_VERSION=0.9.37
|
||||
I2P_VERSION=0.9.38
|
||||
ANDROID_BUILD_TARGET_SDK_VERSION=26
|
||||
ANDROID_BUILD_SDK_VERSION=26
|
||||
|
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
#Tue Oct 09 23:18:43 CEST 2018
|
||||
#Thu Jan 24 19:09:07 CET 2019
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
|
||||
|
@ -3,5 +3,7 @@
|
||||
<string name="yes">Igen</string>
|
||||
<string name="no">Nem</string>
|
||||
<string name="install_i2p_android">I2P Android telepítése?</string>
|
||||
<string name="you_must_have_i2p_android">Az I2P Android telepítve lennie és futnia kell. Szeretné telepíteni?</string>
|
||||
<string name="start_i2p_android">I2P Android indítása?</string>
|
||||
<string name="would_you_like_to_start_i2p_android">Úgy tűnik, hogy az I2P Android nem fut. Szeretné elindítani?</string>
|
||||
</resources>
|
||||
|
Reference in New Issue
Block a user