Skip to content

Commit d7f0a73

Browse files
committed
update to 1.5
1 parent 26fd7e8 commit d7f0a73

25 files changed

+29
-25
lines changed

.idea/compiler.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "top.linesoft.open2share"
88
minSdkVersion 21
99
targetSdkVersion 30
10-
versionCode 5
11-
versionName '1.4'
10+
versionCode 6
11+
versionName '1.5'
1212
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313
}
1414
buildTypes {
@@ -26,10 +26,10 @@ android {
2626
dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
implementation 'androidx.appcompat:appcompat:1.2.0'
29-
implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
29+
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
3030
implementation 'androidx.preference:preference:1.1.1'
3131
//implementation 'com.blankj:utilcodex:1.29.0'
32-
testImplementation 'junit:junit:4.13'
32+
testImplementation 'junit:junit:4.13.2'
3333
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
3434
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
3535
}

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
android:name="hide_icon">
3939
<intent-filter>
4040
<action android:name="android.intent.action.MAIN" />
41+
42+
<!-- 为了使图标从桌面隐藏-->
4143
<data
4244
android:host="linesoft_abc"
4345
android:scheme="top.linesoft.open2share.abc" />
@@ -52,9 +54,7 @@
5254
android:label="@string/convert_text"
5355
tools:ignore="AppLinkUrlError">
5456
<action android:name="android.intent.action.VIEW" />
55-
5657
<category android:name="android.intent.category.DEFAULT" />
57-
5858
<data android:mimeType="*/*" />
5959
</intent-filter>
6060
</activity>

app/src/main/java/top/linesoft/open2share/ReceiveOpenActivity.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.os.StrictMode;
65

76
import androidx.annotation.Nullable;
87
import androidx.appcompat.app.AppCompatActivity;
@@ -26,9 +25,12 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
2625
@Override
2726
protected void onCreate(Bundle savedInstanceState) {
2827
super.onCreate(savedInstanceState);
29-
StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
30-
StrictMode.setVmPolicy(builder.build());
31-
builder.detectFileUriExposure();
28+
29+
//解决极少数旧App未使用URI分享会导致报错的问题
30+
//目前来看这类应用极少,先注释掉了
31+
// StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
32+
// StrictMode.setVmPolicy(builder.build());
33+
// builder.detectFileUriExposure();
3234

3335
setContentView(R.layout.activity_receive_open);
3436
//Toast.makeText(this,"已经将打开文件转换为分享文件",Toast.LENGTH_LONG).show();

app/src/main/java/top/linesoft/open2share/SettingsActivity.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ public static class SettingsFragment extends PreferenceFragmentCompat implements
3636
SwitchPreference hidePreference;
3737
Preference aboutPreference;
3838

39-
/**
40-
* Called when a preference has been clicked.
41-
*
42-
* @param preference The preference that was clicked
43-
* @return {@code true} if the click was handled
44-
*/
4539
@Override
4640
public boolean onPreferenceClick(Preference preference) {
4741
if (preference == guidePreference){
-44.6 KB
Loading
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@mipmap/open2share_icon_background"/>
3+
<background android:drawable="@color/open2share_icon_background"/>
44
<foreground android:drawable="@drawable/open2share_icon_foreground"/>
55
</adaptive-icon>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@mipmap/open2share_icon_background"/>
3+
<background android:drawable="@color/open2share_icon_background"/>
44
<foreground android:drawable="@drawable/open2share_icon_foreground"/>
55
</adaptive-icon>

0 commit comments

Comments
 (0)