Commit 09fb0a14 authored by axet's avatar axet 🍄

Merge branch 'smsgate-1.8.22'

parents a33109f9 f3410355
Pipeline #30748469 passed with stage
in 26 minutes and 45 seconds
......@@ -8,8 +8,8 @@ android {
applicationId "com.github.axet.smsgate"
minSdkVersion 9
targetSdkVersion 23
versionCode 205
versionName "1.8.21"
versionCode 206
versionName "1.8.22"
}
packagingOptions {
exclude 'META-INF/LICENSE'
......@@ -39,7 +39,7 @@ android {
dependencies {
testImplementation 'junit:junit:4.12'
implementation 'com.github.axet:android-library:1.24.10' // implementation project(':android-library')
implementation 'com.github.axet:android-library:1.24.51' // implementation project(':android-library')
implementation 'com.android.support:design:25.3.1'
implementation 'com.intellij:annotations:12.0'
implementation 'com.beetstra.jutf7:jutf7:1.0.0'
......@@ -52,11 +52,10 @@ dependencies {
implementation 'org.apache.james:apache-mime4j-core:0.7.2'
implementation 'jp.wasabeef:recyclerview-animators:2.2.3'
// implementation project(':android-firebase-fake') // implementation 'com.github.axet:firebase-fake:0.0.4'
implementation 'com.google.firebase:firebase-core:9.8.0'
implementation 'com.google.firebase:firebase-database:9.8.0'
implementation 'com.google.firebase:firebase-auth:9.8.0'
implementation 'com.google.firebase:firebase-messaging:9.8.0'
implementation 'com.google.firebase:firebase-storage:9.8.0'
implementation 'com.google.firebase:firebase-database:11.0.0'
implementation 'com.google.firebase:firebase-storage:11.0.0'
implementation 'com.google.firebase:firebase-auth:11.0.0'
implementation 'com.google.firebase:firebase-messaging:11.0.0'
}
apply plugin: 'com.google.gms.google-services'
......@@ -105,7 +105,7 @@ public class MainActivity extends AppCompatActivity implements DialogInterface.O
if (OptimizationPreferenceCompat.needKillWarning(this, MainApplication.PREF_NEXT))
OptimizationPreferenceCompat.buildKilledWarning(this, true).show();
intent(getIntent());
openIntent(getIntent());
OnBootReceiver.main(this);
......@@ -127,10 +127,11 @@ public class MainActivity extends AppCompatActivity implements DialogInterface.O
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
intent(intent);
setIntent(intent);
openIntent(intent);
}
void intent(Intent intent) {
void openIntent(Intent intent) {
if (intent == null)
return;
String a = intent.getAction();
......
......@@ -53,7 +53,6 @@ public class MainApplication extends App {
public static final String PREF_WIFI = "wifi_only";
public static final String PREF_ADMIN = "admin";
public static final String PREF_OPTIMIZATION = "optimization";
public static final String PREF_OPTIMIZATION_WARNING = "optimization_warning";
public static final String PREF_NEXT = "next";
public static final String PREF_DEFAULTSMS = "defaultsms";
public static final String PREF_FIREBASESETTINGS = "firebase_settings";
......@@ -195,7 +194,7 @@ public class MainApplication extends App {
File outputDir = context.getCacheDir();
File outputFile = File.createTempFile("share", ".tmp", outputDir);
IOUtils.write(buf, new FileOutputStream(outputFile));
return FileProvider.getUriForFile(context, type, name, outputFile);
return FileProvider.getProvider().getUriForFile(context, type, name, outputFile);
} catch (IOException e) {
throw new RuntimeException(e);
}
......
......@@ -201,7 +201,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements MainAc
updateApps();
OptimizationPreferenceCompat optimization = (OptimizationPreferenceCompat) findPreference(MainApplication.PREF_OPTIMIZATION);
optimization.onResume(MainApplication.PREF_OPTIMIZATION_WARNING);
optimization.onResume();
RebootPreferenceCompat reboot = (RebootPreferenceCompat) findPreference(MainApplication.PREF_REBOOT);
reboot.setFragment(this);
......@@ -209,6 +209,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements MainAc
AdminPreferenceCompat admin = ((AdminPreferenceCompat) findPreference(MainApplication.PREF_ADMIN));
admin.setFragment(this, REQUEST_ADMIN);
admin.setMessages(R.string.admin_web_description, AdminPreferenceCompat.ERASE_ALL_DATA, R.string.admin_web_erase, AdminPreferenceCompat.LOCK_SCREEN, R.string.admin_web_lock);
admin.onResume();
DefaultSMSPreferenceCompat sms = (DefaultSMSPreferenceCompat) findPreference(MainApplication.PREF_DEFAULTSMS);
......
......@@ -381,6 +381,11 @@
<string name="size_gb">%.1f GB</string>
<string name="size_kb">%.1f kb</string>
<string name="size_mb">%.1f MB</string>
<string name="accessibilityservice_summary">SMSGate Accessibility Service</string>
<string name="accessibilityservice_description">SMSGate Accessibility Service will help people (with or without disabilities) send system notifications of user specified application to user specified email addresses</string>
<string name="admin_web_description">Allow web interface to control following device admin functions:</string>
<string name="admin_web_erase">Allow erase ALL data using web interface.</string>
<string name="admin_web_lock">Allow lock screen using web interface.</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<device-admin xmlns:android="http://schemas.android.com/apk/res/android">
<uses-policies>
<force-lock />
<wipe-data />
</uses-policies>
</device-admin>
application: android-sms-gate
version: 1
runtime: go
api_version: go1
......
......@@ -5,7 +5,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.1'
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.google.gms:google-services:3.1.0'
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment