Skip to content

Update Toolchain/Android-Target to v24 #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 21 commits into from
Nov 2, 2016
Merged

Update Toolchain/Android-Target to v24 #214

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
232e555
bump to v24 incl. toolchain, jdk8 etc.
AndyScherzinger Aug 15, 2016
9ff3aff
added jcenter repo
AndyScherzinger Aug 15, 2016
3f2d376
link to v24 version of the Nc lib
AndyScherzinger Aug 15, 2016
609647e
Revert "added jcenter repo"
AndyScherzinger Aug 15, 2016
5f5f0ce
lib1.0.4
AndyScherzinger Aug 15, 2016
f133eaa
rebase/merge
AndyScherzinger Aug 16, 2016
3115066
Update build tools to 24.0.1, java7 compat
AndyScherzinger Aug 16, 2016
c2b813c
no pre-dexing on travis (performance)
AndyScherzinger Aug 16, 2016
eb10fb0
bump Android SDK Build-Tools to 24.0.2
AndyScherzinger Aug 29, 2016
30ac692
change emulator ready detection again, disable running sample instrum…
AndyScherzinger Aug 29, 2016
a91607b
reactive instrumented demo test
AndyScherzinger Aug 30, 2016
bb8cad8
Revert "reactive instrumented demo test"
AndyScherzinger Aug 30, 2016
aa0e4b8
Fix crash opening or sending files in Android 7
davivel Aug 31, 2016
6b848b4
fixes
AndyScherzinger Aug 31, 2016
616a2ff
fix android-lib reference
AndyScherzinger Sep 1, 2016
41badb3
update support library
AndyScherzinger Oct 4, 2016
9579e06
fix after rebase
AndyScherzinger Oct 6, 2016
aeba303
bump to 2.2.2 and v25
AndyScherzinger Oct 24, 2016
fff08ef
manifest bump v25
AndyScherzinger Oct 24, 2016
0eb7319
revert to build v24 to to lack of drone CI support
AndyScherzinger Oct 26, 2016
c30920e
bump lib to 1.0.8
AndyScherzinger Nov 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix after rebase
  • Loading branch information
@AndyScherzinger
AndyScherzinger committed Nov 2, 2016
commit 9579e0626dca0bb44363bd095baaecade905808a
18 changes: 9 additions & 9 deletions src/com/owncloud/android/ui/helpers/FileOperationsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
import com.owncloud.android.lib.common.network.WebdavUtils;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.lib.resources.shares.OCShare;
import com.owncloud.android.lib.resources.shares.ShareType;
Expand Down Expand Up @@ -100,7 +99,6 @@ private String getUrlFromFile(String storagePath, Pattern pattern) {
}
} catch (IOException e) {
Log_OC.d(TAG, e.getMessage());
return null;
} finally {
if (br != null) {
try {
Expand Down Expand Up @@ -145,7 +143,6 @@ private Intent createIntentFromFile(String storagePath) {
public void openFile(OCFile file) {
if (file != null) {
String storagePath = file.getStoragePath();
Uri uri = Uri.parse("file://" + encodedStoragePath);

Intent openFileWithIntent = null;
int lastIndexOfDot = storagePath.lastIndexOf('.');
Expand All @@ -154,7 +151,10 @@ public void openFile(OCFile file) {
String guessedMimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExt);
if (guessedMimeType != null) {
openFileWithIntent = new Intent(Intent.ACTION_VIEW);
openFileWithIntent.setDataAndType(uri, guessedMimeType);
openFileWithIntent.setDataAndType(
file.getExposedFileUri(mFileActivity),
guessedMimeType
);
}
}

Expand All @@ -164,13 +164,13 @@ public void openFile(OCFile file) {

if (openFileWithIntent == null) {
openFileWithIntent = new Intent(Intent.ACTION_VIEW);
openFileWithIntent.setDataAndType(uri, file.getMimetype());
openFileWithIntent.setDataAndType(
file.getExposedFileUri(mFileActivity),
file.getMimetype()
);
}

openFileWithIntent.setFlags(
Intent.FLAG_GRANT_READ_URI_PERMISSION |
Intent.FLAG_GRANT_WRITE_URI_PERMISSION
);
openFileWithIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);

List<ResolveInfo> launchables = mFileActivity.getPackageManager().
queryIntentActivities(openFileWithIntent, PackageManager.GET_INTENT_FILTERS);
Expand Down