Skip to content

Testing ssl connections #12

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
cesine merged 5 commits into from
Jan 1, 2018
Merged

Testing ssl connections #12

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
241a934
debugged file uploads
cesine Dec 23, 2017
6a1c6e9
requesting network permissions when audio files are added to datum
cesine Dec 27, 2017
bee3da2
overriding upload url
cesine Dec 27, 2017
1efdd24
renamed fielddb class and appending line feed to file
cesine Dec 29, 2017
83ce37c
requesting permissions to write to file to save the sample images
cesine Dec 29, 2017
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
renamed fielddb class and appending line feed to file 
audio upload is working with fielddb 2fc171bac75b9f21ca8d621e9e21e4784ae85c96
  • Loading branch information
@cesine
cesine committed Dec 29, 2017
commit 1efdd241bb42992a509edce6bc666796887de550
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:installLocation="preferExternal">

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.INTERNET" />
Expand Down
7 changes: 3 additions & 4 deletions ...src/main/java/com/github/fielddb/lessons/ui/DatumSpeechRecognitionHypothesesFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,9 @@
import android.widget.TableLayout;
import android.widget.Toast;

import com.github.fielddb.lessons.PrivateConstants;
import com.github.fielddb.database.DatumContentProvider.DatumTable;
import com.github.fielddb.Config;
import com.github.fielddb.datacollection.SecureHttpClient;
import com.github.fielddb.datacollection.MultipartPostRequest;
import com.github.fielddb.service.PocketSphinxRecognitionService;
import com.github.fielddb.service.UploadAudioVideoService;
import com.github.opensourcefieldlinguistics.fielddb.speech.kartuli.R;
Expand Down Expand Up @@ -750,7 +749,7 @@ public void onDestroy() {
super.onDestroy();
return;
}
if (!SecureHttpClient.checkAndRequestPermissions(getActivity(), REQUEST_ID_MULTIPLE_PERMISSIONS)) {
if (!MultipartPostRequest.checkAndRequestPermissions(getActivity(), REQUEST_ID_MULTIPLE_PERMISSIONS)) {
super.onDestroy();
Log.d(Config.TAG, "Missing permissions to upload of audio files ");
return;
Expand Down Expand Up @@ -854,6 +853,6 @@ public void addAudioFile(String filename) {
Log.d(Config.TAG, "Recorded audio " + recognizerAudioFileName);
this.recordUserEvent("captureAudio", recognizerAudioFileName);

SecureHttpClient.checkAndRequestPermissions(getActivity(), REQUEST_ID_MULTIPLE_PERMISSIONS);
MultipartPostRequest.checkAndRequestPermissions(getActivity(), REQUEST_ID_MULTIPLE_PERMISSIONS);
}
}