Fixed various bugs

ItsForkIT · Jan 28, 2019 · eb3b89d · eb3b89d
1 parent 3f0f953
commit eb3b89d
Show file tree

Hide file tree

Showing 9 changed files with 93 additions and 39 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,6 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CLEAR_APP_CACHE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
@@ -64,37 +63,65 @@
 
         <activity
             android:name="com.onegravity.contactpicker.core.ContactPickerActivity"
+            android:configChanges="orientation|keyboardHidden"
             android:enabled="true"
-            android:exported="false">
+            android:exported="false"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
         </activity>
-        <activity android:name=".RegisterActivity" />
+        <activity
+            android:name=".RegisterActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".MainActivity"
+            android:configChanges="orientation|keyboardHidden"
             android:label="@string/title_activity_main"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".Chat.VideoPlayer"
             android:configChanges="orientation|keyboardHidden|screenLayout|screenSize"
             android:label="@string/video"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme" />
-        <activity android:name=".Chat.ChatActivity" />
-        <activity android:name=".Chat.ImageViewActivity" />
-        <activity android:name=".CollectMapDataActivity" />
-        <activity android:name=".ShowMapDataActivity" />
-        <activity android:name=".GetLocationActivity" />
+        <activity
+            android:name=".Chat.ChatActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".Chat.ImageViewActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".CollectMapDataActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".ShowMapDataActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".GetLocationActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".SettingActivity"
+            android:configChanges="orientation|keyboardHidden"
             android:label="Settings"
-            android:parentActivityName=".MainActivity">
+            android:parentActivityName=".MainActivity"
+            android:screenOrientation="portrait">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".MainActivity" />
         </activity>
-        <activity android:name=".Chat.BroadcastListActivity" />
+        <activity
+            android:name=".Chat.BroadcastListActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/disarm/surakshit/pdm/Chat/ChatActivity.java b/app/src/main/java/com/disarm/surakshit/pdm/Chat/ChatActivity.java
@@ -140,8 +140,9 @@ public void run() {
                 if (l == null) {
                     locHandler.postDelayed(this, 1000);
                 } else {
-                    currLoc.setLatitude(l.getLatitude());
-                    currLoc.setLongitude(l.getLongitude());
+                    currLoc = new GeoPoint(l.getLatitude(), l.getLongitude());
+//                    currLoc.setLatitude(l.getLatitude());
+//                    currLoc.setLongitude(l.getLongitude());
                 }
             }
         });

diff --git a/app/src/main/java/com/disarm/surakshit/pdm/DisarmConnect/Logger.java b/app/src/main/java/com/disarm/surakshit/pdm/DisarmConnect/Logger.java
@@ -66,7 +66,6 @@ public static void addRecordToLog(String message) {
                     Log.d("File created ", "File created ");
                     logFile.createNewFile();
                 } catch (IOException e) {
-                    // TODO Auto-generated catch block
                     e.printStackTrace();
                 }
             }
@@ -103,7 +102,6 @@ public static void addRecordToLog(String message) {
 
                 Log.v("Success:",String.valueOf(success));
             } catch (IOException e) {
-                // TODO Auto-generated catch block
                 e.printStackTrace();
             }*/
         }

diff --git a/app/src/main/java/com/disarm/surakshit/pdm/Fragments/MapFragment.java b/app/src/main/java/com/disarm/surakshit/pdm/Fragments/MapFragment.java
@@ -77,7 +77,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         locHandler.post(new Runnable() {
             @Override
             public void run() {
-                Location l = MLocation.getLocation(getContext().getApplicationContext());
+                Location l = MLocation.getLocation(getContext());
                 if (l == null) {
                     locHandler.postDelayed(this, 1000);
                 } else {

diff --git a/app/src/main/java/com/disarm/surakshit/pdm/Fragments/MergedMapFragment.java b/app/src/main/java/com/disarm/surakshit/pdm/Fragments/MergedMapFragment.java
@@ -103,7 +103,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         locHandler.post(new Runnable() {
             @Override
             public void run() {
-                Location l = MLocation.getLocation(getContext().getApplicationContext());
+                Location l = MLocation.getLocation(getContext());
                 if (l == null) {
                     locHandler.postDelayed(this, 1000);
                 } else {

diff --git a/app/src/main/java/com/disarm/surakshit/pdm/Logger.java b/app/src/main/java/com/disarm/surakshit/pdm/Logger.java
@@ -67,7 +67,6 @@ public boolean accept(File dir, String name) {
                         Log.d("File created ", "File created ");
                         logFile.createNewFile();
                     } catch (IOException e) {
-                        // TODO Auto-generated catch block
                         e.printStackTrace();
                     }
                 }
@@ -94,7 +93,6 @@ public boolean accept(File dir, String name) {
 
                 Log.v("Success:",String.valueOf(success));
             } catch (IOException e) {
-                // TODO Auto-generated catch block
                 e.printStackTrace();
             }
         }

diff --git a/app/src/main/java/com/disarm/surakshit/pdm/MainActivity.java b/app/src/main/java/com/disarm/surakshit/pdm/MainActivity.java
@@ -9,29 +9,24 @@
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.graphics.drawable.GradientDrawable;
 import android.location.LocationListener;
 import android.location.LocationManager;
+import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
 import android.provider.Settings;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
+import android.support.v4.view.ViewPager;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.widget.Toolbar;
-
-import android.support.v4.view.ViewPager;
-import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
-import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import com.disarm.surakshit.pdm.Chat.ChatActivity;
@@ -46,9 +41,6 @@
 import com.disarm.surakshit.pdm.Fragments.FragmentAdapter;
 import com.disarm.surakshit.pdm.Fragments.MapFragment;
 import com.disarm.surakshit.pdm.Fragments.MergedMapFragment;
-import com.disarm.surakshit.pdm.Merging.GISMerger;
-import com.disarm.surakshit.pdm.Merging.MergeUtil.MergeDecisionPolicy;
-import com.disarm.surakshit.pdm.Merging.MergeUtil.MergePolicy;
 import com.disarm.surakshit.pdm.Service.SyncService;
 import com.disarm.surakshit.pdm.Util.DiffUtils;
 import com.disarm.surakshit.pdm.Util.Params;
@@ -60,7 +52,6 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.osmdroid.bonuspack.kml.KmlDocument;
-import org.osmdroid.views.MapView;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -93,6 +84,8 @@ public class MainActivity extends AppCompatActivity {
     public static boolean myServiceBound = false;
     LocationManager lm;
     LocationListener locationListener;
+    //TODO: unable to start BroadcastListActivity
+    //TODO: unable to start ChatActivity
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -127,6 +120,10 @@ protected void onCreate(Bundle savedInstanceState) {
             public void run() {
                 File kmlDir = Environment.getExternalStoragePublicDirectory("DMS/Working/SurakshitKml");
                 File[] kmlfiles = kmlDir.listFiles();
+                if(kmlfiles==null){
+                    Log.d("Main_Activity","S_KML skipping... ");
+                    return;
+                }
                 if (kmlfiles.length > total_kml) {
                     for (File file : kmlfiles) {
                         String name = FilenameUtils.getBaseName(file.getName());
@@ -191,7 +188,10 @@ public void run() {
                 File[] diffFiles = diffDir.listFiles();
                 HashMap<String, File> myDiffFiles = new HashMap<>();
                 HashMap<String, Integer> latestVersion = new HashMap<>();
-
+                if(diffFiles==null){
+                    Log.d("Main_Activity","Diff Dir Files skipping... ");
+                    return;
+                }
                 for (File file : diffFiles) {
                     String[] name = FilenameUtils.getBaseName(file.getName()).split("_");
                     if (!latestVersion.containsKey(name[0])) {
@@ -203,17 +203,26 @@ public void run() {
                         latestVersion.put(name[0], Integer.parseInt(name[4]));
                     }
                 }
-
+                File[] sourceDestDirFiles = sourceDestDir.listFiles();
+                File[] latestDestDirFiles = latestDestDir.listFiles();
+                if (sourceDestDirFiles==null){
+                    Log.d("Main_Activity","Dest Source Files skipping... ");
+                    return;
+                }
+                if (latestDestDirFiles==null){
+                    Log.d("Main_Activity","Dest Latest Files skipping... ");
+                    return;
+                }
                 HashMap<String, File> sourceFiles = new HashMap<>();
-                for (File file : sourceDestDir.listFiles()) {
+                for (File file : sourceDestDirFiles) {
                     if (FilenameUtils.getExtension(file.getName()).equals("kml")) {
                         String[] name = file.getName().split("_");
                         sourceFiles.put(name[0], file);
                     }
                 }
-                if (latestDestDir.listFiles().length > 0) {
+                if (latestDestDirFiles.length > 0) {
                     Log.d("DIFF TEST", "Inside more than 0 files");
-                    for (File file : latestDestDir.listFiles()) {
+                    for (File file : latestDestDirFiles) {
                         if (FilenameUtils.getExtension(file.getName()).equals("kml")) {
                             String fileName = FilenameUtils.getBaseName(file.getName());
                             String split[] = fileName.split("_");
@@ -247,6 +256,10 @@ public void run() {
 
                                             Receiver receiver = receivers.get(0);
                                             File latestkml = Environment.getExternalStoragePublicDirectory("DMS/KML/Dest/LatestKml");
+                                            if (latestkml.listFiles()==null){
+                                                Log.d("Main_Activity","Latest KML Files skipping... ");
+                                                return;
+                                            }
                                             for (File kml : latestkml.listFiles()) {
                                                 if (FilenameUtils.getExtension(file.getName()).equals("kml")) {
                                                     if (kml.getName().contains(split[0])) {
@@ -318,6 +331,10 @@ public void run() {
 
                             Receiver receiver = receivers.get(0);
                             File latestkml = Environment.getExternalStoragePublicDirectory("DMS/KML/Dest/LatestKml");
+                            if (latestkml.listFiles()==null){
+                                Log.d("Main_Activity","Latest KML Files skipping... ");
+                                return;
+                            }
                             for (File kml : latestkml.listFiles()) {
                                 if (FilenameUtils.getExtension(kml.getName()).equals("kml")) {
                                     if (kml.getName().contains(identifier)) {
@@ -382,14 +399,24 @@ public void run() {
                 File tempDir = Environment.getExternalStoragePublicDirectory("DMS/temp");
                 File pgpKeyDir = Environment.getExternalStoragePublicDirectory("DMS/Working/pgpKey");
                 HashMap<String, File> keyFile = new HashMap<>();
-                for (File file : pgpKeyDir.listFiles()) {
+                File[] pgpKeyDirFiles = pgpKeyDir.listFiles();
+                File[] tempDirFiles = tempDir.listFiles();
+                if(pgpKeyDirFiles==null){
+                    Log.d("Main_Activity","PGP Files skipping... ");
+                    return;
+                }
+                if (tempDirFiles==null){
+                    Log.d("Main_Activity","temp Files skipping... ");
+                    return;
+                }
+                for (File file : pgpKeyDirFiles) {
                     if (FilenameUtils.getBaseName(file.getName()).contains("_") && FilenameUtils.getExtension(file.getName()).equals("bgp")) {
                         String number = FilenameUtils.getBaseName(file.getName()).split("_")[1];
                         keyFile.put(number, file);
                     }
                 }
 
-                for (File file : tempDir.listFiles()) {
+                for (File file : tempDirFiles) {
                     String fileName[] = FilenameUtils.getBaseName(file.getName()).split("_");
                     String fileNumber = fileName[2];
                     String unique = fileName[0];
@@ -492,6 +519,10 @@ protected void onDestroy() {
 
     private void updateDB(String fileName) throws IOException, ParseException {
         File destKmlDir = Environment.getExternalStoragePublicDirectory("DMS/KML/Dest/SourceKml");
+        if (destKmlDir.listFiles()==null){
+            Log.d("Main_Activity","Source KML Files skipping... ");
+            return;
+        }
         for (File file : destKmlDir.listFiles()) {
             if (file.getName().contains(FilenameUtils.getBaseName(fileName)) && FilenameUtils.getExtension(file.getName()).equals("kml")) {
                 final Box<Receiver> receiverBox = ((App) getApplication()).getBoxStore().boxFor(Receiver.class);

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -85,7 +85,6 @@
     <string name="mule">Turn this on if you want to act as a mule</string>
     <string name="data_mule">Data Mule</string>
 
-    <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="broadcast_volunteers">Broadcast to Volunteers</string>
     <string name="broadcast_users">Broadcast to Common users</string>

diff --git a/app/version.properties b/app/version.properties
@@ -1,4 +1,4 @@
-#Sat Dec 15 11:55:09 IST 2018
+#Mon Jan 28 17:00:59 IST 2019
 VERSION_MINOR=2
-VERSION_BUILD=293
+VERSION_BUILD=300
 VERSION_MAJOR=2