sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Logs removed

Browse Source
This commit is contained in:
Caesar2011
2018-10-15 18:34:32 +02:00
parent a9a86c743e
commit 06a430f7fd
8 changed files with 5 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/de/sebse/fuplanner/MainActivity.java
View File

@@ -245,13 +245,11 @@ public class MainActivity extends AppCompatActivity
}
private int getDefaultFragmentAfterLogin(String[] id) {
//log.d("Cookies last_Fragment", last_Fragment);
if (fragmentPage == FRAGMENT_NONE){
id[0] = "";
return FRAGMENT_MODULES;
}
else {
//log.d("changeFragment last_Fragment_id gesetzt", last_Fragment_id);
id[0] = fragmentData;
return fragmentPage;
}
@@ -290,7 +288,6 @@ public class MainActivity extends AppCompatActivity
id[0] = "";
int fragment = getDefaultFragmentAfterLogin(id);
//log.d("changeFragment in checkAndDoLogin:", fragment, id[0]);
this.getKVV().login(credentials.getUsername(), credentials.getPassword(), success -> toLoginState(success, fragment , id[0]),
error -> {
log.e(error);

3
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailEventAdapter.java
View File

@@ -6,7 +6,6 @@ import android.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import java.util.ArrayList;
@@ -15,7 +14,6 @@ import de.sebse.fuplanner.services.KVV.types.Event;
import de.sebse.fuplanner.services.KVV.types.Modules;
import de.sebse.fuplanner.tools.UtilsDate;
import de.sebse.fuplanner.tools.logging.Logger;
import de.sebse.fuplanner.tools.ui.CustomViewHolder;
import de.sebse.fuplanner.tools.ui.ItemViewHolder;
import de.sebse.fuplanner.tools.ui.StringViewHolder;
@@ -86,7 +84,6 @@ class ModDetailEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
@Override
public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int position) {
log.d("ModDetailEventAdapter onBindViewHolder");
if (mValue == null || position > mPositionalData.size())
return;
Pair<Integer, Integer> data = mPositionalData.get(position);

1
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailFragment.java
View File

@@ -59,7 +59,6 @@ public class ModDetailFragment extends Fragment implements ModDetailListener {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
log.d("load instance");
if (getArguments() != null) {
String itemPosition = getArguments().getString(ARG_POSITION);
if (!itemPosition.contains(".")) {

1
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewFragment.java
View File

@@ -86,7 +86,6 @@ public class ModDetailOverviewFragment extends Fragment {
if (getActivity() != null) {
KVV kvv = ((MainActivity) getActivity()).getKVV();
kvv.getModule(mItemPos, (Modules.Module module) -> {
log.d("onRefresh", module);
adapter.setModule(module);
kvv.getModuleDetails(module, pair -> {
adapter.setModule();

6
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java
View File

@@ -162,7 +162,6 @@ public class ModDetailResourceFragment extends Fragment {
private void download(Resource.File file, String modul, boolean downloadNew){
KVV kvv = ((MainActivity) getActivity()).getKVV();
//log.d("ResourceFile berchtigungen: "+ isExternalStorageWritable());
ActivityCompat.requestPermissions(ModDetailResourceFragment.super.getActivity(),
new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
1);
@@ -170,7 +169,6 @@ public class ModDetailResourceFragment extends Fragment {
if(isExternalStorageWritable()){
kvv.getResourceFile(success1 -> {
if (success1.equals("")){//Datei wurde nicht heruntergeladen
log.d("ResourceFile Datei nicht vorhanden");
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getContext());
alertDialogBuilder
.setTitle(R.string.ErrorFileDownload)
@@ -208,12 +206,10 @@ public class ModDetailResourceFragment extends Fragment {
/* Checks if external storage is available for read and write */
public boolean isExternalStorageWritable() {
String state = Environment.getExternalStorageState();
//log.d("ResourceFile Environment.getExternalStorageState()"+state);
//log.d("ResourceFile Environment.MEDIA_MOUNTED"+Environment.MEDIA_MOUNTED);
if (Environment.MEDIA_MOUNTED.equals(state)) {
return true;
}
log.d("Dateisystem: kein schreiben möglich");
log.e("Dateisystem: kein schreiben möglich");
return false;
}

19
app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
View File

@@ -144,7 +144,6 @@ class KVVModuleList extends HTTPService {
public void getModule(String id, final NetworkCallback<Modules.Module> callback, final NetworkErrorCallback errorCallback, boolean forceRefresh) {
this.getModuleList(success -> {
log.d("liste", success.size(), id, success.get(id));
callback.onResponse(success.get(id));
}, errorCallback, forceRefresh);
}
@@ -510,7 +509,6 @@ class KVVModuleList extends HTTPService {
}
}
}
log.d(root);
// Empty resources *may be* because token is invalid -> check
if (root.size() == 0)
@@ -523,14 +521,11 @@ class KVVModuleList extends HTTPService {
}
public void getResourceFile( final NetworkCallback<String> callback, final NetworkErrorCallback errorCallback, String Filename, String url, String moduleName, boolean downloadNew) {
//log.d("ResourceFile schreibrechte", WRITE_EXTERNAL_STORAGE);
//queueModuleDetails.add(module.getID(), () -> {
if (isExternalStorageReadable()){
File f = new File(Environment.getExternalStoragePublicDirectory(
Environment.DIRECTORY_DOWNLOADS)+"/"+moduleName+"/"+Filename);
if (f.exists() && !downloadNew) {//prüffen ob bereits herunter gelagen und nicht erneut heruntergeladen werden...
callback.onResponse(f.getPath());
log.d("ResourceFile laden aus Speicher");
return;
}
}
@@ -557,15 +552,11 @@ class KVVModuleList extends HTTPService {
callback.onResponse(pfad[0]);
}
else if (response.getBytes()==null){
log.d("ResourceFile neu einlogen");
testLogin(token, token -> {
if (isExternalStorageWritable()) {
get(url, token.getCookies(), response2 ->{//probiern die Datei erneut zu laden
log.d("ResourceFile: response2",response2.getParsed());
pfad[0] = saveFileInDownloads(Filename, response2, moduleName);
log.d("ResourceFile: pfad[0] 2",pfad[0]);
callback.onResponse(pfad[0]);
log.d("ResourceFile: ", token);
}, error -> errorCallback.onError(new NetworkError(101705, error.networkResponse.statusCode, "Cannot get File!")));
} else {
errorCallback.onError(new NetworkError(101703, 403, "Exgternal storage not writeable!"));
@@ -574,7 +565,6 @@ class KVVModuleList extends HTTPService {
}
else if (isExternalStorageWritable()) {
pfad[0] = saveFileInDownloads(Filename, response, moduleName);
//log.d("ResourceFile: ", token);
callback.onResponse(pfad[0]);
} else {
errorCallback.onError(new NetworkError(101704, 403, "Exgternal storage not writeable!"));
@@ -615,7 +605,7 @@ class KVVModuleList extends HTTPService {
if (Environment.MEDIA_MOUNTED.equals(state)) {
return true;
}
log.d("Dateisystem: kein schreiben möglich");
log.w("File system: Writing not possible!");
return false;
}
@@ -626,7 +616,7 @@ class KVVModuleList extends HTTPService {
Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
return true;
}
log.d("Dateisystem: kein lesen möglich");
log.w("File system: Reading not possible!");
return false;
}
public String saveFileInDownloads(String filename, Result datei, String moduleName) {
@@ -634,8 +624,7 @@ class KVVModuleList extends HTTPService {
File ordner = new File(Environment.getExternalStoragePublicDirectory(
Environment.DIRECTORY_DOWNLOADS), moduleName);
if (!ordner.mkdir()) {
//Log.e(LOG_TAG, "Directory not created");
log.d( "Directory not created");
log.w( "Directory not created");
}
String pfad="";
try {
@@ -645,7 +634,7 @@ class KVVModuleList extends HTTPService {
out.close();
pfad=ordner.getPath()+"/"+filename;
} catch (Exception e) {
log.d("Datei nicht gespeichert!");
log.w("File not saved!");
e.printStackTrace();
}
return pfad;

5
app/src/main/java/de/sebse/fuplanner/tools/ui/cardview/ExpandableCardView.java
View File

@@ -14,7 +14,6 @@ import android.view.animation.Animation;
import android.view.animation.RotateAnimation;
import android.view.animation.Transformation;
import android.widget.ImageButton;
import android.widget.TextView;
import de.sebse.fuplanner.R;
import de.sebse.fuplanner.tools.UtilsUi;
@@ -152,8 +151,6 @@ public class ExpandableCardView extends CardView {
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
//log.d("w", MeasureSpec.toString(widthMeasureSpec));
//log.d("h", MeasureSpec.toString(heightMeasureSpec));
if (MeasureSpec.getSize(widthMeasureSpec) == 0 && MeasureSpec.getMode(widthMeasureSpec) != MeasureSpec.UNSPECIFIED || MeasureSpec.getSize(heightMeasureSpec) == 0 && MeasureSpec.getMode(heightMeasureSpec) != MeasureSpec.UNSPECIFIED) {
log.w("This should not happen! Invalid dimension size");
setMeasuredDimension(reconcileSize(10, widthMeasureSpec), reconcileSize(10, heightMeasureSpec));
@@ -193,8 +190,6 @@ public class ExpandableCardView extends CardView {
public void expand() {
final int initialHeight = this.getHeight();
int targetHeight = expandedHeight;
//innerView.measure(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
//log.d(targetHeight, outerView.getHeight(), innerView.getHeight(), innerView.getMeasuredHeight());
if(targetHeight - initialHeight != 0) {
animateViews(initialHeight, targetHeight - initialHeight, EXPANDING);

3
docs/GoogleAuth-old.java
View File

@@ -13,7 +13,6 @@ import com.google.android.gms.auth.api.Auth;
import com.google.android.gms.auth.api.credentials.Credential;
import com.google.android.gms.auth.api.credentials.CredentialRequest;
import com.google.android.gms.auth.api.credentials.CredentialRequestResult;
import com.google.android.gms.auth.api.credentials.CredentialsClient;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import com.google.android.gms.common.api.GoogleApiClient;
@@ -111,8 +110,6 @@ public class GoogleAuth {
Log.d(TAG, "SAVE: OK");
Toast.makeText(activity, "Credentials saved", Toast.LENGTH_SHORT).show();
} else {
Log.d(TAG, String.valueOf(status.hasResolution()));
Log.d(TAG, String.valueOf(status.getStatus()));
if (status.hasResolution()) {
// Try to resolve the save request. This will prompt the user if
// the credential is new.