Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'autoVerify-false' into 'master'

Browse Source 
set App Link Auto Verify to false

See merge request fdroid/fdroidclient!896
This commit is contained in:
Hans-Christoph Steiner 2020-06-25 15:15:16 +00:00
commit 73f1725da9
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
View File

@ -124,7 +124,7 @@ public final class LocalRepoManager {
private String writeFdroidApkToWebroot() { private String writeFdroidApkToWebroot() {
ApplicationInfo appInfo; ApplicationInfo appInfo;
String fdroidClientURL = "https://f-droid.org/FDroid.apk"; String fdroidClientURL = "https://f-droid.org/F-Droid.apk";
try { try {
appInfo = pm.getApplicationInfo(fdroidPackageName, PackageManager.GET_META_DATA); appInfo = pm.getApplicationInfo(fdroidPackageName, PackageManager.GET_META_DATA);

12
app/src/main/AndroidManifest.xml
View File

@ -301,7 +301,7 @@
<data android:scheme="fdroid.app"/> <data android:scheme="fdroid.app"/>
</intent-filter> </intent-filter>
<intent-filter android:autoVerify="true"> <intent-filter android:autoVerify="false">
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
@ -319,7 +319,7 @@
<data android:pathPattern="/.*/packages/.*/"/> <data android:pathPattern="/.*/packages/.*/"/>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter android:autoVerify="false">
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
@ -346,7 +346,7 @@
<data android:scheme="market" android:host="details"/> <data android:scheme="market" android:host="details"/>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter android:autoVerify="false">
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
@ -367,7 +367,7 @@
<data android:scheme="amzn" android:host="apps" android:path="/android"/> <data android:scheme="amzn" android:host="apps" android:path="/android"/>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter android:autoVerify="false">
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
@ -401,7 +401,7 @@
<data android:scheme="market" android:host="search"/> <data android:scheme="market" android:host="search"/>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter android:autoVerify="false">
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
@ -439,7 +439,7 @@
This filter supports HTTP and HTTPS schemes. There is an additional filter for This filter supports HTTP and HTTPS schemes. There is an additional filter for
fdroidrepo:// and fdroidrepos:// fdroidrepo:// and fdroidrepos://
--> -->
<intent-filter> <intent-filter android:autoVerify="false">
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.BROWSABLE"/> <category android:name="android.intent.category.BROWSABLE"/>

2
app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java
View File

@ -262,7 +262,7 @@ public class AppDetailsActivity extends AppCompatActivity
shareIntent.setType("text/plain"); shareIntent.setType("text/plain");
shareIntent.putExtra(Intent.EXTRA_SUBJECT, app.name); shareIntent.putExtra(Intent.EXTRA_SUBJECT, app.name);
shareIntent.putExtra(Intent.EXTRA_TEXT, app.name + " (" + app.summary shareIntent.putExtra(Intent.EXTRA_TEXT, app.name + " (" + app.summary
+ ") - https://f-droid.org/app/" + app.packageName); + ") - https://f-droid.org/packages/" + app.packageName);
boolean showNearbyItem = app.isInstalled(getApplicationContext()) && bluetoothAdapter != null; boolean showNearbyItem = app.isInstalled(getApplicationContext()) && bluetoothAdapter != null;
CoordinatorLayout coordinatorLayout = (CoordinatorLayout) findViewById(R.id.rootCoordinator); CoordinatorLayout coordinatorLayout = (CoordinatorLayout) findViewById(R.id.rootCoordinator);